pradosoft / prado

framework/Data/Common/Oracle/TOracleTableInfo.php

Doc Comments +3 added lines, -1 removed lines

@@ -48,7 +48,7 @@ 
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TOracleCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{
@@ -58,6 +58,8 @@ 
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
+	 * @param boolean $default
 	 * @return mixed information array value.
 	 */
 	public function getInfo($name, $default = null)

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
  */
 class TOracleTableInfo extends \Prado\TComponent
 {
-	private $_info = [];
+	private $_info=[];
 
 	private $_primaryKeys;
 	private $_foreignKeys;
@@ -38,12 +38,12 @@ 
 	 * Sets the database table meta data information.
 	 * @param array table column information.
 	 */
-	public function __construct($tableInfo = [], $primary = [], $foreign = [])
+	public function __construct($tableInfo=[], $primary=[], $foreign=[])
 	{
-		$this->_info = $tableInfo;
-		$this->_primaryKeys = $primary;
-		$this->_foreignKeys = $foreign;
-		$this->_columns = new TMap;
+		$this->_info=$tableInfo;
+		$this->_primaryKeys=$primary;
+		$this->_foreignKeys=$foreign;
+		$this->_columns=new TMap;
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	public function getInfo($name, $default = null)
+	public function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -71,7 +71,7 @@ 
 	 */
 	protected function setInfo($name, $value)
 	{
-		$this->_info[$name] = $value;
+		$this->_info[$name]=$value;
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function getTableFullName()
 	{
-		return $this->_info['SchemaName'] . '.' . $this->getTableName();
+		return $this->_info['SchemaName'].'.'.$this->getTableName();
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name)) !== null)
+		if(($column=$this->_columns->itemAt($name))!==null)
 			return $column;
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
@@ -124,7 +124,7 @@ 
 	public function getColumnNames()
 	{
 		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
+			$names[]=$column->getColumnName();
 		return $names;
 	}
 
@@ -149,11 +149,11 @@ 
 	 */
 	public function getLowerCaseColumnNames()
 	{
-		if($this->_lowercase === null)
+		if($this->_lowercase===null)
 		{
-			$this->_lowercase = [];
+			$this->_lowercase=[];
 			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+				$this->_lowercase[strtolower($key)]=$key;
 		}
 		return $this->_lowercase;
 	}

framework/Data/Common/TDbTableColumn.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
 	 * @return mixed information array value.
 	 */
 	protected function getInfo($name, $default = null)

Spacing +9 added lines, -9 removed lines

@@ -22,9 +22,9 @@ 
  */
 class TDbTableColumn extends \Prado\TComponent
 {
-	const UNDEFINED_VALUE = INF; //use infinity for undefined value
+	const UNDEFINED_VALUE=INF; //use infinity for undefined value
 
-	private $_info = [];
+	private $_info=[];
 
 	/**
 	 * Sets the table column meta data.
@@ -32,7 +32,7 @@ 
 	 */
 	public function __construct($columnInfo)
 	{
-		$this->_info = $columnInfo;
+		$this->_info=$columnInfo;
 	}
 
 	/**
@@ -40,7 +40,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	protected function getInfo($name, $default = null)
+	protected function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -51,7 +51,7 @@ 
 	 */
 	protected function setInfo($name, $value)
 	{
-		$this->_info[$name] = $value;
+		$this->_info[$name]=$value;
 	}
 
 	/**
@@ -151,10 +151,10 @@ 
 
 	public function getMaxiumNumericConstraint()
 	{
-		if(($precision = $this->getNumericPrecision()) !== null)
+		if(($precision=$this->getNumericPrecision())!==null)
 		{
-			$scale = $this->getNumericScale();
-			return $scale === null ? pow(10, $precision) : pow(10, $precision - $scale);
+			$scale=$this->getNumericScale();
+			return $scale===null ? pow(10, $precision) : pow(10, $precision - $scale);
 		}
 	}
 
@@ -187,7 +187,7 @@ 
 	 */
 	public function hasSequence()
 	{
-		return $this->getSequenceName() !== null;
+		return $this->getSequenceName()!==null;
 	}
 
 	/**

framework/Data/Common/TDbTableInfo.php

Doc Comments +2 added lines

@@ -63,6 +63,8 @@
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
+	 * @param boolean $default
 	 * @return mixed information array value.
 	 */
 	protected function getInfo($name, $default = null)

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
  */
 class TDbTableInfo extends \Prado\TComponent
 {
-	private $_info = [];
+	private $_info=[];
 
 	private $_primaryKeys;
 	private $_foreignKeys;
@@ -43,12 +43,12 @@ 
 	 * Sets the database table meta data information.
 	 * @param array table column information.
 	 */
-	public function __construct($tableInfo = [], $primary = [], $foreign = [])
+	public function __construct($tableInfo=[], $primary=[], $foreign=[])
 	{
-		$this->_info = $tableInfo;
-		$this->_primaryKeys = $primary;
-		$this->_foreignKeys = $foreign;
-		$this->_columns = new TMap;
+		$this->_info=$tableInfo;
+		$this->_primaryKeys=$primary;
+		$this->_foreignKeys=$foreign;
+		$this->_columns=new TMap;
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	protected function getInfo($name, $default = null)
+	protected function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -76,7 +76,7 @@ 
 	 */
 	protected function setInfo($name, $value)
 	{
-		$this->_info[$name] = $value;
+		$this->_info[$name]=$value;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name)) !== null)
+		if(($column=$this->_columns->itemAt($name))!==null)
 			return $column;
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
@@ -128,11 +128,11 @@ 
 	 */
 	public function getColumnNames()
 	{
-		if($this->_names === null)
+		if($this->_names===null)
 		{
-			$this->_names = [];
+			$this->_names=[];
 			foreach($this->getColumns() as $column)
-				$this->_names[] = $column->getColumnName();
+				$this->_names[]=$column->getColumnName();
 		}
 		return $this->_names;
 	}
@@ -158,11 +158,11 @@ 
 	 */
 	public function getLowerCaseColumnNames()
 	{
-		if($this->_lowercase === null)
+		if($this->_lowercase===null)
 		{
-			$this->_lowercase = [];
+			$this->_lowercase=[];
 			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+				$this->_lowercase[strtolower($key)]=$key;
 		}
 		return $this->_lowercase;
 	}

framework/Data/DataGateway/TTableGateway.php

Doc Comments +5 added lines

@@ -103,6 +103,7 @@ 
 
 	/**
 	 * @param TDbTableInfo table or view information.
+	 * @param TDbTableInfo $tableInfo
 	 */
 	protected function setTableInfo($tableInfo)
 	{
@@ -113,6 +114,7 @@ 
 	/**
 	 * Sets up the command builder for the given table.
 	 * @param string table or view name.
+	 * @param string $tableName
 	 */
 	protected function setTableName($tableName)
 	{
@@ -224,6 +226,7 @@ 
 	 *
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return array matching record object.
 	 */
 	public function find($criteria, $parameters = [])
@@ -237,6 +240,7 @@ 
 	 * Accepts same parameters as find(), but returns TDbDataReader instead.
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return TDbDataReader matching records.
 	 */
 	public function findAll($criteria = null, $parameters = [])
@@ -299,6 +303,7 @@ 
 	 * </code>
 	 * @param string delete condition.
 	 * @param array condition parameters.
+	 * @param TSqlCriteria $criteria
 	 * @return integer number of records deleted.
 	 */
 	public function deleteAll($criteria, $parameters = [])

Spacing +44 added lines, -44 removed lines

@@ -92,7 +92,7 @@ 
 	 */
 	public function __construct($table, $connection)
 	{
-		$this->_connection = $connection;
+		$this->_connection=$connection;
 		if(is_string($table))
 			$this->setTableName($table);
 		elseif($table instanceof TDbTableInfo)
@@ -106,7 +106,7 @@ 
 	 */
 	protected function setTableInfo($tableInfo)
 	{
-		$builder = $tableInfo->createCommandBuilder($this->getDbConnection());
+		$builder=$tableInfo->createCommandBuilder($this->getDbConnection());
 		$this->initCommandBuilder($builder);
 	}
 
@@ -116,7 +116,7 @@ 
 	 */
 	protected function setTableName($tableName)
 	{
-		$meta = TDbMetaData::getInstance($this->getDbConnection());
+		$meta=TDbMetaData::getInstance($this->getDbConnection());
 		$this->initCommandBuilder($meta->createCommandBuilder($tableName));
 	}
 
@@ -135,9 +135,9 @@ 
 	 */
 	protected function initCommandBuilder($builder)
 	{
-		$this->_command = new TDataGatewayCommand($builder);
-		$this->_command->OnCreateCommand[] = [$this, 'onCreateCommand'];
-		$this->_command->OnExecuteCommand[] = [$this, 'onExecuteCommand'];
+		$this->_command=new TDataGatewayCommand($builder);
+		$this->_command->OnCreateCommand[]=[$this, 'onCreateCommand'];
+		$this->_command->OnExecuteCommand[]=[$this, 'onExecuteCommand'];
 	}
 
 	/**
@@ -189,10 +189,10 @@ 
 	 * @param array binding parameters, positional or named.
 	 * @return array query results.
 	 */
-	public function findBySql($sql, $parameters = [])
+	public function findBySql($sql, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getCriteria($sql, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findBySql($criteria);
 	}
 
@@ -202,10 +202,10 @@ 
 	 * @param array binding parameters, positional or named.
 	 * @return TDbDataReader query results.
 	 */
-	public function findAllBySql($sql, $parameters = [])
+	public function findAllBySql($sql, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getCriteria($sql, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findAllBySql($criteria);
 	}
 
@@ -226,10 +226,10 @@ 
 	 * @param mixed parameter values.
 	 * @return array matching record object.
 	 */
-	public function find($criteria, $parameters = [])
+	public function find($criteria, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->find($criteria);
 	}
 
@@ -239,11 +239,11 @@ 
 	 * @param mixed parameter values.
 	 * @return TDbDataReader matching records.
 	 */
-	public function findAll($criteria = null, $parameters = [])
+	public function findAll($criteria=null, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
-			$criteria = $this->getCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if($criteria!==null)
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -262,7 +262,7 @@ 
 	public function findByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
 
@@ -286,7 +286,7 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
 
@@ -301,10 +301,10 @@ 
 	 * @param array condition parameters.
 	 * @return integer number of records deleted.
 	 */
-	public function deleteAll($criteria, $parameters = [])
+	public function deleteAll($criteria, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->delete($criteria);
 	}
 
@@ -334,7 +334,7 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
 
@@ -344,7 +344,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 
@@ -354,11 +354,11 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria = null, $parameters = [])
+	public function count($criteria=null, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
-			$criteria = $this->getCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if($criteria!==null)
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -376,10 +376,10 @@ 
 	 * @param array additional binding name-value pairs.
 	 * @return integer number of records updated.
 	 */
-	public function update($data, $criteria, $parameters = [])
+	public function update($data, $criteria, $parameters=[])
 	{
-		$args = func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
-		$criteria = $this->getCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->update($data, $criteria);
 	}
 
@@ -416,7 +416,7 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
+			$useArgs=!is_array($parameters) && is_array($args);
 			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		elseif($criteria instanceof TSqlCriteria)
@@ -456,19 +456,19 @@ 
 	 */
 	public function __call($method, $args)
 	{
-		$delete = false;
-		if($findOne = substr(strtolower($method), 0, 6) === 'findby')
-			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
-		elseif(substr(strtolower($method), 0, 9) === 'findallby')
-			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
-		elseif($delete = substr(strtolower($method), 0, 8) === 'deleteby')
-			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
-		elseif($delete = substr(strtolower($method), 0, 11) === 'deleteallby')
-			$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
+		$delete=false;
+		if($findOne=substr(strtolower($method), 0, 6)==='findby')
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		elseif(substr(strtolower($method), 0, 9)==='findallby')
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		elseif($delete=substr(strtolower($method), 0, 8)==='deleteby')
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		elseif($delete=substr(strtolower($method), 0, 11)==='deleteallby')
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 			return null;
 
-		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getCommand()->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else

framework/Data/SqlMap/Configuration/TSqlMapStatement.php

Doc Comments +1 added lines

@@ -270,6 +270,7 @@
 	 * @param TSqlMapTypeHandlerRegistry type handler registry
 	 * @param string result class name.
 	 * @param array result data.
+	 * @param string $type
 	 * @return mixed result object.
 	 */
 	protected function createInstanceOf($registry, $type, $row = null)

Spacing +32 added lines, -32 removed lines

@@ -57,7 +57,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_ID = $value;
+		$this->_ID=$value;
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 */
 	public function setParameterMap($value)
 	{
-		$this->_parameterMapName = $value;
+		$this->_parameterMapName=$value;
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setParameterClass($value)
 	{
-		$this->_parameterClassName = $value;
+		$this->_parameterClassName=$value;
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function setResultMap($value)
 	{
-		$this->_resultMapName = $value;
+		$this->_resultMapName=$value;
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setResultClass($value)
 	{
-		$this->_resultClassName = $value;
+		$this->_resultClassName=$value;
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function setCacheModel($value)
 	{
-		$this->_cacheModelName = $value;
+		$this->_cacheModelName=$value;
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function setCache($value)
 	{
-		$this->_cache = $value;
+		$this->_cache=$value;
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 */
 	public function setSqlText($value)
 	{
-		$this->_SQL = $value;
+		$this->_SQL=$value;
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function setListClass($value)
 	{
-		$this->_listClass = $value;
+		$this->_listClass=$value;
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extendStatement = $value;
+		$this->_extendStatement=$value;
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 */
 	public function setInlineParameterMap($map)
 	{
-		$this->_parameterMap = $map;
+		$this->_parameterMap=$map;
 	}
 
 	/**
@@ -249,9 +249,9 @@ 
 	public function initialize($manager)
 	{
 		if(strlen($this->_resultMapName) > 0)
-			$this->_resultMap = $manager->getResultMap($this->_resultMapName);
+			$this->_resultMap=$manager->getResultMap($this->_resultMapName);
 		if(strlen($this->_parameterMapName) > 0)
-			$this->_parameterMap = $manager->getParameterMap($this->_parameterMapName);
+			$this->_parameterMap=$manager->getParameterMap($this->_parameterMapName);
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 */
 	public function createInstanceOfListClass($registry)
 	{
-		if(strlen($type = $this->getListClass()) > 0)
+		if(strlen($type=$this->getListClass()) > 0)
 			return $this->createInstanceOf($registry, $type);
 		return [];
 	}
@@ -272,10 +272,10 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	protected function createInstanceOf($registry, $type, $row = null)
+	protected function createInstanceOf($registry, $type, $row=null)
 	{
-		$handler = $registry->getTypeHandler($type);
-		if($handler !== null)
+		$handler=$registry->getTypeHandler($type);
+		if($handler!==null)
 			return $handler->createNewInstance($row);
 		else
 			return $registry->createInstanceOf($type);
@@ -289,26 +289,26 @@ 
 	 */
 	public function createInstanceOfResultClass($registry, $row)
 	{
-		if(strlen($type = $this->getResultClass()) > 0)
+		if(strlen($type=$this->getResultClass()) > 0)
 			return $this->createInstanceOf($registry, $type, $row);
 	}
 
 	public function __sleep()
 	{
-		$cn = __CLASS__;
-		$exprops = ["\0$cn\0_resultMap"];
-		if (!$this->_parameterMapName) $exprops[] = "\0$cn\0_parameterMapName";
-		if (!$this->_parameterMap) $exprops[] = "\0$cn\0_parameterMap";
-		if (!$this->_parameterClassName) $exprops[] = "\0$cn\0_parameterClassName";
-		if (!$this->_resultMapName) $exprops[] = "\0$cn\0_resultMapName";
-		if (!$this->_resultMap) $exprops[] = "\0$cn\0_resultMap";
-		if (!$this->_resultClassName) $exprops[] = "\0$cn\0_resultClassName";
-		if (!$this->_cacheModelName) $exprops[] = "\0$cn\0_cacheModelName";
-		if (!$this->_SQL) $exprops[] = "\0$cn\0_SQL";
-		if (!$this->_listClass) $exprops[] = "\0$cn\0_listClass";
-		if (!$this->_typeHandler) $exprops[] = "\0$cn\0_typeHandler";
-		if (!$this->_extendStatement) $exprops[] = "\0$cn\0_extendStatement";
-		if (!$this->_cache) $exprops[] = "\0$cn\0_cache";
+		$cn=__CLASS__;
+		$exprops=["\0$cn\0_resultMap"];
+		if(!$this->_parameterMapName) $exprops[]="\0$cn\0_parameterMapName";
+		if(!$this->_parameterMap) $exprops[]="\0$cn\0_parameterMap";
+		if(!$this->_parameterClassName) $exprops[]="\0$cn\0_parameterClassName";
+		if(!$this->_resultMapName) $exprops[]="\0$cn\0_resultMapName";
+		if(!$this->_resultMap) $exprops[]="\0$cn\0_resultMap";
+		if(!$this->_resultClassName) $exprops[]="\0$cn\0_resultClassName";
+		if(!$this->_cacheModelName) $exprops[]="\0$cn\0_cacheModelName";
+		if(!$this->_SQL) $exprops[]="\0$cn\0_SQL";
+		if(!$this->_listClass) $exprops[]="\0$cn\0_listClass";
+		if(!$this->_typeHandler) $exprops[]="\0$cn\0_typeHandler";
+		if(!$this->_extendStatement) $exprops[]="\0$cn\0_extendStatement";
+		if(!$this->_cache) $exprops[]="\0$cn\0_cache";
 
 		return array_diff(parent::__sleep(), $exprops);
 	}

framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php

Doc Comments +7 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 	 * Create an instance of an object give by the attribute named 'class' in the
 	 * node and set the properties on the object given by attribute names and values.
 	 * @param SimpleXmlNode property node
-	 * @return Object new instance of class with class name given by 'class' attribute value.
+	 * @return \Prado\TComponent new instance of class with class name given by 'class' attribute value.
 	 */
 	protected function createObjectFromNode($node)
 	{
@@ -47,6 +47,7 @@ 
 	 * @param Object object instance
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
+	 * @param \Prado\TComponent $obj
 	 */
 	protected function setObjectPropFromNode($obj, $node, $except = [])
 	{
@@ -67,6 +68,8 @@ 
 	 * Gets the filename relative to the basefile.
 	 * @param string base filename
 	 * @param string relative filename
+	 * @param string $basefile
+	 * @param string $resource
 	 * @return string absolute filename.
 	 */
 	protected function getAbsoluteFilePath($basefile, $resource)
@@ -84,7 +87,7 @@ 
 	/**
 	 * Load document using simple xml.
 	 * @param string filename.
-	 * @return SimpleXmlElement xml document.
+	 * @return \SimpleXMLElement xml document.
 	 */
 	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
@@ -97,9 +100,10 @@ 
 	}
 	/**
 	 * Get element node by ID value (try for attribute name ID as case insensitive).
-	 * @param SimpleXmlDocument $document
+	 * @param \SimpleXMLElement $document
 	 * @param string tag name.
 	 * @param string id value.
+	 * @param string $tag
 	 * @return SimpleXmlElement node if found, null otherwise.
 	 */
 	protected function getElementByIdValue($document, $tag, $value)

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
 	{
 		if(isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
+			$obj=Prado::createComponent((string) $node['class']);
 			$this->setObjectPropFromNode($obj, $node, ['class']);
 			return $obj;
 		}
@@ -48,14 +48,14 @@ 
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
 	 */
-	protected function setObjectPropFromNode($obj, $node, $except = [])
+	protected function setObjectPropFromNode($obj, $node, $except=[])
 	{
 		foreach($node->attributes() as $name => $value)
 		{
 			if(!in_array($name, $except))
 			{
 				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
+					$obj->{$name}=(string) $value;
 				else
 					throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
@@ -71,10 +71,10 @@ 
 	 */
 	protected function getAbsoluteFilePath($basefile, $resource)
 	{
-		$basedir = dirname($basefile);
-		$file = realpath($basedir . DIRECTORY_SEPARATOR . $resource);
+		$basedir=dirname($basefile);
+		$file=realpath($basedir.DIRECTORY_SEPARATOR.$resource);
 		if(!is_string($file) || !is_file($file))
-			$file = realpath($resource);
+			$file=realpath($resource);
 		if(is_string($file) && is_file($file))
 			return $file;
 		else
@@ -88,8 +88,8 @@ 
 	 */
 	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if(strpos($filename, '${') !== false)
-			$filename = $config->replaceProperties($filename);
+		if(strpos($filename, '${')!==false)
+			$filename=$config->replaceProperties($filename);
 		if(!is_file($filename))
 			throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_config', $filename);
@@ -105,9 +105,9 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(['id','ID','Id', 'iD'] as $id)
+		foreach(['id', 'ID', 'Id', 'iD'] as $id)
 		{
-			$xpath = "//{$tag}[@{$id}='{$value}']";
+			$xpath="//{$tag}[@{$id}='{$value}']";
 			foreach($document->xpath($xpath) as $node)
 				return $node;
 		}

framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php

Doc Comments +3 added lines

@@ -46,6 +46,7 @@ 
 	 * @param int page size
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
+	 * @param integer $pageSize
 	 */
 	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate = null, $page = 0)
 	{
@@ -61,6 +62,8 @@ 
 	 * @param mixed query parameters
 	 * @param int page size.
 	 * @param int number of page.
+	 * @param IMappedStatement $statement
+	 * @param integer $page
 	 */
 	protected function initialize($statement, $parameter, $pageSize, $page)
 	{

Spacing +25 added lines, -25 removed lines

@@ -47,12 +47,12 @@ 
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
 	 */
-	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate = null, $page = 0)
+	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate=null, $page=0)
 	{
 		parent::__construct();
 		parent::setCustomPaging(true);
 		$this->initialize($statement, $parameter, $pageSize, $page);
-		$this->_delegate = $delegate;
+		$this->_delegate=$delegate;
 	}
 
 	/**
@@ -64,8 +64,8 @@ 
 	 */
 	protected function initialize($statement, $parameter, $pageSize, $page)
 	{
-		$this->_statement = $statement;
-		$this->_parameter = $parameter;
+		$this->_statement=$statement;
+		$this->_parameter=$parameter;
 		$this->setPageSize($pageSize);
 		$this->attachEventHandler('OnFetchData', [$this, 'fetchDataFromStatement']);
 		$this->gotoPage($page);
@@ -86,9 +86,9 @@ 
 	 */
 	protected function fetchDataFromStatement($sender, $param)
 	{
-		$limit = $this->getOffsetAndLimit($param);
-		$connection = $this->_statement->getManager()->getDbConnection();
-		$data = $this->_statement->executeQueryForList($connection,
+		$limit=$this->getOffsetAndLimit($param);
+		$connection=$this->_statement->getManager()->getDbConnection();
+		$data=$this->_statement->executeQueryForList($connection,
 						$this->_parameter, null, $limit[0], $limit[1], $this->_delegate);
 		$this->populateData($param, $data);
 	}
@@ -118,49 +118,49 @@ 
 	 */
 	protected function populateData($param, $data)
 	{
-		$total = $data instanceof TList ? $data->getCount() : count($data);
-		$pageSize = $this->getPageSize();
+		$total=$data instanceof TList ? $data->getCount() : count($data);
+		$pageSize=$this->getPageSize();
 		if($total < 1)
 		{
 			$param->setData($data);
-			$this->_prevPageList = null;
-			$this->_nextPageList = null;
+			$this->_prevPageList=null;
+			$this->_nextPageList=null;
 			return;
 		}
 
 		if($param->getNewPageIndex() < 1)
 		{
-			$this->_prevPageList = null;
+			$this->_prevPageList=null;
 			if($total <= $pageSize)
 			{
 				$param->setData($data);
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize - 1, $total);
+				$this->_nextPageList=array_slice($data, $pageSize - 1, $total);
 			}
 		}
 		else
 		{
 			if($total <= $pageSize)
 			{
-				$this->_prevPageList = array_slice($data, 0, $total);
+				$this->_prevPageList=array_slice($data, 0, $total);
 				$param->setData([]);
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			elseif($total <= $pageSize * 2)
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize * 2, $total - $pageSize * 2);
+				$this->_nextPageList=array_slice($data, $pageSize * 2, $total - $pageSize * 2);
 			}
 		}
 	}
@@ -172,8 +172,8 @@ 
 	 */
 	protected function getOffsetAndLimit($param)
 	{
-		$index = $param->getNewPageIndex();
-		$pageSize = $this->getPageSize();
+		$index=$param->getNewPageIndex();
+		$pageSize=$this->getPageSize();
 		return $index < 1 ? [$index, $pageSize * 2] : [($index - 1) * $pageSize, $pageSize * 3];
 	}
 
@@ -182,7 +182,7 @@ 
 	 */
 	public function getIsNextPageAvailable()
 	{
-		return $this->_nextPageList !== null;
+		return $this->_nextPageList!==null;
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 */
 	public function getIsPreviousPageAvailable()
 	{
-		return $this->_prevPageList !== null;
+		return $this->_prevPageList!==null;
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return ($this->_nextPageList === null) || $this->_nextPageList->getCount() < 1;
+		return ($this->_nextPageList===null) || $this->_nextPageList->getCount() < 1;
 	}
 
 	/**

Braces +4 added lines, -8 removed lines

@@ -135,28 +135,24 @@
 			{
 				$param->setData($data);
 				$this->_nextPageList = null;
-			}
-			else
+			} else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
 				$this->_nextPageList = array_slice($data, $pageSize - 1, $total);
 			}
-		}
-		else
+		} else
 		{
 			if($total <= $pageSize)
 			{
 				$this->_prevPageList = array_slice($data, 0, $total);
 				$param->setData([]);
 				$this->_nextPageList = null;
-			}
-			elseif($total <= $pageSize * 2)
+			} elseif($total <= $pageSize * 2)
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
 				$this->_nextPageList = null;
-			}
-			else
+			} else
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));

framework/Data/SqlMap/Statements/TCachingStatement.php

Doc Comments +4 added lines

@@ -101,6 +101,10 @@
 		return $cacheKey->getHash();
 	}
 
+	/**
+	 * @param integer $skip
+	 * @param integer $max
+	 */
 	protected function createCommand($connection, $parameter, $skip = null, $max = null)
 	{
 		return $this->_mappedStatement->getCommand()->create($this->getManager(),

Spacing +21 added lines, -21 removed lines

@@ -26,7 +26,7 @@ 
 
 	public function __construct(TMappedStatement $statement)
 	{
-		$this->_mappedStatement = $statement;
+		$this->_mappedStatement=$statement;
 	}
 
 	public function getID()
@@ -44,14 +44,14 @@ 
 		return $this->_mappedStatement->getManager();
 	}
 
-	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null, $skip = -1, $max = -1, $delegate = null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->createCommand($connection, $parameter, $skip, $max);
-		$key = $this->getCacheKey([clone($sql), $keyProperty, $valueProperty,$skip, $max]);
-		$map = $this->getStatement()->getCache()->get($key);
-		if($map === null)
+		$sql=$this->createCommand($connection, $parameter, $skip, $max);
+		$key=$this->getCacheKey([clone($sql), $keyProperty, $valueProperty, $skip, $max]);
+		$map=$this->getStatement()->getCache()->get($key);
+		if($map===null)
 		{
-			$map = $this->_mappedStatement->runQueryForMap(
+			$map=$this->_mappedStatement->runQueryForMap(
 				$connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 			$this->getStatement()->getCache()->set($key, $map);
 		}
@@ -68,28 +68,28 @@ 
 		return $this->executeInsert($connection, $parameter);
 	}
 
-	public function executeQueryForList($connection, $parameter, $result = null, $skip = -1, $max = -1, $delegate = null)
+	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->createCommand($connection, $parameter, $skip, $max);
-		$key = $this->getCacheKey([clone($sql), $parameter, $skip, $max]);
-		$list = $this->getStatement()->getCache()->get($key);
-		if($list === null)
+		$sql=$this->createCommand($connection, $parameter, $skip, $max);
+		$key=$this->getCacheKey([clone($sql), $parameter, $skip, $max]);
+		$list=$this->getStatement()->getCache()->get($key);
+		if($list===null)
 		{
-			$list = $this->_mappedStatement->runQueryForList(
+			$list=$this->_mappedStatement->runQueryForList(
 				$connection, $parameter, $sql, $result, $delegate);
 			$this->getStatement()->getCache()->set($key, $list);
 		}
 		return $list;
 	}
 
-	public function executeQueryForObject($connection, $parameter, $result = null)
+	public function executeQueryForObject($connection, $parameter, $result=null)
 	{
-		$sql = $this->createCommand($connection, $parameter);
-		$key = $this->getCacheKey([clone($sql), $parameter]);
-		$object = $this->getStatement()->getCache()->get($key);
-		if($object === null)
+		$sql=$this->createCommand($connection, $parameter);
+		$key=$this->getCacheKey([clone($sql), $parameter]);
+		$object=$this->getStatement()->getCache()->get($key);
+		if($object===null)
 		{
-			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);
+			$object=$this->_mappedStatement->runQueryForObject($connection, $sql, $result);
 			$this->getStatement()->getCache()->set($key, $object);
 		}
 		return $object;
@@ -97,11 +97,11 @@ 
 
 	protected function getCacheKey($object)
 	{
-		$cacheKey = new TSqlMapCacheKey($object);
+		$cacheKey=new TSqlMapCacheKey($object);
 		return $cacheKey->getHash();
 	}
 
-	protected function createCommand($connection, $parameter, $skip = null, $max = null)
+	protected function createCommand($connection, $parameter, $skip=null, $max=null)
 	{
 		return $this->_mappedStatement->getCommand()->create($this->getManager(),
 					$connection, $this->getStatement(), $parameter, $skip, $max);

framework/Data/SqlMap/Statements/TMappedStatement.php

Doc Comments +6 added lines, -1 removed lines

@@ -97,7 +97,7 @@ 
 	}
 
 	/**
-	 * @return TSqlMapper The SqlMap used by this MappedStatement
+	 * @return TSqlMapManager The SqlMap used by this MappedStatement
 	 */
 	public function getManager()
 	{
@@ -482,6 +482,7 @@ 
 	 * @param IDbConnection database connection
 	 * @param mixed insert statement parameter
 	 * @param TSqlMapSelectKey select key statement
+	 * @param \Prado\Data\SqlMap\Configuration\TSqlMapSelectKey $selectKey
 	 * @return string last insert ID.
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
@@ -582,6 +583,7 @@ 
 	 * @param string result object class name
 	 * @param array a result set row retrieved from the database
 	 * @param object the result object, will create if necessary.
+	 * @param string $resultClass
 	 * @return object result object filled with data
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
@@ -604,6 +606,7 @@ 
 	 * Apply the result to a TList or an array.
 	 * @param array a result set row retrieved from the database
 	 * @param object result object, array or list
+	 * @param \ArrayAccess $resultObject
 	 * @return object result filled with data.
 	 */
 	protected function fillResultArrayList($row, $resultObject)
@@ -646,6 +649,7 @@ 
 	 * @param string result map name.
 	 * @param array a result set row retrieved from the database
 	 * @param object result object to fill, will create new instances if required.
+	 * @param string $parentGroup
 	 * @return object result object filled with data.
 	 */
 	protected function fillResultMap($resultMapName, $row, $parentGroup = null, &$resultObject = null)
@@ -785,6 +789,7 @@ 
 	 * Converts the first array value to scalar value of given type.
 	 * @param array list of results
 	 * @param string scalar type.
+	 * @param string $type
 	 * @return mixed scalar value.
 	 */
 	protected function getScalarResult($result, $type)

Spacing +156 added lines, -159 removed lines

@@ -52,12 +52,12 @@ 
 	/**
 	 * @var TPostSelectBinding[] post select statement queue.
 	 */
-	private $_selectQueue = [];
+	private $_selectQueue=[];
 
 	/**
 	 * @var boolean true when data is mapped to a particular row.
 	 */
-	private $_IsRowDataFound = false;
+	private $_IsRowDataFound=false;
 
 	/**
 	 * @var TSQLMapObjectCollectionTree group by object collection tree
@@ -67,17 +67,17 @@ 
 	/**
 	 * @var Post select is to query for list.
 	 */
-	const QUERY_FOR_LIST = 0;
+	const QUERY_FOR_LIST=0;
 
 	/**
 	 * @var Post select is to query for list.
 	 */
-	const QUERY_FOR_ARRAY = 1;
+	const QUERY_FOR_ARRAY=1;
 
 	/**
 	 * @var Post select is to query for object.
 	 */
-	const QUERY_FOR_OBJECT = 2;
+	const QUERY_FOR_OBJECT=2;
 
 	/**
 	 * @return string Name used to identify the TMappedStatement amongst the others.
@@ -117,7 +117,7 @@ 
 	 */
 	protected function initialGroupByResults()
 	{
-		$this->_groupBy = new TSqlMapObjectCollectionTree();
+		$this->_groupBy=new TSqlMapObjectCollectionTree();
 	}
 
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function __construct(TSqlMapManager $sqlMap, TSqlMapStatement $statement)
 	{
-		$this->_manager = $sqlMap;
-		$this->_statement = $statement;
-		$this->_command = new TPreparedCommand();
+		$this->_manager=$sqlMap;
+		$this->_statement=$statement;
+		$this->_command=new TPreparedCommand();
 		$this->initialGroupByResults();
 	}
 
@@ -176,9 +176,9 @@ 
 	{
 		if($max > -1 || $skip > -1)
 		{
-			$maxStr = $max > 0?' LIMIT ' . $max:'';
-			$skipStr = $skip > 0?' OFFSET ' . $skip:'';
-			$command->setText($command->getText() . $maxStr . $skipStr);
+			$maxStr=$max > 0 ? ' LIMIT '.$max : '';
+			$skipStr=$skip > 0 ? ' OFFSET '.$skip : '';
+			$command->setText($command->getText().$maxStr.$skipStr);
 		}
 		$connection->setActive(true);
 		return $command->query();
@@ -212,9 +212,9 @@ 
 	 * @param callback row delegate handler
 	 * @see executeQueryForList()
 	 */
-	public function executeQueryForList($connection, $parameter, $result = null, $skip = -1, $max = -1, $delegate = null)
+	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForList($connection, $parameter, $sql, $result, $delegate);
 	}
 
@@ -234,20 +234,19 @@ 
 	 * @return array a list of result objects
 	 * @see executeQueryForList()
 	 */
-	public function runQueryForList($connection, $parameter, $sql, $result, $delegate = null)
+	public function runQueryForList($connection, $parameter, $sql, $result, $delegate=null)
 	{
-		$registry = $this->getManager()->getTypeHandlers();
-		$list = $result instanceof \ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$registry=$this->getManager()->getTypeHandlers();
+		$list=$result instanceof \ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
-		$reader = $sql->query();
+		$reader=$sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
-		if($delegate !== null)
+		if($delegate!==null)
 		{
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$param = new TResultSetListItemParameter($obj, $parameter, $list);
+				$obj=$this->applyResultMap($row);
+				$param=new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
 		}
@@ -257,13 +256,13 @@ 
 			foreach($reader as $row)
 			{
 //				var_dump($row);
-				$list[] = $this->applyResultMap($row);
+				$list[]=$this->applyResultMap($row);
 			}
 		}
 
 		if(!$this->_groupBy->isEmpty())
 		{
-			$list = $this->_groupBy->collect();
+			$list=$this->_groupBy->collect();
 			$this->initialGroupByResults();
 		}
 
@@ -285,9 +284,9 @@ 
 	 * @param callback row delegate handler
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 */
-	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null, $skip = -1, $max = -1, $delegate = null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null, $skip=-1, $max=-1, $delegate=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForMap($connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 	}
 
@@ -309,22 +308,21 @@ 
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 * @see executeQueryForMap()
 	 */
-	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty = null, $delegate = null)
+	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty=null, $delegate=null)
 	{
-		$map = [];
+		$map=[];
 		//$recordSet = $this->executeSQLQuery($connection, $sql);
 		$connection->setActive(true);
-		$reader = $command->query();
-		if($delegate !== null)
+		$reader=$command->query();
+		if($delegate!==null)
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty === null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
-				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
+				$obj=$this->applyResultMap($row);
+				$key=TPropertyAccess::get($obj, $keyProperty);
+				$value=($valueProperty===null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
+				$param=new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
 		}
@@ -333,10 +331,9 @@ 
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty === null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$obj=$this->applyResultMap($row);
+				$key=TPropertyAccess::get($obj, $keyProperty);
+				$map[$key]=($valueProperty===null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -358,15 +355,15 @@ 
 		elseif(is_callable($handler, true))
 		{
 			// an array: 0 - object, 1 - method name/path
-			list($object, $method) = $handler;
+			list($object, $method)=$handler;
 			if(is_string($object))	// static method call
 				call_user_func($handler, $this, $param);
 			else
 			{
-				if(($pos = strrpos($method, '.')) !== false)
+				if(($pos=strrpos($method, '.'))!==false)
 				{
-					$object = $this->getSubProperty(substr($method, 0, $pos));
-					$method = substr($method, $pos + 1);
+					$object=$this->getSubProperty(substr($method, 0, $pos));
+					$method=substr($method, $pos + 1);
 				}
 				$object->$method($this, $param);
 			}
@@ -383,9 +380,9 @@ 
 	 * @param mixed The result object.
 	 * @return ${return}
 	 */
-	public function executeQueryForObject($connection, $parameter, $result = null)
+	public function executeQueryForObject($connection, $parameter, $result=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 		return $this->runQueryForObject($connection, $sql, $result);
 	}
 
@@ -404,16 +401,16 @@ 
 	 */
 	public function runQueryForObject($connection, $command, &$result)
 	{
-		$object = null;
+		$object=null;
 		$connection->setActive(true);
 		foreach($command->query() as $row)
-			$object = $this->applyResultMap($row, $result);
+			$object=$this->applyResultMap($row, $result);
 
 		if(!$this->_groupBy->isEmpty())
 		{
-			$list = $this->_groupBy->collect();
+			$list=$this->_groupBy->collect();
 			$this->initialGroupByResults();
-			$object = $list[0];
+			$object=$list[0];
 		}
 
 		$this->executePostSelect($connection);
@@ -431,14 +428,14 @@ 
 	 */
 	public function executeInsert($connection, $parameter)
 	{
-		$generatedKey = $this->getPreGeneratedSelectKey($connection, $parameter);
+		$generatedKey=$this->getPreGeneratedSelectKey($connection, $parameter);
 
-		$command = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
+		$command=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 //		var_dump($command,$parameter);
-		$result = $command->execute();
+		$result=$command->execute();
 
-		if($generatedKey === null)
-			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
+		if($generatedKey===null)
+			$generatedKey=$this->getPostGeneratedSelectKey($connection, $parameter);
 
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($command);
@@ -455,8 +452,8 @@ 
 	{
 		if($this->_statement instanceof TSqlMapInsert)
 		{
-			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey !== null) && !$selectKey->getIsAfter())
+			$selectKey=$this->_statement->getSelectKey();
+			if(($selectKey!==null) && !$selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -471,8 +468,8 @@ 
 	{
 		if($this->_statement instanceof TSqlMapInsert)
 		{
-			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey !== null) && $selectKey->getIsAfter())
+			$selectKey=$this->_statement->getSelectKey();
+			if(($selectKey!==null) && $selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -486,10 +483,10 @@ 
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
 	{
-		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
-		$generatedKey = $mappedStatement->executeQueryForObject(
+		$mappedStatement=$this->getManager()->getMappedStatement($selectKey->getID());
+		$generatedKey=$mappedStatement->executeQueryForObject(
 									$connection, $parameter, null);
-		if(strlen($prop = $selectKey->getProperty()) > 0)
+		if(strlen($prop=$selectKey->getProperty()) > 0)
 				TPropertyAccess::set($parameter, $prop, $generatedKey);
 		return $generatedKey;
 	}
@@ -503,8 +500,8 @@ 
 	 */
 	public function executeUpdate($connection, $parameter)
 	{
-		$sql = $this->_command->create($this->getManager(), $connection, $this->_statement, $parameter);
-		$affectedRows = $sql->execute();
+		$sql=$this->_command->create($this->getManager(), $connection, $this->_statement, $parameter);
+		$affectedRows=$sql->execute();
 		//$this->executeSQLQuery($connection, $sql);
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($sql);
@@ -519,24 +516,24 @@ 
 	{
 		while(count($this->_selectQueue))
 		{
-			$postSelect = array_shift($this->_selectQueue);
-			$method = $postSelect->getMethod();
-			$statement = $postSelect->getStatement();
-			$property = $postSelect->getResultProperty()->getProperty();
-			$keys = $postSelect->getKeys();
-			$resultObject = $postSelect->getResultObject();
-
-			if($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
+			$postSelect=array_shift($this->_selectQueue);
+			$method=$postSelect->getMethod();
+			$statement=$postSelect->getStatement();
+			$property=$postSelect->getResultProperty()->getProperty();
+			$keys=$postSelect->getKeys();
+			$resultObject=$postSelect->getResultObject();
+
+			if($method==self::QUERY_FOR_LIST || $method==self::QUERY_FOR_ARRAY)
 			{
-				$values = $statement->executeQueryForList($connection, $keys, null);
+				$values=$statement->executeQueryForList($connection, $keys, null);
 
-				if($method == self::QUERY_FOR_ARRAY)
-					$values = $values->toArray();
+				if($method==self::QUERY_FOR_ARRAY)
+					$values=$values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
 			}
-			elseif($method == self::QUERY_FOR_OBJECT)
+			elseif($method==self::QUERY_FOR_OBJECT)
 			{
-				$value = $statement->executeQueryForObject($connection, $keys, null);
+				$value=$statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
 			}
 		}
@@ -557,23 +554,23 @@ 
 	 * @param object the result object, will create if necessary.
 	 * @return object the result filled with data, null if not filled.
 	 */
-	protected function applyResultMap($row, &$resultObject = null)
+	protected function applyResultMap($row, &$resultObject=null)
 	{
-		if($row === false) return null;
+		if($row===false) return null;
 
-		$resultMapName = $this->_statement->getResultMap();
-		$resultClass = $this->_statement->getResultClass();
+		$resultMapName=$this->_statement->getResultMap();
+		$resultClass=$this->_statement->getResultClass();
 
-		$obj = null;
+		$obj=null;
 		if($this->getManager()->getResultMaps()->contains($resultMapName))
-			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
+			$obj=$this->fillResultMap($resultMapName, $row, null, $resultObject);
 		elseif(strlen($resultClass) > 0)
-			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
+			$obj=$this->fillResultClass($resultClass, $row, $resultObject);
 		else
-			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
+			$obj=$this->fillDefaultResultMap(null, $row, $resultObject);
 		if(class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
 			//Create a new clean active record.
-			$obj = TActiveRecord::createRecord(get_class($obj), $obj);
+			$obj=TActiveRecord::createRecord(get_class($obj), $obj);
 		return $obj;
 	}
 
@@ -586,10 +583,10 @@ 
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
 	{
-		if($resultObject === null)
+		if($resultObject===null)
 		{
-			$registry = $this->getManager()->getTypeHandlers();
-			$resultObject = $this->_statement->createInstanceOfResultClass($registry, $row);
+			$registry=$this->getManager()->getTypeHandlers();
+			$resultObject=$this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
 		if($resultObject instanceof \ArrayAccess)
@@ -610,10 +607,10 @@ 
 	{
 		if($resultObject instanceof TList)
 			foreach($row as $v)
-				$resultObject[] = $v;
+				$resultObject[]=$v;
 		else
 			foreach($row as $k => $v)
-				$resultObject[$k] = $v;
+				$resultObject[$k]=$v;
 		return $resultObject;
 	}
 
@@ -625,17 +622,17 @@ 
 	 */
 	protected function fillResultObjectProperty($row, $resultObject)
 	{
-		$index = 0;
-		$registry = $this->getManager()->getTypeHandlers();
+		$index=0;
+		$registry=$this->getManager()->getTypeHandlers();
 		foreach($row as $k => $v)
 		{
-			$property = new TResultProperty;
+			$property=new TResultProperty;
 			if(is_string($k) && strlen($k) > 0)
 				$property->setColumn($k);
 			$property->setColumnIndex(++$index);
-			$type = gettype(TPropertyAccess::get($resultObject, $k));
+			$type=gettype(TPropertyAccess::get($resultObject, $k));
 			$property->setType($type);
-			$value = $property->getPropertyValue($registry, $row);
+			$value=$property->getPropertyValue($registry, $row);
 			TPropertyAccess::set($resultObject, $k, $value);
 		}
 		return $resultObject;
@@ -648,14 +645,14 @@ 
 	 * @param object result object to fill, will create new instances if required.
 	 * @return object result object filled with data.
 	 */
-	protected function fillResultMap($resultMapName, $row, $parentGroup = null, &$resultObject = null)
+	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
 	{
-		$resultMap = $this->getManager()->getResultMap($resultMapName);
-		$registry = $this->getManager()->getTypeHandlers();
-		$resultMap = $resultMap->resolveSubMap($registry, $row);
+		$resultMap=$this->getManager()->getResultMap($resultMapName);
+		$registry=$this->getManager()->getTypeHandlers();
+		$resultMap=$resultMap->resolveSubMap($registry, $row);
 
-		if($resultObject === null)
-			$resultObject = $resultMap->createInstanceOfResult($registry);
+		if($resultObject===null)
+			$resultObject=$resultMap->createInstanceOfResult($registry);
 
 		if(is_object($resultObject))
 		{
@@ -667,7 +664,7 @@ 
 		}
 		else
 		{
-			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
+			$resultObject=$this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
 		return $resultObject;
 	}
@@ -682,11 +679,11 @@ 
 	 */
 	protected function addResultMapGroupBy($resultMap, $row, $parent, &$resultObject)
 	{
-		$group = $this->getResultMapGroupKey($resultMap, $row);
+		$group=$this->getResultMapGroupKey($resultMap, $row);
 
 		if(empty($parent))
 		{
-			$rootObject = ['object' => $resultObject, 'property' => null];
+			$rootObject=['object' => $resultObject, 'property' => null];
 			$this->_groupBy->add(null, $group, $rootObject);
 		}
 
@@ -694,23 +691,23 @@ 
 		{
 			//set properties.
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-			$nested = $property->getResultMapping();
+			$nested=$property->getResultMapping();
 
 			//nested property
 			if($this->getManager()->getResultMaps()->contains($nested))
 			{
-				$nestedMap = $this->getManager()->getResultMap($nested);
-				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
+				$nestedMap=$this->getManager()->getResultMap($nested);
+				$groupKey=$this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
 				if(empty($parent))
 					$this->_groupBy->add($group, $groupKey, '');
 
 				//get the nested result mapping value
-				$value = $this->fillResultMap($nested, $row, $groupKey);
+				$value=$this->fillResultMap($nested, $row, $groupKey);
 
 				//add it to the object tree graph
-				$groupObject = ['object' => $value, 'property' => $property->getProperty()];
+				$groupObject=['object' => $value, 'property' => $property->getProperty()];
 				if(empty($parent))
 					$this->_groupBy->add($group, $groupKey, $groupObject);
 				else
@@ -728,11 +725,11 @@ 
 	 */
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
-		$groupBy = $resultMap->getGroupBy();
+		$groupBy=$resultMap->getGroupBy();
 		if(isset($row[$groupBy]))
-			return $resultMap->getID() . $row[$groupBy];
+			return $resultMap->getID().$row[$groupBy];
 		else
-			return $resultMap->getID() . crc32(serialize($row));
+			return $resultMap->getID().crc32(serialize($row));
 	}
 
 	/**
@@ -745,16 +742,16 @@ 
 	 */
 	protected function fillDefaultResultMap($resultMap, $row, $resultObject)
 	{
-		if($resultObject === null)
-			$resultObject = '';
+		if($resultObject===null)
+			$resultObject='';
 
-		if($resultMap !== null)
-			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
+		if($resultMap!==null)
+			$result=$this->fillArrayResultMap($resultMap, $row, $resultObject);
 		else
-			$result = $row;
+			$result=$row;
 
 		//if scalar result types
-		if(count($result) == 1 && ($type = gettype($resultObject)) != 'array')
+		if(count($result)==1 && ($type=gettype($resultObject))!='array')
 			return $this->getScalarResult($result, $type);
 		else
 			return $result;
@@ -769,14 +766,14 @@ 
 	 */
 	protected function fillArrayResultMap($resultMap, $row, $resultObject)
 	{
-		$result = [];
-		$registry = $this->getManager()->getTypeHandlers();
+		$result=[];
+		$registry=$this->getManager()->getTypeHandlers();
 		foreach($resultMap->getColumns() as $column)
 		{
-			if(($column->getType() === null)
-				&& ($resultObject !== null) && !is_object($resultObject))
+			if(($column->getType()===null)
+				&& ($resultObject!==null) && !is_object($resultObject))
 			$column->setType(gettype($resultObject));
-			$result[$column->getProperty()] = $column->getPropertyValue($registry, $row);
+			$result[$column->getProperty()]=$column->getPropertyValue($registry, $row);
 		}
 		return $result;
 	}
@@ -789,7 +786,7 @@ 
 	 */
 	protected function getScalarResult($result, $type)
 	{
-		$scalar = array_shift($result);
+		$scalar=array_shift($result);
 		settype($scalar, $type);
 		return $scalar;
 	}
@@ -803,25 +800,25 @@ 
 	 */
 	protected function setObjectProperty($resultMap, $property, $row, &$resultObject)
 	{
-		$select = $property->getSelect();
-		$key = $property->getProperty();
-		$nested = $property->getNestedResultMap();
-		$registry = $this->getManager()->getTypeHandlers();
-		if($key === '')
+		$select=$property->getSelect();
+		$key=$property->getProperty();
+		$nested=$property->getNestedResultMap();
+		$registry=$this->getManager()->getTypeHandlers();
+		if($key==='')
 		{
-			$resultObject = $property->getPropertyValue($registry, $row);
+			$resultObject=$property->getPropertyValue($registry, $row);
 		}
-		elseif(strlen($select) == 0 && ($nested === null))
+		elseif(strlen($select)==0 && ($nested===null))
 		{
-			$value = $property->getPropertyValue($registry, $row);
+			$value=$property->getPropertyValue($registry, $row);
 
-			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
+			$this->_IsRowDataFound=$this->_IsRowDataFound || ($value!=null);
 			if(is_array($resultObject) || is_object($resultObject))
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
-				$resultObject = $value;
+				$resultObject=$value;
 		}
-		elseif($nested !== null)
+		elseif($nested!==null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
@@ -832,9 +829,9 @@ 
 			}
 			else
 			{
-				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
-					$obj = null;
+				$obj=$nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
+				if($this->fillPropertyWithResultMap($nested, $row, $obj)==false)
+					$obj=null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
 		}
@@ -854,9 +851,9 @@ 
 	 */
 	protected function enquequePostSelect($select, $resultMap, $property, $row, $resultObject)
 	{
-		$statement = $this->getManager()->getMappedStatement($select);
-		$key = $this->getPostSelectKeys($resultMap, $property, $row);
-		$postSelect = new TPostSelectBinding;
+		$statement=$this->getManager()->getMappedStatement($select);
+		$key=$this->getPostSelectKeys($resultMap, $property, $row);
+		$postSelect=new TPostSelectBinding;
 		$postSelect->setStatement($statement);
 		$postSelect->setResultObject($resultObject);
 		$postSelect->setResultProperty($property);
@@ -864,10 +861,10 @@ 
 
 		if($property->instanceOfListType($resultObject))
 		{
-			$values = null;
+			$values=null;
 			if($property->getLazyLoad())
 			{
-				$values = TLazyLoadList::newInstance($statement, $key,
+				$values=TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
 			}
@@ -880,7 +877,7 @@ 
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
 		if(!$property->getLazyLoad())
-			$this->_selectQueue[] = $postSelect;
+			$this->_selectQueue[]=$postSelect;
 	}
 
 	/**
@@ -892,20 +889,20 @@ 
 	 */
 	protected function getPostSelectKeys($resultMap, $property, $row)
 	{
-		$value = $property->getColumn();
-		if(is_int(strpos($value . ',', 0)) || is_int(strpos($value, '=', 0)))
+		$value=$property->getColumn();
+		if(is_int(strpos($value.',', 0)) || is_int(strpos($value, '=', 0)))
 		{
-			$keys = [];
+			$keys=[];
 			foreach(explode(',', $value) as $entry)
 			{
-				$pair = explode('=', $entry);
-				$keys[trim($pair[0])] = $row[trim($pair[1])];
+				$pair=explode('=', $entry);
+				$keys[trim($pair[0])]=$row[trim($pair[1])];
 			}
 			return $keys;
 		}
 		else
 		{
-			$registry = $this->getManager()->getTypeHandlers();
+			$registry=$this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry, $row);
 		}
 	}
@@ -919,28 +916,28 @@ 
 	 */
 	protected function fillPropertyWithResultMap($resultMap, $row, &$resultObject)
 	{
-		$dataFound = false;
+		$dataFound=false;
 		foreach($resultMap->getColumns() as $property)
 		{
-			$this->_IsRowDataFound = false;
+			$this->_IsRowDataFound=false;
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-			$dataFound = $dataFound || $this->_IsRowDataFound;
+			$dataFound=$dataFound || $this->_IsRowDataFound;
 		}
-		$this->_IsRowDataFound = $dataFound;
+		$this->_IsRowDataFound=$dataFound;
 		return $dataFound;
 	}
 
 	public function __wakeup()
 	{
-		if (null === $this->_selectQueue) $this->_selectQueue = [];
+		if(null===$this->_selectQueue) $this->_selectQueue=[];
 	}
 
 	public function __sleep()
 	{
-		$exprops = []; $cn = __CLASS__;
-		if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
-		if (null === $this->_groupBy) $exprops[] = "\0$cn\0_groupBy";
-		if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
+		$exprops=[]; $cn=__CLASS__;
+		if(!count($this->_selectQueue)) $exprops[]="\0$cn\0_selectQueue";
+		if(null===$this->_groupBy) $exprops[]="\0$cn\0_groupBy";
+		if(!$this->_IsRowDataFound) $exprops[]="\0$cn\0_IsRowDataFound";
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

Braces +13 added lines, -26 removed lines

@@ -250,8 +250,7 @@ 
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//var_dump($sql,$parameter);
 			foreach($reader as $row)
@@ -327,8 +326,7 @@ 
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
@@ -354,8 +352,7 @@ 
 		if(is_string($handler))
 		{
 			call_user_func($handler, $this, $param);
-		}
-		elseif(is_callable($handler, true))
+		} elseif(is_callable($handler, true))
 		{
 			// an array: 0 - object, 1 - method name/path
 			list($object, $method) = $handler;
@@ -370,8 +367,7 @@ 
 				}
 				$object->$method($this, $param);
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
@@ -533,8 +529,7 @@ 
 				if($method == self::QUERY_FOR_ARRAY)
 					$values = $values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
-			}
-			elseif($method == self::QUERY_FOR_OBJECT)
+			} elseif($method == self::QUERY_FOR_OBJECT)
 			{
 				$value = $statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -664,8 +659,7 @@ 
 			else
 				foreach($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -810,8 +804,7 @@ 
 		if($key === '')
 		{
 			$resultObject = $property->getPropertyValue($registry, $row);
-		}
-		elseif(strlen($select) == 0 && ($nested === null))
+		} elseif(strlen($select) == 0 && ($nested === null))
 		{
 			$value = $property->getPropertyValue($registry, $row);
 
@@ -820,8 +813,7 @@ 
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
-		}
-		elseif($nested !== null)
+		} elseif($nested !== null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
@@ -829,16 +821,14 @@ 
 					throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
-			}
-			else
+			} else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
 				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
 					$obj = null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
-		}
-		else //'select' ResultProperty
+		} else //'select' ResultProperty
 		{
 			$this->enquequePostSelect($select, $resultMap, $property, $row, $resultObject);
 		}
@@ -870,11 +860,9 @@ 
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
-			}
-			else
+			} else
 				$postSelect->setMethod(self::QUERY_FOR_LIST);
-		}
-		elseif($property->instanceOfArrayType($resultObject))
+		} elseif($property->instanceOfArrayType($resultObject))
 			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
 		else
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
@@ -902,8 +890,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry = $this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry, $row);