blitze / phpBB-ext-sitemaker

services/tree/builder.php

Braces +1 added lines, -2 removed lines

@@ -260,8 +260,7 @@
 				'depth'		=> $new_parent['depth'] + 1,
 				'right_id'	=> --$new_parent['right_id'],
 			);
-		}
-		else
+		} else
 		{
 			return array(
 				'depth'		=> 0,

Spacing +19 added lines, -19 removed lines

@@ -55,8 +55,8 @@ 
 	 */
 	public function get_item_info($item_id = 0)
 	{
-		$sql = 'SELECT * FROM ' . $this->table_name . ' ' . $this->get_sql_where('WHERE') .
-			(($item_id) ? " AND {$this->column_item_id} = " . (int) $item_id : '');
+		$sql = 'SELECT * FROM '.$this->table_name.' '.$this->get_sql_where('WHERE').
+			(($item_id) ? " AND {$this->column_item_id} = ".(int) $item_id : '');
 
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -75,8 +75,8 @@ 
 	public function update_item($item_id, array $sql_data)
 	{
 		$sql = "UPDATE {$this->table_name}
-			SET " . $this->db->sql_build_array('UPDATE', $sql_data) . "
-			WHERE $this->column_item_id = " . (int) $item_id;
+			SET ".$this->db->sql_build_array('UPDATE', $sql_data)."
+			WHERE $this->column_item_id = ".(int) $item_id;
 		$this->db->sql_query($sql);
 
 		return $sql_data;
@@ -109,7 +109,7 @@ 
 
 		// Rather than updating each item individually, we will just delete all items
 		// then add them all over again with new parent_id|left_id|right_id
-		$this->db->sql_query("DELETE FROM {$this->table_name} " . $this->get_sql_where('WHERE'));
+		$this->db->sql_query("DELETE FROM {$this->table_name} ".$this->get_sql_where('WHERE'));
 
 		// Now we add it back
 		$sql_data = $this->add_sub_tree($tree, 0);
@@ -158,7 +158,7 @@ 
 
 			if ($depth && !$parent_id)
 			{
-				throw new \RuntimeException($this->message_prefix . 'MALFORMED_TREE');
+				throw new \RuntimeException($this->message_prefix.'MALFORMED_TREE');
 			}
 
 			$key = $i + $max_id + 1;
@@ -230,23 +230,23 @@ 
 		foreach ($branch as $i => $row)
 		{
 			$left_id	= $right_id + 1;
-			$right_id   = $right_id + 2;
+			$right_id = $right_id + 2;
 
 			$sql_data[$i] = $row;
-			$sql_data[$i]['parent_id']	= $parent_id;
-			$sql_data[$i]['left_id']	= $left_id;
-			$sql_data[$i]['right_id']	= $right_id;
-			$sql_data[$i]['depth']		= $depth;
+			$sql_data[$i]['parent_id'] = $parent_id;
+			$sql_data[$i]['left_id'] = $left_id;
+			$sql_data[$i]['right_id'] = $right_id;
+			$sql_data[$i]['depth'] = $depth;
 
 			if ($row['parent_id'])
 			{
-				$left_id	= $sql_data[$row['parent_id']]['right_id'];
-				$right_id   = $left_id + 1;
+				$left_id = $sql_data[$row['parent_id']]['right_id'];
+				$right_id = $left_id + 1;
 
-				$sql_data[$i]['parent_id']	= $row['parent_id'];
-				$sql_data[$i]['depth']		= $sql_data[$row['parent_id']]['depth'] + 1;
-				$sql_data[$i]['left_id']	= $left_id;
-				$sql_data[$i]['right_id']	= $right_id;
+				$sql_data[$i]['parent_id'] = $row['parent_id'];
+				$sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1;
+				$sql_data[$i]['left_id'] = $left_id;
+				$sql_data[$i]['right_id'] = $right_id;
 
 				$this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch);
 			}
@@ -272,7 +272,7 @@ 
 				$this->db->sql_transaction('rollback');
 				$this->lock->release();
 
-				throw new \RuntimeException($this->message_prefix . 'INVALID_PARENT');
+				throw new \RuntimeException($this->message_prefix.'INVALID_PARENT');
 			}
 
 			// adjust items in affected branch
@@ -300,7 +300,7 @@ 
 	protected function get_max_id($column, $use_sql_where = true)
 	{
 		$sql = "SELECT MAX($column) AS $column
-			FROM {$this->table_name} " .
+			FROM {$this->table_name} ".
 			(($use_sql_where) ? $this->get_sql_where('WHERE') : '');
 		$result = $this->db->sql_query($sql);
 		$max_id = $this->db->sql_fetchfield($column);

exception/base.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		if (is_array($message))
 		{
 			$this->message = (string) $message[0];
-		}
-		else
+		} else
 		{
 			$this->message = $message;
 		}

Spacing +2 added lines, -2 removed lines

@@ -96,10 +96,10 @@
 		foreach ($this->message_full as &$message)
 		{
 			// Attempt to translate each portion
-			$translated_message = $translator->lang('EXCEPTION_' . $message);
+			$translated_message = $translator->lang('EXCEPTION_'.$message);
 
 			// Check if translating did anything
-			if ($translated_message !== 'EXCEPTION_' . $message)
+			if ($translated_message !== 'EXCEPTION_'.$message)
 			{
 				// It did, so replace message with the translated version
 				$message = $translated_message;

services/tree/display.php

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
 	protected $data = array();
 
 	/**
-	* Construct
-	*
-	* @param \phpbb\db\driver\driver_interface		$db             Database connection
-	* @param string									$items_table	Table name
-	* @param string									$pk				Primary key
-	* @param string									$sql_where		Column restriction
-	*/
+	 * Construct
+	 *
+	 * @param \phpbb\db\driver\driver_interface		$db             Database connection
+	 * @param string									$items_table	Table name
+	 * @param string									$pk				Primary key
+	 * @param string									$sql_where		Column restriction
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, $items_table, $pk, $sql_where = '')
 	{
 		$this->db = $db;

Braces +1 added lines, -2 removed lines

@@ -254,8 +254,7 @@
 		{
 			$padding .= $pad_with;
 			$padding_store[$row[$this->column_parent_id]] = $padding;
-		}
-		else if ($row[$this->column_left_id] > $right + 1)
+		} else if ($row[$this->column_left_id] > $right + 1)
 		{
 			$padding = (isset($padding_store[$row[$this->column_parent_id]])) ? $padding_store[$row[$this->column_parent_id]] : '';
 		}

Spacing +10 added lines, -10 removed lines

@@ -89,7 +89,7 @@ 
 	{
 		$sql = "SELECT *
 			FROM $this->items_table
-			WHERE $this->pk = " . (int) $node_id ;
+			WHERE $this->pk = ".(int) $node_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -118,7 +118,7 @@ 
 					$this->items_table => 'i'
 				),
 				'WHERE'		=> array(
-					'i.depth ' . (($max_depth) ? ' BETWEEN ' . (int) $start . ' AND ' . (int) ($start + $max_depth) : ' >= ' . (int) $start),
+					'i.depth '.(($max_depth) ? ' BETWEEN '.(int) $start.' AND '.(int) ($start + $max_depth) : ' >= '.(int) $start),
 					$this->sql_where,
 				),
 				'ORDER_BY'	=> 'i.left_id ASC',
@@ -174,22 +174,22 @@ 
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
 		{
 			$row 		= $data[$i];
-			$this_depth	= $parental_depth[$row[$this->column_parent_id]] + 1;
-			$repeat		= abs($prev_depth - $this_depth);
+			$this_depth = $parental_depth[$row[$this->column_parent_id]] + 1;
+			$repeat = abs($prev_depth - $this_depth);
 
-			$tpl_data	= array(
+			$tpl_data = array(
 				'PREV_DEPTH'	=> $prev_depth,
 				'THIS_DEPTH'	=> $this_depth,
 				'NUM_KIDS'		=> $this->count_descendants($row),
 			);
 
 			$template->assign_block_vars($handle, array_merge($tpl_data, array_change_key_case($row, CASE_UPPER)));
-			$this->recursively_close_tags($repeat, $handle . '.close', $template);
+			$this->recursively_close_tags($repeat, $handle.'.close', $template);
 
 			$prev_depth = $this_depth;
 			$parental_depth[$row[$this->pk]] = $this_depth;
 		}
-		$this->recursively_close_tags($prev_depth, 'close_' . $handle, $template);
+		$this->recursively_close_tags($prev_depth, 'close_'.$handle, $template);
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	{
 		for ($i = 0; $i < $repeat; $i++)
 		{
-			$template->assign_block_vars('close_' . $handle, array());
+			$template->assign_block_vars('close_'.$handle, array());
 		}
 	}
 
@@ -268,7 +268,7 @@ 
 	 */
 	protected function get_padded_title($padding, $title)
 	{
-		return (($padding) ? $padding . '&#x2937; ' : '') . $title;
+		return (($padding) ? $padding.'&#x2937; ' : '').$title;
 	}
 
 	/**
@@ -280,6 +280,6 @@ 
 	protected function get_html_option(array $row, array $selected_ids, $title)
 	{
 		$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
-		return '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
+		return '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
 	}
 }

services/forum/tracker.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 		if ($this->can_track_by_lastread())
 		{
 			$info = $this->build_tracking_info('get_topic_tracking', $forums, $topics);
-		}
-		else if ($this->can_track_anonymous())
+		} else if ($this->can_track_anonymous())
 		{
 			$info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics);
 		}

model/base_entity.php

Indentation +4 added lines, -4 removed lines

@@ -56,8 +56,8 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function to_array()
 	{
 		$attributes = $this->get_attributes();
@@ -74,8 +74,8 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function to_db()
 	{
 		$this->check_required();

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	{
 		foreach ($data as $name => $value)
 		{
-			$mutator = 'set_' . $name;
+			$mutator = 'set_'.$name;
 			$this->$mutator($value);
 		}
 	}
@@ -65,7 +65,7 @@ 
 		$data = array();
 		foreach ($attributes as $attribute)
 		{
-			$accessor = 'get_' . $attribute;
+			$accessor = 'get_'.$attribute;
 			$data[$attribute] = $this->$accessor();
 		}
 		unset($data['db_fields'], $data['required_fields']);

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 			if ('get' == $match[1])
 			{
 				return $this->$attribute;
-			}
-			else
+			} else
 			{
 				$this->$attribute = $this->validate_attribute($match[2], $args[0]);
 				return $this;

services/blocks/action/edit_block.php

Spacing +1 added lines, -1 removed lines

@@ -59,6 +59,6 @@
 		$class_name = get_class($block_instance);
 		list($namespace, $extension) = explode('\\', $class_name);
 
-		return $namespace . '/' . $extension;
+		return $namespace.'/'.$extension;
 	}
 }

services/blocks/action/update_block.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 		if (isset($allowed_fields[$field]))
 		{
-			$mutator = 'set_' . $field;
+			$mutator = 'set_'.$field;
 			$entity->$mutator($allowed_fields[$field]);
 			$entity = $block_mapper->save($entity);
 		}

services/blocks/action_handler.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 */
 	public function create($action)
 	{
-		$action_class = 'blitze\\sitemaker\\services\\blocks\\action\\' . $action;
+		$action_class = 'blitze\\sitemaker\\services\\blocks\\action\\'.$action;
 
 		if (!class_exists($action_class))
 		{

services/date_range.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		$time = $this->user->create_datetime($this->time);
 		$now = phpbb_gmgetdate($time->getTimestamp() + $time->getOffset());
 
-		$method = 'get_' . $range;
+		$method = 'get_'.$range;
 		$data = array(
 			'start'	=> 0,
 			'stop'	=> 0,