xpressengine / xe-core

classes/cache/CacheFile.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Return whether support or not support cache
 	 *
-	 * @return true
+	 * @return boolean
 	 */
 	function isSupport()
 	{
@@ -164,7 +164,7 @@ 
 	/**
 	 * Truncate all existing variables at the cache
 	 *
-	 * @return bool Returns true on success or false on failure.
+	 * @return boolean|null Returns true on success or false on failure.
 	 */
 	function truncate()
 	{

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getInstance()
 	{
-		if(!$GLOBALS['__CacheFile__'])
+		if (!$GLOBALS['__CacheFile__'])
 		{
 			$GLOBALS['__CacheFile__'] = new CacheFile();
 		}
@@ -37,7 +37,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->cache_dir = _XE_PATH_ . $this->cache_dir;
+		$this->cache_dir = _XE_PATH_.$this->cache_dir;
 		FileHandler::makeDir($this->cache_dir);
 	}
 
@@ -49,7 +49,7 @@ 
 	 */
 	function getCacheFileName($key)
 	{
-		return $this->cache_dir . str_replace(':', DIRECTORY_SEPARATOR, $key) . '.php';
+		return $this->cache_dir.str_replace(':', DIRECTORY_SEPARATOR, $key).'.php';
 	}
 
 	/**
@@ -76,9 +76,9 @@ 
 		$content = array();
 		$content[] = '<?php';
 		$content[] = 'if(!defined(\'__XE__\')) { exit(); }';
-		$content[] = 'return \'' . addslashes(serialize($obj)) . '\';';
+		$content[] = 'return \''.addslashes(serialize($obj)).'\';';
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $content));
-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}
@@ -95,9 +95,9 @@ 
 	{
 		$cache_file = $this->getCacheFileName($key);
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
-			if($modified_time > 0 && filemtime($cache_file) < $modified_time)
+			if ($modified_time > 0 && filemtime($cache_file) < $modified_time)
 			{
 				FileHandler::removeFile($cache_file);
 				return false;
@@ -118,12 +118,12 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		if(!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
+		if (!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && filemtime($cache_file) < $modified_time)
+		if ($modified_time > 0 && filemtime($cache_file) < $modified_time)
 		{
 			FileHandler::removeFile($cache_file);
 			return false;
@@ -143,7 +143,7 @@ 
 	function _delete($_key)
 	{
 		$cache_file = $this->getCacheFileName($_key);
-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}

classes/cache/CacheMemcache.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * Do not use this directly. You can use getInstance() instead.
 	 * @param string $url url of memcache
-	 * @return void
+	 * @return false|null
 	 */
 	function __construct($url)
 	{

classes/db/queryparts/condition/Condition.class.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
 	}
 
+	/**
+	 * @param string $pipe
+	 */
 	function setPipe($pipe)
 	{
 		$this->pipe = $pipe;

Spacing +33 added lines, -33 removed lines

@@ -61,13 +61,13 @@ 
 	 */
 	function toString($withValue = true)
 	{
-		if(!isset($this->_value_to_string))
+		if (!isset($this->_value_to_string))
 		{
-			if(!$this->show())
+			if (!$this->show())
 			{
 				$this->_value_to_string = '';
 			}
-			else if($withValue)
+			else if ($withValue)
 			{
 				$this->_value_to_string = $this->toStringWithValue();
 			}
@@ -85,7 +85,7 @@ 
 	 */
 	function toStringWithoutValue()
 	{
-		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
+		return $this->pipe.' '.$this->getConditionPart($this->_value);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	function toStringWithValue()
 	{
-		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
+		return $this->pipe.' '.$this->getConditionPart($this->_value);
 	}
 
 	function setPipe($pipe)
@@ -107,16 +107,16 @@ 
 	 */
 	function show()
 	{
-		if(!isset($this->_show))
+		if (!isset($this->_show))
 		{
-			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
+			if (is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
 			{
 				$this->_show = false;
 			}
 			else
 			{
 				$this->_show = true;
-				switch($this->operation)
+				switch ($this->operation)
 				{
 					case 'equal' :
 					case 'more' :
@@ -138,30 +138,30 @@ 
 					case 'not':
 					case 'notequal' :
 						// if variable is not set or is not string or number, return
-						if(!isset($this->_value))
+						if (!isset($this->_value))
 						{
 							$this->_show = false;
 							break;
 						}
-						if($this->_value === '')
+						if ($this->_value === '')
 						{
 							$this->_show = false;
 							break;
 						}
 						$tmpArray = array('string' => 1, 'integer' => 1);
-						if(!isset($tmpArray[gettype($this->_value)]))
+						if (!isset($tmpArray[gettype($this->_value)]))
 						{
 							$this->_show = false;
 							break;
 						}
 						break;
 					case 'between' :
-						if(!is_array($this->_value))
+						if (!is_array($this->_value))
 						{
 							$this->_show = false;
 							break;
 						}
-						if(count($this->_value) != 2)
+						if (count($this->_value) != 2)
 						{
 							$this->_show = false;
 							break;
@@ -188,67 +188,67 @@ 
 		$name = $this->column_name;
 		$operation = $this->operation;
 
-		switch($operation)
+		switch ($operation)
 		{
 			case 'equal' :
-				return $name . ' = ' . $value;
+				return $name.' = '.$value;
 				break;
 			case 'more' :
-				return $name . ' >= ' . $value;
+				return $name.' >= '.$value;
 				break;
 			case 'excess' :
-				return $name . ' > ' . $value;
+				return $name.' > '.$value;
 				break;
 			case 'less' :
-				return $name . ' <= ' . $value;
+				return $name.' <= '.$value;
 				break;
 			case 'below' :
-				return $name . ' < ' . $value;
+				return $name.' < '.$value;
 				break;
 			case 'like_tail' :
 			case 'like_prefix' :
 			case 'like' :
-				if(defined('__CUBRID_VERSION__')
+				if (defined('__CUBRID_VERSION__')
 						&& __CUBRID_VERSION__ >= '8.4.1')
-					return $name . ' rlike ' . $value;
+					return $name.' rlike '.$value;
 				else
-					return $name . ' like ' . $value;
+					return $name.' like '.$value;
 				break;
 			case 'notlike_tail' :
 			case 'notlike_prefix' :
 			case 'notlike' :
-				return $name . ' not like ' . $value;
+				return $name.' not like '.$value;
 				break;
 			case 'in' :
-				return $name . ' in ' . $value;
+				return $name.' in '.$value;
 				break;
 			case 'notin' :
 			case 'not_in' :
-				return $name . ' not in ' . $value;
+				return $name.' not in '.$value;
 				break;
 			case 'notequal' :
-				return $name . ' <> ' . $value;
+				return $name.' <> '.$value;
 				break;
 			case 'notnull' :
-				return $name . ' is not null';
+				return $name.' is not null';
 				break;
 			case 'null' :
-				return $name . ' is null';
+				return $name.' is null';
 				break;
 			case 'and' :
-				return $name . ' & ' . $value;
+				return $name.' & '.$value;
 				break;
 			case 'or' :
-				return $name . ' | ' . $value;
+				return $name.' | '.$value;
 				break;
 			case 'xor' :
-				return $name . ' ^ ' . $value;
+				return $name.' ^ '.$value;
 				break;
 			case 'not' :
-				return $name . ' ~ ' . $value;
+				return $name.' ~ '.$value;
 				break;
 			case 'between' :
-				return $name . ' between ' . $value[0] . ' and ' . $value[1];
+				return $name.' between '.$value[0].' and '.$value[1];
 				break;
 		}
 	}

Braces +8 added lines, -10 removed lines

@@ -66,12 +66,10 @@ 
 			if(!$this->show())
 			{
 				$this->_value_to_string = '';
-			}
-			else if($withValue)
+			} else if($withValue)
 			{
 				$this->_value_to_string = $this->toStringWithValue();
-			}
-			else
+			} else
 			{
 				$this->_value_to_string = $this->toStringWithoutValue();
 			}
@@ -112,8 +110,7 @@ 
 			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
 			{
 				$this->_show = false;
-			}
-			else
+			} else
 			{
 				$this->_show = true;
 				switch($this->operation)
@@ -209,10 +206,11 @@ 
 			case 'like_prefix' :
 			case 'like' :
 				if(defined('__CUBRID_VERSION__')
-						&& __CUBRID_VERSION__ >= '8.4.1')
-					return $name . ' rlike ' . $value;
-				else
-					return $name . ' like ' . $value;
+						&& __CUBRID_VERSION__ >= '8.4.1') {
+									return $name . ' rlike ' . $value;
+				} else {
+									return $name . ' like ' . $value;
+				}
 				break;
 			case 'notlike_tail' :
 			case 'notlike_prefix' :

classes/db/queryparts/condition/ConditionWithoutArgument.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
 	/**
 	 * constructor
 	 * @param string $column_name
-	 * @param mixed $argument
+	 * @param integer $argument
 	 * @param string $operation
 	 * @param string $pipe
-	 * @return void
+	 * @return boolean
 	 */
 	function __construct($column_name, $argument, $operation, $pipe = "")
 	{

Spacing +3 added lines, -3 removed lines

@@ -21,13 +21,13 @@
 	{
 		parent::__construct($column_name, $argument, $operation, $pipe);
 		$tmpArray = array('in' => 1, 'notin' => 1, 'not_in' => 1);
-		if(isset($tmpArray[$operation]))
+		if (isset($tmpArray[$operation]))
 		{
-			if(is_array($argument))
+			if (is_array($argument))
 			{
 				$argument = implode($argument, ',');
 			}
-			$this->_value = '(' . $argument . ')';
+			$this->_value = '('.$argument.')';
 		}
 		else
 		{

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
 				$argument = implode($argument, ',');
 			}
 			$this->_value = '(' . $argument . ')';
-		}
-		else
+		} else
 		{
 			$this->_value = $argument;
 		}

classes/db/queryparts/expression/UpdateExpression.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	/**
 	 * constructor
 	 * @param string $column_name
-	 * @param object $argument
+	 * @param Argument $argument
 	 * @return void
 	 */
 	function __construct($column_name, $argument)

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	function getExpression($with_value = true)
 	{
-		if($with_value)
+		if ($with_value)
 		{
 			return $this->getExpressionWithValue();
 		}
@@ -50,7 +50,7 @@ 
 	{
 		$value = $this->argument->getValue();
 		$operation = $this->argument->getColumnOperation();
-		if(isset($operation))
+		if (isset($operation))
 		{
 			return "$this->column_name = $this->column_name $operation $value";
 		}
@@ -65,7 +65,7 @@ 
 	function getExpressionWithoutValue()
 	{
 		$operation = $this->argument->getColumnOperation();
-		if(isset($operation))
+		if (isset($operation))
 		{
 			return "$this->column_name = $this->column_name $operation ?";
 		}
@@ -76,21 +76,21 @@ 
 	{
 		// TODO Escape value according to column type instead of variable type
 		$value = $this->argument->getValue();
-		if(!is_numeric($value))
+		if (!is_numeric($value))
 		{
-			return "'" . $value . "'";
+			return "'".$value."'";
 		}
 		return $value;
 	}
 
 	function show()
 	{
-		if(!$this->argument)
+		if (!$this->argument)
 		{
 			return false;
 		}
 		$value = $this->argument->getValue();
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return false;
 		}
@@ -104,7 +104,7 @@ 
 
 	function getArguments()
 	{
-		if($this->argument)
+		if ($this->argument)
 		{
 			return array($this->argument);
 		}

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 		if($this->argument)
 		{
 			return array($this->argument);
-		}
-		else
+		} else
 		{
 			return array();
 		}

classes/mail/Mail.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	/**
 	 * Constructor function
 	 *
-	 * @return void
+	 * @return string
 	 */
 	function __construct()
 	{

classes/xml/xmlquery/argument/ConditionArgument.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 	 * In this case, the column type is retrieved according to argument
 	 * value type (using the PHP function is_numeric).
 	 *
-	 * @return type string
+	 * @return string string
 	 */
 	function getType()
 	{

Spacing +20 added lines, -20 removed lines

@@ -26,7 +26,7 @@ 
 	function __construct($name, $value, $operation)
 	{
 		$operationList = array('in' => 1, 'notin' => 1, 'not_in' => 1, 'between' => 1);
-		if(isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')
+		if (isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')
 		{
 			$value = str_replace(' ', '', $value);
 			$value = str_replace('\'', '', $value);
@@ -42,7 +42,7 @@ 
 	 */
 	function createConditionValue()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			return;
 		}
@@ -50,56 +50,56 @@ 
 		$operation = $this->operation;
 		$value = $this->value;
 
-		switch($operation)
+		switch ($operation)
 		{
 			case 'like_prefix' :
-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
-					$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));
+					$this->value = '^'.str_replace('%', '(.*)', preg_quote($value));
 				}
 				else
 				{
-					$this->value = $value . '%';
+					$this->value = $value.'%';
 				}
 				break;
 			case 'like_tail' :
-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
-					$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';
+					$this->value = str_replace('%', '(.*)', preg_quote($value)).'$';
 				}
 				else
 				{
-					$this->value = '%' . $value;
+					$this->value = '%'.$value;
 				}
 				break;
 			case 'like' :
-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = str_replace('%', '(.*)', preg_quote($value));
 				}
 				else
 				{
-					$this->value = '%' . $value . '%';
+					$this->value = '%'.$value.'%';
 				}
 				break;
 			case 'notlike' :
-				$this->value = '%' . $value . '%';
+				$this->value = '%'.$value.'%';
 				break;
 			case 'notlike_prefix' :
-				$this->value = $value . '%';
+				$this->value = $value.'%';
 				break;
 			case 'notlike_tail' :
-				$this->value = '%' . $value;
+				$this->value = '%'.$value;
 				break;
 			case 'in':
-				if(!is_array($value))
+				if (!is_array($value))
 				{
 					$this->value = array($value);
 				}
 				break;
 			case 'notin':
 			case 'not_in':
-				if(!is_array($value))
+				if (!is_array($value))
 				{
 					$this->value = array($value);
 				}
@@ -120,11 +120,11 @@ 
 	 */
 	function getType()
 	{
-		if($this->type)
+		if ($this->type)
 		{
 			return $this->type;
 		}
-		else if(!is_numeric($this->value))
+		else if (!is_numeric($this->value))
 		{
 			return 'varchar';
 		}
@@ -136,11 +136,11 @@ 
 
 	function setColumnType($column_type)
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			return;
 		}
-		if($column_type === '')
+		if ($column_type === '')
 		{
 			return;
 		}

Braces +5 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));
-				}
-				else
+				} else
 				{
 					$this->value = $value . '%';
 				}
@@ -66,8 +65,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';
-				}
-				else
+				} else
 				{
 					$this->value = '%' . $value;
 				}
@@ -76,8 +74,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = str_replace('%', '(.*)', preg_quote($value));
-				}
-				else
+				} else
 				{
 					$this->value = '%' . $value . '%';
 				}
@@ -123,12 +120,10 @@ 
 		if($this->type)
 		{
 			return $this->type;
-		}
-		else if(!is_numeric($this->value))
+		} else if(!is_numeric($this->value))
 		{
 			return 'varchar';
-		}
-		else
+		} else
 		{
 			return '';
 		}

classes/xml/xmlquery/QueryParser.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 *
 	 * @param object $query XML object obtained after reading the XML Query file
 	 * @param bool $isSubQuery
-	 * @return void
+	 * @return string
 	 */
 	function __construct($query = NULL, $isSubQuery = FALSE)
 	{

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	function __construct($query = NULL, $isSubQuery = FALSE)
 	{
-		if($query)
+		if ($query)
 		{
 			$this->queryTag = new QueryTag($query, $isSubQuery);
 		}
@@ -54,17 +54,17 @@ 
 		$module = '';
 
 		$id_args = explode('.', $query_id);
-		if(count($id_args) == 2)
+		if (count($id_args) == 2)
 		{
 			$target = 'modules';
 			$module = $id_args[0];
 			$id = $id_args[1];
 		}
-		else if(count($id_args) == 3)
+		else if (count($id_args) == 3)
 		{
 			$target = $id_args[0];
 			$targetList = array('modules' => 1, 'addons' => 1, 'widgets' => 1);
-			if(!isset($targetList[$target]))
+			if (!isset($targetList[$target]))
 			{
 				return;
 			}
@@ -74,33 +74,33 @@ 
 
 		// get column properties from the table
 		$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);
-		if(!file_exists($table_file))
+		if (!file_exists($table_file))
 		{
-			$searched_list = FileHandler::readDir(_XE_PATH_ . 'modules');
+			$searched_list = FileHandler::readDir(_XE_PATH_.'modules');
 			$searched_count = count($searched_list);
-			for($i = 0; $i < $searched_count; $i++)
+			for ($i = 0; $i < $searched_count; $i++)
 			{
 				$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $searched_list[$i], $table_name);
-				if(file_exists($table_file))
+				if (file_exists($table_file))
 				{
 					break;
 				}
 			}
 		}
 
-		if(file_exists($table_file))
+		if (file_exists($table_file))
 		{
 			$table_xml = FileHandler::readFile($table_file);
 			$xml_parser = new XmlParser();
 			$table_obj = $xml_parser->parse($table_xml);
-			if($table_obj->table)
+			if ($table_obj->table)
 			{
-				if(isset($table_obj->table->column) && !is_array($table_obj->table->column))
+				if (isset($table_obj->table->column) && !is_array($table_obj->table->column))
 				{
 					$table_obj->table->column = array($table_obj->table->column);
 				}
 
-				foreach($table_obj->table->column as $k => $v)
+				foreach ($table_obj->table->column as $k => $v)
 				{
 					$column_type[$v->attrs->name] = $v->attrs->type;
 				}

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 			$target = 'modules';
 			$module = $id_args[0];
 			$id = $id_args[1];
-		}
-		else if(count($id_args) == 3)
+		} else if(count($id_args) == 3)
 		{
 			$target = $id_args[0];
 			$targetList = array('modules' => 1, 'addons' => 1, 'widgets' => 1);

classes/xml/xmlquery/tags/query/QueryTag.class.php

Doc Comments +3 added lines

@@ -169,6 +169,9 @@
 		return $this->query->attrs->action;
 	}
 
+	/**
+	 * @param TablesTag $tables
+	 */
 	function setTableColumnTypes($tables)
 	{
 		$query_id = $this->getQueryId();

Spacing +43 added lines, -43 removed lines

@@ -126,11 +126,11 @@ 
 		$this->priority = $query->attrs->priority;
 		$this->query = $query;
 		$this->isSubQuery = $isSubQuery;
-		if($this->isSubQuery)
+		if ($this->isSubQuery)
 		{
 			$this->action = 'select';
 		}
-		if($query->attrs->alias)
+		if ($query->attrs->alias)
 		{
 			$dbParser = DB::getParser();
 			$this->alias = $dbParser->escape($query->attrs->alias);
@@ -172,13 +172,13 @@ 
 	function setTableColumnTypes($tables)
 	{
 		$query_id = $this->getQueryId();
-		if(!isset($this->column_type[$query_id]))
+		if (!isset($this->column_type[$query_id]))
 		{
 			$table_tags = $tables->getTables();
 			$column_type = array();
-			foreach($table_tags as $table_tag)
+			foreach ($table_tags as $table_tag)
 			{
-				if(is_a($table_tag, 'TableTag'))
+				if (is_a($table_tag, 'TableTag'))
 				{
 					$table_name = $table_tag->getTableName();
 					$table_alias = $table_tag->getTableAlias();
@@ -192,19 +192,19 @@ 
 
 	function getColumns()
 	{
-		if($this->action == 'select')
+		if ($this->action == 'select')
 		{
 			return $this->columns = new SelectColumnsTag($this->query->columns);
 		}
-		else if($this->action == 'insert' || $this->action == 'insert-select')
+		else if ($this->action == 'insert' || $this->action == 'insert-select')
 		{
 			return $this->columns = new InsertColumnsTag($this->query->columns->column);
 		}
-		else if($this->action == 'update')
+		else if ($this->action == 'update')
 		{
 			return $this->columns = new UpdateColumnsTag($this->query->columns->column);
 		}
-		else if($this->action == 'delete')
+		else if ($this->action == 'delete')
 		{
 			return $this->columns = null;
 		}
@@ -212,7 +212,7 @@ 
 
 	function getPrebuff()
 	{
-		if($this->isSubQuery)
+		if ($this->isSubQuery)
 		{
 			return;
 		}
@@ -220,20 +220,20 @@ 
 		$arguments = $this->getArguments();
 
 		$prebuff = '';
-		foreach($arguments as $argument)
+		foreach ($arguments as $argument)
 		{
-			if(isset($argument))
+			if (isset($argument))
 			{
 				$arg_name = $argument->getArgumentName();
-				if($arg_name)
+				if ($arg_name)
 				{
 					unset($column_type);
 					$prebuff .= $argument->toString();
 
 					$table_alias = $argument->getTableName();
-					if(isset($table_alias))
+					if (isset($table_alias))
 					{
-						if(isset($this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()]))
+						if (isset($this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()]))
 						{
 							$column_type = $this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()];
 						}
@@ -242,18 +242,18 @@ 
 					{
 						$current_tables = $this->column_type[$this->getQueryId()];
 						$column_name = $argument->getColumnName();
-						foreach($current_tables as $current_table)
+						foreach ($current_tables as $current_table)
 						{
-							if(isset($current_table[$column_name]))
+							if (isset($current_table[$column_name]))
 							{
 								$column_type = $current_table[$column_name];
 							}
 						}
 					}
 
-					if(isset($column_type))
+					if (isset($column_type))
 					{
-						$prebuff .= sprintf('if(${\'%s_argument\'} !== null) ${\'%s_argument\'}->setColumnType(\'%s\');' . "\n"
+						$prebuff .= sprintf('if(${\'%s_argument\'} !== null) ${\'%s_argument\'}->setColumnType(\'%s\');'."\n"
 								, $arg_name
 								, $arg_name
 								, $column_type);
@@ -269,43 +269,43 @@ 
 	function getBuff()
 	{
 		$buff = '';
-		if($this->isSubQuery)
+		if ($this->isSubQuery)
 		{
 			$buff = 'new Subquery(';
-			$buff .= "'" . $this->alias . '\', ';
-			$buff .= ($this->columns ? $this->columns->toString() : 'null' ) . ', ' . PHP_EOL;
-			$buff .= $this->tables->toString() . ',' . PHP_EOL;
-			$buff .= $this->conditions->toString() . ',' . PHP_EOL;
-			$buff .= $this->groups->toString() . ',' . PHP_EOL;
-			$buff .= $this->navigation->getOrderByString() . ',' . PHP_EOL;
+			$buff .= "'".$this->alias.'\', ';
+			$buff .= ($this->columns ? $this->columns->toString() : 'null').', '.PHP_EOL;
+			$buff .= $this->tables->toString().','.PHP_EOL;
+			$buff .= $this->conditions->toString().','.PHP_EOL;
+			$buff .= $this->groups->toString().','.PHP_EOL;
+			$buff .= $this->navigation->getOrderByString().','.PHP_EOL;
 			$limit = $this->navigation->getLimitString();
-			$buff .= $limit ? $limit : 'null' . PHP_EOL;
-			$buff .= $this->join_type ? "'" . $this->join_type . "'" : '';
+			$buff .= $limit ? $limit : 'null'.PHP_EOL;
+			$buff .= $this->join_type ? "'".$this->join_type."'" : '';
 			$buff .= ')';
 
 			$this->buff = $buff;
 			return $this->buff;
 		}
 
-		$buff .= '$query = new Query();' . PHP_EOL;
+		$buff .= '$query = new Query();'.PHP_EOL;
 		$buff .= sprintf('$query->setQueryId("%s");%s', $this->query_id, "\n");
 		$buff .= sprintf('$query->setAction("%s");%s', $this->action, "\n");
 		$buff .= sprintf('$query->setPriority("%s");%s', $this->priority, "\n");
 		$buff .= $this->preBuff;
-		if($this->columns)
+		if ($this->columns)
 		{
-			$buff .= '$query->setColumns(' . $this->columns->toString() . ');' . PHP_EOL;
+			$buff .= '$query->setColumns('.$this->columns->toString().');'.PHP_EOL;
 		}
 
-		$buff .= '$query->setTables(' . $this->tables->toString() . ');' . PHP_EOL;
-		if($this->action == 'insert-select')
+		$buff .= '$query->setTables('.$this->tables->toString().');'.PHP_EOL;
+		if ($this->action == 'insert-select')
 		{
-			$buff .= '$query->setSubquery(' . $this->subquery->toString() . ');' . PHP_EOL;
+			$buff .= '$query->setSubquery('.$this->subquery->toString().');'.PHP_EOL;
 		}
-		$buff .= '$query->setConditions(' . $this->conditions->toString() . ');' . PHP_EOL;
-		$buff .= '$query->setGroups(' . $this->groups->toString() . ');' . PHP_EOL;
-		$buff .= '$query->setOrder(' . $this->navigation->getOrderByString() . ');' . PHP_EOL;
-		$buff .= '$query->setLimit(' . $this->navigation->getLimitString() . ');' . PHP_EOL;
+		$buff .= '$query->setConditions('.$this->conditions->toString().');'.PHP_EOL;
+		$buff .= '$query->setGroups('.$this->groups->toString().');'.PHP_EOL;
+		$buff .= '$query->setOrder('.$this->navigation->getOrderByString().');'.PHP_EOL;
+		$buff .= '$query->setLimit('.$this->navigation->getLimitString().');'.PHP_EOL;
 
 		$this->buff = $buff;
 		return $this->buff;
@@ -313,7 +313,7 @@ 
 
 	function getTables()
 	{
-		if($this->query->index_hint && ($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for)))
+		if ($this->query->index_hint && ($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for)))
 		{
 			return $this->tables = new TablesTag($this->query->tables, $this->query->index_hint);
 		}
@@ -325,7 +325,7 @@ 
 
 	function getSubquery()
 	{
-		if($this->query->query)
+		if ($this->query->query)
 		{
 			$this->subquery = new QueryTag($this->query->query, true);
 		}
@@ -338,7 +338,7 @@ 
 
 	function getGroups()
 	{
-		if($this->query->groups)
+		if ($this->query->groups)
 		{
 			return $this->groups = new GroupsTag($this->query->groups->group);
 		}
@@ -376,11 +376,11 @@ 
 	function getArguments()
 	{
 		$arguments = array();
-		if($this->columns)
+		if ($this->columns)
 		{
 			$arguments = array_merge($arguments, $this->columns->getArguments());
 		}
-		if($this->action == 'insert-select')
+		if ($this->action == 'insert-select')
 		{
 			$arguments = array_merge($arguments, $this->subquery->getArguments());
 		}

Braces +6 added lines, -12 removed lines

@@ -195,16 +195,13 @@ 
 		if($this->action == 'select')
 		{
 			return $this->columns = new SelectColumnsTag($this->query->columns);
-		}
-		else if($this->action == 'insert' || $this->action == 'insert-select')
+		} else if($this->action == 'insert' || $this->action == 'insert-select')
 		{
 			return $this->columns = new InsertColumnsTag($this->query->columns->column);
-		}
-		else if($this->action == 'update')
+		} else if($this->action == 'update')
 		{
 			return $this->columns = new UpdateColumnsTag($this->query->columns->column);
-		}
-		else if($this->action == 'delete')
+		} else if($this->action == 'delete')
 		{
 			return $this->columns = null;
 		}
@@ -237,8 +234,7 @@ 
 						{
 							$column_type = $this->column_type[$this->getQueryId()][$table_alias][$argument->getColumnName()];
 						}
-					}
-					else
+					} else
 					{
 						$current_tables = $this->column_type[$this->getQueryId()];
 						$column_name = $argument->getColumnName();
@@ -316,8 +312,7 @@ 
 		if($this->query->index_hint && ($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for)))
 		{
 			return $this->tables = new TablesTag($this->query->tables, $this->query->index_hint);
-		}
-		else
+		} else
 		{
 			return $this->tables = new TablesTag($this->query->tables);
 		}
@@ -341,8 +336,7 @@ 
 		if($this->query->groups)
 		{
 			return $this->groups = new GroupsTag($this->query->groups->group);
-		}
-		else
+		} else
 		{
 			return $this->groups = new GroupsTag(NULL);
 		}