xpressengine / xe-core

classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php

Spacing +14 added lines, -14 removed lines

@@ -73,7 +73,7 @@ 
 
 	function isIgnorable()
 	{
-		if(isset($this->default_value) || isset($this->notnull))
+		if (isset($this->default_value) || isset($this->notnull))
 		{
 			return FALSE;
 		}
@@ -83,47 +83,47 @@ 
 	function toString()
 	{
 		$validator = '';
-		if($this->filter)
+		if ($this->filter)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');'."\n"
 					, $this->argument_name
 					, $this->filter
 			);
 		}
-		if($this->min_length)
+		if ($this->min_length)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);'."\n"
 					, $this->argument_name
 					, $this->min_length
 			);
 		}
-		if($this->max_length)
+		if ($this->max_length)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);'."\n"
 					, $this->argument_name
 					, $this->max_length
 			);
 		}
-		if(isset($this->default_value))
+		if (isset($this->default_value))
 		{
 			$this->default_value = new DefaultValue($this->argument_name, $this->default_value);
-			if($this->default_value->isSequence())
+			if ($this->default_value->isSequence())
 				$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
-			if($this->default_value->isOperation())
+			if ($this->default_value->isOperation())
 			{
-				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"
+				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');'."\n"
 						, $this->argument_name
 						, $this->default_value->getOperation()
 				);
 			}
-			$validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);'."\n"
 					, $this->argument_name
 					, $this->default_value->toString()
 			);
 		}
