Completed
Pull Request — master (#26)
by Daniel
09:07
created
services/blocks/display.php 2 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -135,8 +135,7 @@  discard block
 block discarded – undo
135 135
 		if ($this->request->is_set('style'))
136 136
 		{
137 137
 			return $this->request->variable('style', 0);
138
-		}
139
-		else
138
+		} else
140 139
 		{
141 140
 			return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style'];
142 141
 		}
@@ -172,8 +171,7 @@  discard block
 block discarded – undo
172 171
 				self::SHOW_BLOCK_LANDING	=> true,
173 172
 				self::SHOW_BLOCK_SUBPAGE	=> false,
174 173
 			);
175
-		}
176
-		else
174
+		} else
177 175
 		{
178 176
 			$modes = array(
179 177
 				self::SHOW_BLOCK_BOTH		=> true,
@@ -200,8 +198,7 @@  discard block
 block discarded – undo
200 198
 			}
201 199
 
202 200
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (($edit_mode) ? 0 : 1));
203
-		}
204
-		else
201
+		} else
205 202
 		{
206 203
 			$edit_mode = false;
207 204
 		}
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/blocks/admin_bar.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
 			list($controller_service, $controller_method) = explode(':', $controller);
142 142
 			$controller_params	= $symfony_request->attributes->get('_route_params');
143 143
 			$controller_object	= $this->phpbb_container->get($controller_service);
144
-			$controller_class	= get_class($controller_object);
144
+			$controller_class = get_class($controller_object);
145 145
 
146 146
 			$r = new \ReflectionMethod($controller_class, $controller_method);
147 147
 			$params = $r->getParameters();
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/url_checker.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 			$headers = $headers[0];
30 30
 		}
31 31
 
32
-		preg_match('/HTTP\/.* ([0-9]+) .*/', $headers , $status);
32
+		preg_match('/HTTP\/.* ([0-9]+) .*/', $headers, $status);
33 33
 
34 34
 		return ($status[1] == 200) ? true : false;
35 35
 	}
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.
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.
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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -232,8 +232,7 @@
 block discarded – undo
232 232
 		if (sizeof($post_ids))
233 233
 		{
234 234
 			$sql_where[] = $this->db->sql_in_set('p.post_id', $post_ids);
235
-		}
236
-		else if (sizeof($this->store['topic']))
235
+		} else if (sizeof($this->store['topic']))
237 236
 		{
238 237
 			$this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post);
239 238
 		}
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/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.
exception/base.php 2 patches
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.
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -16,23 +16,23 @@  discard block
 block discarded – undo
16 16
 class base extends \Exception
17 17
 {
18 18
 	/**
19
-	* Null if the message is a string, array if the message was submitted as an array
20
-	* @var string|array
21
-	*/
19
+	 * Null if the message is a string, array if the message was submitted as an array
20
+	 * @var string|array
21
+	 */
22 22
 	protected $message_full;
23 23
 
24 24
 	protected $previous;
25 25
 
26 26
 	/**
27
-	* Constructor
28
-	*
29
-	* Different from normal exceptions in that we do not enforce $message to be a string.
30
-	*
31
-	* @param string|array $message
32
-	* @param int $code
33
-	* @param \Exception $previous
34
-	* @access public
35
-	*/
27
+	 * Constructor
28
+	 *
29
+	 * Different from normal exceptions in that we do not enforce $message to be a string.
30
+	 *
31
+	 * @param string|array $message
32
+	 * @param int $code
33
+	 * @param \Exception $previous
34
+	 * @access public
35
+	 */
36 36
 	public function __construct($message = null, $code = 0, \Exception $previous = null)
37 37
 	{
38 38
 		// We're slightly changing the way exceptions work
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 	}
54 54
 
55 55
 	/**
56
-	* Basic message translation for our exceptions
57
-	*
58
-	* @param \phpbb\language\language $translator
59
-	* @return array|string
60
-	* @access public
61
-	*/
56
+	 * Basic message translation for our exceptions
57
+	 *
58
+	 * @param \phpbb\language\language $translator
59
+	 * @return array|string
60
+	 * @access public
61
+	 */
62 62
 	public function get_message(\phpbb\language\language $translator)
63 63
 	{
64 64
 		// Make sure our language file has been loaded
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 	/**
76
-	* Translate all portions of the message sent to the exception
77
-	*
78
-	* Goes through each element of the array and tries to translate them
79
-	*
80
-	* @param \phpbb\language\language $translator
81
-	* @param string|array $message_portions The message portions to translate
82
-	* @param string|null $parent_message Send a string to translate all of the
83
-	*     portions with the parent message (typically used to format a string
84
-	*     with the given message portions). Null to ignore. Default: Null
85
-	* @return array|string Array if $parent_message === null else a string
86
-	* @access protected
87
-	*/
76
+	 * Translate all portions of the message sent to the exception
77
+	 *
78
+	 * Goes through each element of the array and tries to translate them
79
+	 *
80
+	 * @param \phpbb\language\language $translator
81
+	 * @param string|array $message_portions The message portions to translate
82
+	 * @param string|null $parent_message Send a string to translate all of the
83
+	 *     portions with the parent message (typically used to format a string
84
+	 *     with the given message portions). Null to ignore. Default: Null
85
+	 * @return array|string Array if $parent_message === null else a string
86
+	 * @access protected
87
+	 */
88 88
 	protected function translate_portions(\phpbb\language\language $translator, $message_portions, $parent_message = null)
89 89
 	{
90 90
 		// Make sure our language file has been loaded
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
 	}
127 127
 
128 128
 	/**
129
-	* Add our language file
130
-	*
131
-	* @param \phpbb\language\language $translator
132
-	* @return null
133
-	* @access public
134
-	*/
129
+	 * Add our language file
130
+	 *
131
+	 * @param \phpbb\language\language $translator
132
+	 * @return null
133
+	 * @access public
134
+	 */
135 135
 	public function add_lang(\phpbb\language\language $translator)
136 136
 	{
137 137
 		static $is_loaded = false;
@@ -150,15 +150,15 @@  discard block
 block discarded – undo
150 150
 	}
151 151
 
152 152
 	/**
153
-	* Output a string of this error message
154
-	*
155
-	* This will hopefully be never called, always catch the expected exceptions
156
-	* and call get_message to translate them into an error that a user can
157
-	* understand
158
-	*
159
-	* @return string
160
-	* @access public
161
-	*/
153
+	 * Output a string of this error message
154
+	 *
155
+	 * This will hopefully be never called, always catch the expected exceptions
156
+	 * and call get_message to translate them into an error that a user can
157
+	 * understand
158
+	 *
159
+	 * @return string
160
+	 * @access public
161
+	 */
162 162
 	public function __toString()
163 163
 	{
164 164
 		return (is_array($this->message_full)) ? var_export($this->message_full, true) : (string) $this->message_full;
Please login to merge, or discard this patch.