Completed
Push — master ( 75382e...db7709 )
by Daniel
15:50
created
services/blocks.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -104,8 +104,7 @@  discard block
 block discarded – undo
104 104
 		if (isset($all_routes[$style_id][$current_route]))
105 105
 		{
106 106
 			return $all_routes[$style_id][$current_route];
107
-		}
108
-		else
107
+		} else
109 108
 		{
110 109
 			return $this->_get_default_route_info($all_routes, $current_route, $style_id, $edit_mode);
111 110
 		}
@@ -226,8 +225,7 @@  discard block
 block discarded – undo
226 225
 		if (!empty($block['content']))
227 226
 		{
228 227
 			$content = $block['content'];
229
-		}
230
-		else if ($edit_mode)
228
+		} else if ($edit_mode)
231 229
 		{
232 230
 			$content = $this->user->lang('BLOCK_NO_DATA');
233 231
 		}
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2013 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2013 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\event;
11 11
 
Please login to merge, or discard this patch.
services/menus/display.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	/**
48 48
 	 *
49 49
 	 */
50
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
50
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
51 51
 	{
52 52
 		$data = array_values($data);
53 53
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 			}
68 68
 
69 69
 			$is_current_item = $this->is_current_item($row, $current_data['item_id']);
70
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
70
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
71 71
 
72 72
 			$this->set_parental_depth($row, $this_depth, $current_data, $is_current_item);
73 73
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 				continue;
77 77
 			}
78 78
 
79
-			$tpl_data	= array(
79
+			$tpl_data = array(
80 80
 				'S_PREV_DEPTH'	=> $prev_depth,
81 81
 				'S_THIS_DEPTH'	=> $this_depth,
82 82
 				'S_NUM_KIDS'	=> $this->count_descendants($row),
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		}
131 131
 	}
132 132
 
133
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
133
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
134 134
 	{
135 135
 		for ($i = 0; $i < $repeat; $i++)
136 136
 		{
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2013 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2013 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\event;
11 11
 
Please login to merge, or discard this patch.
services/menus/nestedset.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2013 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2013 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\services\menus;
11 11
 
12 12
 class nestedset extends \blitze\sitemaker\services\tree\builder
13 13
 {
14 14
 	/**
15
-	* Construct
16
-	*
17
-	* @param \phpbb\db\driver\driver_interface	$db				Database connection
18
-	* @param \phpbb\lock\db						$lock			Lock class used to lock the table when moving forums around
19
-	* @param string								$table_name		Table name
20
-	*/
15
+	 * Construct
16
+	 *
17
+	 * @param \phpbb\db\driver\driver_interface	$db				Database connection
18
+	 * @param \phpbb\lock\db						$lock			Lock class used to lock the table when moving forums around
19
+	 * @param string								$table_name		Table name
20
+	 */
21 21
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name)
22 22
 	{
23 23
 		parent::__construct(
Please login to merge, or discard this patch.
services/forum/data.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -339,7 +339,7 @@
 block discarded – undo
339 339
 			$this->store['topic'][$row['topic_id']] = $row;
340 340
 
341 341
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
342
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
342
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
343 343
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
344 344
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
345 345
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -560,8 +560,7 @@
 block discarded – undo
560 560
 		if ($this->_can_track_by_lastread())
561 561
 		{
562 562
 			$info = $this->_build_tracking_info('get_topic_tracking');
563
-		}
564
-		else if ($this->_can_track_anonymous())
563
+		} else if ($this->_can_track_anonymous())
565 564
 		{
566 565
 			$info = $this->_build_tracking_info('get_complete_topic_tracking');
567 566
 		}
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2013 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2013 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\event;
11 11
 
Please login to merge, or discard this patch.
model/blocks/entity/block.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -164,8 +164,7 @@
 block discarded – undo
164 164
 		if (!is_array($settings))
165 165
 		{
166 166
 			$this->settings = $settings;
167
-		}
168
-		else if (sizeof($settings))
167
+		} else if (sizeof($settings))
169 168
 		{
170 169
 			$this->settings = serialize($settings);
171 170
 			$this->hash = md5($this->settings);
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2013 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2013 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\event;
11 11
 
Please login to merge, or discard this patch.
model/base_collection.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
 		{
122 122
 			$this->_entities = array_filter(
123 123
 				$this->_entities,
124
-				function ($v) use ($key)
124
+				function($v) use ($key)
125 125
 				{
126 126
 					return $v !== $key;
127 127
 				}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,8 +101,7 @@
 block discarded – undo
101 101
 			if (!isset($key))
102 102
 			{
103 103
 				$this->_entities[] = $entity;
104
-			}
105
-			else
104
+			} else
106 105
 			{
107 106
 				$this->_entities[$key] = $entity;
108 107
 			}
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2013 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2013 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\event;
11 11
 
Please login to merge, or discard this patch.
model/base_entity.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
 	{
116 116
 		$type = $this->_get_property_type($name);
117 117
 
118
-		if (in_array($type, array('array','boolean', 'float', 'integer', 'string')))
118
+		if (in_array($type, array('array', 'boolean', 'float', 'integer', 'string')))
119 119
 		{
120 120
 			settype($value, $type);
121 121
 			return $value;
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,14 +36,12 @@
 block discarded – undo
36 36
 			if ('get' == $match[1])
37 37
 			{
38 38
 				return $this->$attribute;
39
-			}
40
-			else
39
+			} else
41 40
 			{
42 41
 				$this->$attribute = $this->_validate_attribute($match[2], $args[0]);
43 42
 				return $this;
44 43
 			}
45
-		}
46
-		else
44
+		} else
47 45
 		{
48 46
 			throw new \blitze\sitemaker\exception\unexpected_value(array($name, 'UNDEFINED_METHOD'));
49 47
 		}
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2015 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2015 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\model\menus\entity;
11 11
 
Please login to merge, or discard this patch.
model/base_mapper.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@
 block discarded – undo
157 157
 			$accessor = 'get_' . $this->_entity_pkey;
158 158
 			$id = $entity->$accessor();
159 159
 
160
-			return $this->db->sql_query('UPDATE ' . $this->_entity_table . ' SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()) .' WHERE ' . $this->_entity_pkey . ' = ' . $id);
160
+			return $this->db->sql_query('UPDATE ' . $this->_entity_table . ' SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()) . ' WHERE ' . $this->_entity_pkey . ' = ' . $id);
161 161
 		}
162 162
 
163 163
 		throw new \blitze\sitemaker\exception\unexpected_value('INVALID_ENTITY');
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2015 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2015 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\model\menus\entity;
11 11
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@
 block discarded – undo
41 41
 		if (is_array($message))
42 42
 		{
43 43
 			$this->message = (string) $message[0];
44
-		}
45
-		else
44
+		} else
46 45
 		{
47 46
 			$this->message = $message;
48 47
 		}
Please login to merge, or discard this patch.
model/menus/entity/menu.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * @package sitemaker
5
- * @copyright (c) 2015 Daniel A. (blitze)
6
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
- *
8
- */
3
+	 *
4
+	 * @package sitemaker
5
+	 * @copyright (c) 2015 Daniel A. (blitze)
6
+	 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
7
+	 *
8
+	 */
9 9
 
10 10
 namespace blitze\sitemaker\model\menus\entity;
11 11
 
Please login to merge, or discard this patch.