-		if($this->notnull)
+		if ($this->notnull)
 		{
-			$validator .= sprintf('${\'%s_argument\'}->checkNotNull();' . "\n"
+			$validator .= sprintf('${\'%s_argument\'}->checkNotNull();'."\n"
 					, $this->argument_name
 			);
 		}

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
 		if(isset($this->default_value))
 		{
 			$this->default_value = new DefaultValue($this->argument_name, $this->default_value);
-			if($this->default_value->isSequence())
-				$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
+			if($this->default_value->isSequence()) {
+							$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
+			}
 			if($this->default_value->isOperation())
 			{
 				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"

classes/xml/xmlquery/queryargument/DefaultValue.class.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	{
 		return $this->_is_string;
 		$str_pos = strpos($this->value, '(');
-		if($str_pos === false)
+		if ($str_pos === false)
 		{
 			return TRUE;
 		}
@@ -99,31 +99,31 @@ 
 
 	function _setValue()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			return;
 		}
 
 		// If value contains comma separated values and does not contain paranthesis
 		//  -> default value is an array
-		if(strpos($this->value, ',') !== FALSE && strpos($this->value, '(') === FALSE)
+		if (strpos($this->value, ',') !== FALSE && strpos($this->value, '(') === FALSE)
 		{
 			return sprintf('array(%s)', $this->value);
 		}
 
 		$str_pos = strpos($this->value, '(');
 		// // TODO Replace this with parseExpression
-		if($str_pos === FALSE)
+		if ($str_pos === FALSE)
 		{
 			$this->_is_string = TRUE;
-			return '\'' . $this->value . '\'';
+			return '\''.$this->value.'\'';
 		}
 		//if($str_pos===false) return $this->value;
 
 		$func_name = substr($this->value, 0, $str_pos);
 		$args = substr($this->value, $str_pos + 1, -1);
 
-		switch($func_name)
+		switch ($func_name)
 		{
 			case 'ipaddress' :
 				$val = '$_SERVER[\'REMOTE_ADDR\']';
@@ -159,7 +159,7 @@ 
 				$val = sprintf('%d', $args);
 				break;
 			default :
-				$val = '\'' . $this->value . '\'';
+				$val = '\''.$this->value.'\'';
 			//$val = $this->value;
 		}
 

classes/xml/xmlquery/tags/group/GroupsTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -26,19 +26,19 @@ 
 	{
 		$this->groups = array();
 
-		if($xml_groups)
+		if ($xml_groups)
 		{
-			if(!is_array($xml_groups))
+			if (!is_array($xml_groups))
 			{
 				$xml_groups = array($xml_groups);
 			}
 
 			$dbParser = &DB::getParser();
-			for($i = 0; $i < count($xml_groups); $i++)
+			for ($i = 0; $i < count($xml_groups); $i++)
 			{
 				$group = $xml_groups[$i];
 				$column = trim($group->attrs->column);
-				if(!$column)
+				if (!$column)
 				{
 					continue;
 				}
@@ -51,10 +51,10 @@ 
 
 	function toString()
 	{
-		$output = 'array(' . PHP_EOL;
-		foreach($this->groups as $group)
+		$output = 'array('.PHP_EOL;
+		foreach ($this->groups as $group)
 		{
-			$output .= "'" . $group . "' ,";
+			$output .= "'".$group."' ,";
 		}
 		$output = substr($output, 0, -1);
 		$output .= ')';

classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -33,12 +33,12 @@ 
 	{
 		$this->pipe = $pipe;
 
-		if(!is_array($conditions))
+		if (!is_array($conditions))
 		{
 			$conditions = array($conditions);
 		}
 
-		foreach($conditions as $condition)
+		foreach ($conditions as $condition)
 		{
 			//if($condition->node_name === 'query') $this->conditions[] = new QueryTag($condition, true);
 			$this->conditions[] = new ConditionTag($condition);
@@ -56,21 +56,21 @@ 
 	 */
 	function getConditionGroupString()
 	{
-		$conditions_string = 'array(' . PHP_EOL;
-		foreach($this->conditions as $condition)
+		$conditions_string = 'array('.PHP_EOL;
+		foreach ($this->conditions as $condition)
 		{
-			$conditions_string .= $condition->getConditionString() . PHP_EOL . ',';
+			$conditions_string .= $condition->getConditionString().PHP_EOL.',';
 		}
 		$conditions_string = substr($conditions_string, 0, -2); //remove ','
 		$conditions_string .= ')';
 
-		return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\'' . $this->pipe . '\'' : '');
+		return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\''.$this->pipe.'\'' : '');
 	}
 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->conditions as $condition)
+		foreach ($this->conditions as $condition)
 		{
 			$arguments = array_merge($arguments, $condition->getArguments());
 		}

classes/xml/xmlquery/tags/condition/ConditionTag.class.php

Spacing +27 added lines, -27 removed lines

@@ -67,38 +67,38 @@ 
 		$this->column_name = $dbParser->parseExpression($condition->attrs->column);
 
 		// If default value is column name, it should be escaped
-		if($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE
+		if ($isColumnName = (strpos($condition->attrs->default, '.') !== FALSE
 				&& strpos($condition->attrs->default, '.') !== 0
-				&& strpos($condition->attrs->default, '%') === FALSE ))
+				&& strpos($condition->attrs->default, '%') === FALSE))
 		{
 			$condition->attrs->default = $dbParser->parseExpression($condition->attrs->default);
 		}
 
-		if($condition->node_name == 'query')
+		if ($condition->node_name == 'query')
 		{
 			$this->query = new QueryTag($condition, TRUE);
 			$this->default_column = $this->query->toString();
 		}
-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))
+		else if ($condition->attrs->var && !strpos($condition->attrs->var, '.'))
 		{
 			$this->argument = new QueryArgument($condition);
 			$this->argument_name = $this->argument->getArgumentName();
 		}
 		else
 		{
-			if(isset($condition->attrs->default))
+			if (isset($condition->attrs->default))
 			{
 				$operationList = array('in' => 1, 'between' => 1, 'notin' => 1, 'not_in' => 1);
-				if(isset($operationList[$this->operation]))
+				if (isset($operationList[$this->operation]))
 				{
 					$default_value = $condition->attrs->default;
-					if(strpos($default_value, "'") !== FALSE)
+					if (strpos($default_value, "'") !== FALSE)
 					{
-						$default_value = "\"" . $default_value . "\"";
+						$default_value = "\"".$default_value."\"";
 					}
 					else
 					{
-						$default_value = "'" . $default_value . "'";
+						$default_value = "'".$default_value."'";
 					}
 				}
 				else
@@ -106,20 +106,20 @@ 
 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);
 					$default_value = $default_value_object->toString();
 
-					if($default_value_object->isStringFromFunction())
+					if ($default_value_object->isStringFromFunction())
 					{
-						$default_value = '"\'".' . $default_value . '."\'"';
+						$default_value = '"\'".'.$default_value.'."\'"';
 					}
 
-					if($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))
+					if ($default_value_object->isString() && !$isColumnName && !is_numeric($condition->attrs->default))
 					{
-						if(strpos($default_value, "'") !== FALSE)
+						if (strpos($default_value, "'") !== FALSE)
 						{
-							$default_value = "\"" . $default_value . "\"";
+							$default_value = "\"".$default_value."\"";
 						}
 						else
 						{
-							$default_value = "'" . $default_value . "'";
+							$default_value = "'".$default_value."'";
 						}
 					}
 				}
@@ -127,7 +127,7 @@ 
 			}
 			else
 			{
-				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";
+				$this->default_column = "'".$dbParser->parseColumnName($condition->attrs->var)."'";
 			}
 		}
 	}
@@ -140,11 +140,11 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		if($this->query)
+		if ($this->query)
 		{
 			$arguments = array_merge($arguments, $this->query->getArguments());
 		}
-		if($this->argument)
+		if ($this->argument)
 		{
 			$arguments[] = $this->argument;
 		}
@@ -153,31 +153,31 @@ 
 
 	function getConditionString()
 	{
-		if($this->query)
+		if ($this->query)
 		{
 			return sprintf("new ConditionSubquery('%s',%s,%s%s)"
 							, $this->column_name
 							, $this->default_column
-							, '"' . $this->operation . '"'
-							, $this->pipe ? ", '" . $this->pipe . "'" : ''
+							, '"'.$this->operation.'"'
+							, $this->pipe ? ", '".$this->pipe."'" : ''
 			);
 		}
-		else if(isset($this->default_column))
+		else if (isset($this->default_column))
 		{
 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"
 							, $this->column_name
 							, $this->default_column
-							, '"' . $this->operation . '"'
-							, $this->pipe ? ", '" . $this->pipe . "'" : ''
+							, '"'.$this->operation.'"'
+							, $this->pipe ? ", '".$this->pipe."'" : ''
 			);
 		}
 		else
 		{
 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"
 							, $this->column_name
-							, '$' . $this->argument_name . '_argument'
-							, '"' . $this->operation . '"'
-							, $this->pipe ? ", '" . $this->pipe . "'" : ''
+							, '$'.$this->argument_name.'_argument'
+							, '"'.$this->operation.'"'
+							, $this->pipe ? ", '".$this->pipe."'" : ''
 			);
 		}
 	}

Braces +8 added lines, -16 removed lines

@@ -78,13 +78,11 @@ 
 		{
 			$this->query = new QueryTag($condition, TRUE);
 			$this->default_column = $this->query->toString();
-		}
-		else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))
+		} else if($condition->attrs->var && !strpos($condition->attrs->var, '.'))
 		{
 			$this->argument = new QueryArgument($condition);
 			$this->argument_name = $this->argument->getArgumentName();
-		}
-		else
+		} else
 		{
 			if(isset($condition->attrs->default))
 			{
@@ -95,13 +93,11 @@ 
 					if(strpos($default_value, "'") !== FALSE)
 					{
 						$default_value = "\"" . $default_value . "\"";
-					}
-					else
+					} else
 					{
 						$default_value = "'" . $default_value . "'";
 					}
-				}
-				else
+				} else
 				{
 					$default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);
 					$default_value = $default_value_object->toString();
@@ -116,16 +112,14 @@ 
 						if(strpos($default_value, "'") !== FALSE)
 						{
 							$default_value = "\"" . $default_value . "\"";
-						}
-						else
+						} else
 						{
 							$default_value = "'" . $default_value . "'";
 						}
 					}
 				}
 				$this->default_column = $default_value;
-			}
-			else
+			} else
 			{
 				$this->default_column = "'" . $dbParser->parseColumnName($condition->attrs->var) . "'";
 			}
@@ -161,8 +155,7 @@ 
 							, '"' . $this->operation . '"'
 							, $this->pipe ? ", '" . $this->pipe . "'" : ''
 			);
-		}
-		else if(isset($this->default_column))
+		} else if(isset($this->default_column))
 		{
 			return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"
 							, $this->column_name
@@ -170,8 +163,7 @@ 
 							, '"' . $this->operation . '"'
 							, $this->pipe ? ", '" . $this->pipe . "'" : ''
 			);
-		}
-		else
+		} else
 		{
 			return sprintf("new ConditionWithArgument('%s',%s,%s%s)"
 							, $this->column_name

classes/xml/xmlquery/tags/condition/ConditionsTag.class.php

Spacing +13 added lines, -13 removed lines

@@ -25,42 +25,42 @@ 
 	function __construct($xml_conditions)
 	{
 		$this->condition_groups = array();
-		if(!$xml_conditions)
+		if (!$xml_conditions)
 		{
 			return;
 		}
 
 		$xml_condition_list = array();
-		if($xml_conditions->condition)
+		if ($xml_conditions->condition)
 		{
 			$xml_condition_list = $xml_conditions->condition;
 		}
 
-		if($xml_conditions->query)
+		if ($xml_conditions->query)
 		{
-			if(!is_array($xml_condition_list))
+			if (!is_array($xml_condition_list))
 			{
 				$xml_condition_list = array($xml_condition_list);
 			}
-			if(!is_array($xml_conditions->query))
+			if (!is_array($xml_conditions->query))
 			{
 				$xml_conditions->query = array($xml_conditions->query);
 			}
 			$xml_condition_list = array_merge($xml_condition_list, $xml_conditions->query);
 		}
-		if($xml_condition_list)
+		if ($xml_condition_list)
 		{
 			$this->condition_groups[] = new ConditionGroupTag($xml_condition_list);
 		}
 
 		$xml_groups = $xml_conditions->group;
-		if($xml_groups)
+		if ($xml_groups)
 		{
-			if(!is_array($xml_groups))
+			if (!is_array($xml_groups))
 			{
 				$xml_groups = array($xml_groups);
 			}
-			foreach($xml_groups as $group)
+			foreach ($xml_groups as $group)
 			{
 				$this->condition_groups[] = new ConditionGroupTag($group->condition, $group->attrs->pipe);
 			}
@@ -73,10 +73,10 @@ 
 	 */
 	function toString()
 	{
-		$output_conditions = 'array(' . PHP_EOL;
-		foreach($this->condition_groups as $condition)
+		$output_conditions = 'array('.PHP_EOL;
+		foreach ($this->condition_groups as $condition)
 		{
-			$output_conditions .= $condition->getConditionGroupString() . PHP_EOL . ',';
+			$output_conditions .= $condition->getConditionGroupString().PHP_EOL.',';
 		}
 		$output_conditions = substr($output_conditions, 0, -1);
 		$output_conditions .= ')';
@@ -86,7 +86,7 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->condition_groups as $condition)
+		foreach ($this->condition_groups as $condition)
 		{
 			$arguments = array_merge($arguments, $condition->getArguments());
 		}

classes/xml/xmlquery/tags/navigation/IndexTag.class.php

Spacing +4 added lines, -4 removed lines

@@ -59,18 +59,18 @@ 
 		// Sort order - asc / desc
 		$this->sort_order = $index->attrs->order;
 		$sortList = array('asc' => 1, 'desc' => 1);
-		if(!isset($sortList[$this->sort_order]))
+		if (!isset($sortList[$this->sort_order]))
 		{
 			$arg = new Xml_Node_();
 			$arg->attrs = new Xml_Node_();
 			$arg->attrs->var = $this->sort_order;
 			$arg->attrs->default = 'asc';
 			$this->sort_order_argument = new SortQueryArgument($arg);
-			$this->sort_order = '$' . $this->sort_order_argument->getArgumentName() . '_argument';
+			$this->sort_order = '$'.$this->sort_order_argument->getArgumentName().'_argument';
 		}
 		else
 		{
-			$this->sort_order = '"' . $this->sort_order . '"';
+			$this->sort_order = '"'.$this->sort_order.'"';
 		}
 	}
 
@@ -83,7 +83,7 @@ 
 	{
 		$arguments = array();
 		$arguments[] = $this->argument;
-		if($this->sort_order_argument)
+		if ($this->sort_order_argument)
 		{
 			$arguments[] = $this->sort_order_argument;
 		}

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 			$arg->attrs->default = 'asc';
 			$this->sort_order_argument = new SortQueryArgument($arg);
 			$this->sort_order = '$' . $this->sort_order_argument->getArgumentName() . '_argument';
-		}
-		else
+		} else
 		{
 			$this->sort_order = '"' . $this->sort_order . '"';
 		}

classes/xml/xmlquery/tags/navigation/LimitTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
 	 */
 	function __construct($index)
 	{
-		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)
+		if ($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)
 		{
-			if(!isset($index->page->attrs->default))
+			if (!isset($index->page->attrs->default))
 				$index->page->attrs->default = 1;
-			if(!isset($index->page_count->attrs->default))
+			if (!isset($index->page_count->attrs->default))
 				$index->page_count->attrs->default = 10;
 			$this->page = new QueryArgument($index->page);
 			$this->page_count = new QueryArgument($index->page_count);
@@ -60,12 +60,12 @@ 
 			$this->arguments[] = $this->page_count;
 		}
 
-		if(!isset($index->list_count->attrs->default))
+		if (!isset($index->list_count->attrs->default))
 			$index->list_count->attrs->default = 0;
 		$this->list_count = new QueryArgument($index->list_count);
 		$this->arguments[] = $this->list_count;
 		
-		if(isset($index->offset) && isset($index->offset->attrs))
+		if (isset($index->offset) && isset($index->offset->attrs))
 		{
 			$this->offset = new QueryArgument($index->offset);
 			$this->arguments[] = $this->offset;
@@ -74,11 +74,11 @@ 
 
 	function toString()
 	{
-		if($this->page)
+		if ($this->page)
 		{
 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());
 		}
-		elseif($this->offset)
+		elseif ($this->offset)
 		{
 			return sprintf('new Limit(${\'%s_argument\'}, NULL, NULL, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->offset->getArgumentName());
 		}

Braces +11 added lines, -10 removed lines

@@ -50,18 +50,21 @@ 
 	{
 		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)
 		{
-			if(!isset($index->page->attrs->default))
-				$index->page->attrs->default = 1;
-			if(!isset($index->page_count->attrs->default))
-				$index->page_count->attrs->default = 10;
+			if(!isset($index->page->attrs->default)) {
+							$index->page->attrs->default = 1;
+			}
+			if(!isset($index->page_count->attrs->default)) {
+							$index->page_count->attrs->default = 10;
+			}
 			$this->page = new QueryArgument($index->page);
 			$this->page_count = new QueryArgument($index->page_count);
 			$this->arguments[] = $this->page;
 			$this->arguments[] = $this->page_count;
 		}
 
-		if(!isset($index->list_count->attrs->default))
-			$index->list_count->attrs->default = 0;
+		if(!isset($index->list_count->attrs->default)) {
+					$index->list_count->attrs->default = 0;
+		}
 		$this->list_count = new QueryArgument($index->list_count);
 		$this->arguments[] = $this->list_count;
 		
@@ -77,12 +80,10 @@ 
 		if($this->page)
 		{
 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());
-		}
-		elseif($this->offset)
+		} elseif($this->offset)
 		{
 			return sprintf('new Limit(${\'%s_argument\'}, NULL, NULL, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->offset->getArgumentName());
-		}
-		else
+		} else
 		{
 			return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());
 		}

classes/xml/xmlquery/tags/navigation/NavigationTag.class.php

Spacing +14 added lines, -14 removed lines

@@ -49,36 +49,36 @@ 
 	function __construct($xml_navigation)
 	{
 		$this->order = array();
-		if($xml_navigation)
+		if ($xml_navigation)
 		{
 			$order = $xml_navigation->index;
-			if($order)
+			if ($order)
 			{
-				if(!is_array($order))
+				if (!is_array($order))
 				{
 					$order = array($order);
 				}
-				foreach($order as $order_info)
+				foreach ($order as $order_info)
 				{
 					$this->order[] = new IndexTag($order_info);
 				}
 
-				if($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)
+				if ($xml_navigation->page && $xml_navigation->page->attrs || $xml_navigation->list_count && $xml_navigation->list_count->attrs)
 				{
 					$this->limit = new LimitTag($xml_navigation);
 				}
 
-				if($xml_navigation->list_count)
+				if ($xml_navigation->list_count)
 				{
 					$this->list_count = $xml_navigation->list_count->attrs;
 				}
 
-				if($xml_navigation->page_count)
+				if ($xml_navigation->page_count)
 				{
 					$this->page_count = $xml_navigation->page_count->attrs;
 				}
 
-				if($xml_navigation->page)
+				if ($xml_navigation->page)
 				{
 					$this->page = $xml_navigation->page->attrs;
 				}
@@ -92,10 +92,10 @@ 
 	 */
 	function getOrderByString()
 	{
-		$output = 'array(' . PHP_EOL;
-		foreach($this->order as $order)
+		$output = 'array('.PHP_EOL;
+		foreach ($this->order as $order)
 		{
-			$output .= $order->toString() . PHP_EOL . ',';
+			$output .= $order->toString().PHP_EOL.',';
 		}
 		$output = substr($output, 0, -1);
 		$output .= ')';
@@ -108,7 +108,7 @@ 
 	 */
 	function getLimitString()
 	{
-		if($this->limit)
+		if ($this->limit)
 		{
 			return $this->limit->toString();
 		}
@@ -121,11 +121,11 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		foreach($this->order as $order)
+		foreach ($this->order as $order)
 		{
 			$arguments = array_merge($order->getArguments(), $arguments);
 		}
-		if($this->limit)
+		if ($this->limit)
 		{
 			$arguments = array_merge($this->limit->getArguments(), $arguments);
 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)
 		{
 			return $this->limit->toString();
-		}
-		else
+		} else
 		{
 			return "";
 		}