pradosoft / prado

framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php

Spacing +19 added lines, -19 removed lines

@@ -57,24 +57,24 @@ 
 	 */
 	public function add($parent, $node, $object = '')
 	{
-		if(isset($this->_entries[$parent]) && ($this->_entries[$parent] !== null)
+		if (isset($this->_entries[$parent]) && ($this->_entries[$parent] !== null)
 			&& isset($this->_entries[$node]) && ($this->_entries[$node] !== null))
 		{
 			$this->_entries[$node] = $object;
 			return;
 		}
 		$this->_entries[$node] = $object;
-		if(empty($parent))
+		if (empty($parent))
 		{
-			if(isset($this->_entries[$node]))
+			if (isset($this->_entries[$node]))
 				return;
 			$this->_tree[$node] = [];
 		}
 		$found = $this->addNode($this->_tree, $parent, $node);
-		if(!$found && !empty($parent))
+		if (!$found && !empty($parent))
 		{
 			$this->_tree[$parent] = [];
-			if(!isset($this->_entries[$parent]) || $object !== '')
+			if (!isset($this->_entries[$parent]) || $object !== '')
 				$this->_entries[$parent] = $object;
 			$this->addNode($this->_tree, $parent, $node);
 		}
@@ -91,11 +91,11 @@ 
 	{
 		$found = false;
 		reset($childs);
-		for($i = 0, $k = count($childs); $i < $k; $i++)
+		for ($i = 0, $k = count($childs); $i < $k; $i++)
 		{
 			$key = key($childs);
 			next($childs);
-			if($key == $parent)
+			if ($key == $parent)
 			{
 				$found = true;
 				$childs[$key][$node] = [];
@@ -113,7 +113,7 @@ 
 	 */
 	public function collect()
 	{
-		while(count($this->_tree) > 0)
+		while (count($this->_tree) > 0)
 			$this->collectChildren(null, $this->_tree);
 		return $this->getCollection();
 	}
@@ -125,8 +125,8 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach($nodes as $node)
-			if(count($node) != 0)
+		foreach ($nodes as $node)
+			if (count($node) != 0)
 				return true;
 		return $hasChildren;
 	}
@@ -140,10 +140,10 @@ 
 	{
 		$noChildren = !$this->hasChildren($nodes);
 		$childs = [];
-		for(reset($nodes); $key = key($nodes);)
+		for (reset($nodes); $key = key($nodes);)
 		{
 			next($nodes);
-			if($noChildren)
+			if ($noChildren)
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
@@ -151,7 +151,7 @@ 
 			else
 				$this->collectChildren($key, $nodes[$key]);
 		}
-		if(count($childs) > 0)
+		if (count($childs) > 0)
 			$this->onChildNodesVisited($parent, $childs);
 	}
 
@@ -162,7 +162,7 @@ 
 	 */
 	protected function onChildNodesVisited($parent, $nodes)
 	{
-		if(empty($parent) || empty($this->_entries[$parent]))
+		if (empty($parent) || empty($this->_entries[$parent]))
 			return;
 
 		$parentObject = $this->_entries[$parent]['object'];
@@ -170,21 +170,21 @@ 
 
 		$list = TPropertyAccess::get($parentObject, $property);
 
-		foreach($nodes as $node)
+		foreach ($nodes as $node)
 		{
-			if($list instanceof TList)
+			if ($list instanceof TList)
 				$parentObject->{$property}[] = $this->_entries[$node]['object'];
-			elseif(is_array($list))
+			elseif (is_array($list))
 				$list[] = $this->_entries[$node]['object'];
 			else
 				throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
 		}
 
-		if(is_array($list))
+		if (is_array($list))
 			TPropertyAccess::set($parentObject, $property, $list);
 
-		if($this->_entries[$parent]['property'] === null)
+		if ($this->_entries[$parent]['property'] === null)
 			$this->_list[] = $parentObject;
 	}
 

Braces +43 added lines, -29 removed lines

@@ -66,16 +66,18 @@ 
 		$this->_entries[$node] = $object;
 		if(empty($parent))
 		{
-			if(isset($this->_entries[$node]))
-				return;
+			if(isset($this->_entries[$node])) {
+							return;
+			}
 			$this->_tree[$node] = [];
 		}
 		$found = $this->addNode($this->_tree, $parent, $node);
 		if(!$found && !empty($parent))
 		{
 			$this->_tree[$parent] = [];
-			if(!isset($this->_entries[$parent]) || $object !== '')
-				$this->_entries[$parent] = $object;
+			if(!isset($this->_entries[$parent]) || $object !== '') {
+							$this->_entries[$parent] = $object;
+			}
 			$this->addNode($this->_tree, $parent, $node);
 		}
 	}
@@ -99,8 +101,7 @@ 
 			{
 				$found = true;
 				$childs[$key][$node] = [];
-			}
-			else
+			} else
 			{
 				$found = $found || $this->addNode($childs[$key], $parent, $node);
 			}
@@ -113,8 +114,9 @@ 
 	 */
 	public function collect()
 	{
-		while(count($this->_tree) > 0)
-			$this->collectChildren(null, $this->_tree);
+		while(count($this->_tree) > 0) {
+					$this->collectChildren(null, $this->_tree);
+		}
 		return $this->getCollection();
 	}
 
@@ -125,9 +127,10 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach($nodes as $node)
-			if(count($node) != 0)
+		foreach($nodes as $node) {
+					if(count($node) != 0)
 				return true;
+		}
 		return $hasChildren;
 	}
 
@@ -147,12 +150,13 @@ 
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
+			} else {
+							$this->collectChildren($key, $nodes[$key]);
 			}
-			else
-				$this->collectChildren($key, $nodes[$key]);
 		}
-		if(count($childs) > 0)
-			$this->onChildNodesVisited($parent, $childs);
+		if(count($childs) > 0) {
+					$this->onChildNodesVisited($parent, $childs);
+		}
 	}
 
 	/**
@@ -162,8 +166,9 @@ 
 	 */
 	protected function onChildNodesVisited($parent, $nodes)
 	{
-		if(empty($parent) || empty($this->_entries[$parent]))
-			return;
+		if(empty($parent) || empty($this->_entries[$parent])) {
+					return;
+		}
 
 		$parentObject = $this->_entries[$parent]['object'];
 		$property = $this->_entries[$nodes[0]]['property'];
@@ -172,20 +177,23 @@ 
 
 		foreach($nodes as $node)
 		{
-			if($list instanceof TList)
-				$parentObject->{$property}[] = $this->_entries[$node]['object'];
-			elseif(is_array($list))
-				$list[] = $this->_entries[$node]['object'];
-			else
-				throw new TSqlMapExecutionException(
+			if($list instanceof TList) {
+							$parentObject->{$property}[] = $this->_entries[$node]['object'];
+			} elseif(is_array($list)) {
+							$list[] = $this->_entries[$node]['object'];
+			} else {
+							throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
+			}
 		}
 
-		if(is_array($list))
-			TPropertyAccess::set($parentObject, $property, $list);
+		if(is_array($list)) {
+					TPropertyAccess::set($parentObject, $property, $list);
+		}
 
-		if($this->_entries[$parent]['property'] === null)
-			$this->_list[] = $parentObject;
+		if($this->_entries[$parent]['property'] === null) {
+					$this->_list[] = $parentObject;
+		}
 	}
 
 	/**
@@ -199,9 +207,15 @@ 
 	public function __sleep()
 	{
 		$exprops = []; $cn = __CLASS__;
-		if (!count($this->_tree)) $exprops[] = "\0$cn\0_tree";
-		if (!count($this->_entries)) $exprops[] = "\0$cn\0_entries";
-		if (!count($this->_list)) $exprops[] = "\0$cn\0_list";
+		if (!count($this->_tree)) {
+			$exprops[] = "\0$cn\0_tree";
+		}
+		if (!count($this->_entries)) {
+			$exprops[] = "\0$cn\0_entries";
+		}
+		if (!count($this->_list)) {
+			$exprops[] = "\0$cn\0_list";
+		}
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Statements/TCachingStatement.php

Spacing +4 added lines, -4 removed lines

@@ -47,9 +47,9 @@ 
 	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]);
+		$key = $this->getCacheKey([clone($sql), $keyProperty, $valueProperty, $skip, $max]);
 		$map = $this->getStatement()->getCache()->get($key);
-		if($map === null)
+		if ($map === null)
 		{
 			$map = $this->_mappedStatement->runQueryForMap(
 				$connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
@@ -73,7 +73,7 @@ 
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);
 		$key = $this->getCacheKey([clone($sql), $parameter, $skip, $max]);
 		$list = $this->getStatement()->getCache()->get($key);
-		if($list === null)
+		if ($list === null)
 		{
 			$list = $this->_mappedStatement->runQueryForList(
 				$connection, $parameter, $sql, $result, $delegate);
@@ -87,7 +87,7 @@ 
 		$sql = $this->createCommand($connection, $parameter);
 		$key = $this->getCacheKey([clone($sql), $parameter]);
 		$object = $this->getStatement()->getCache()->get($key);
-		if($object === null)
+		if ($object === null)
 		{
 			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);
 			$this->getStatement()->getCache()->set($key, $object);

framework/Data/SqlMap/Statements/TPreparedStatement.php

Spacing +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@ 
 	private $_parameterNames;
 	private $_parameterValues;
 
-	public function getPreparedSql(){ return $this->_sqlString; }
-	public function setPreparedSql($value){ $this->_sqlString = $value; }
+	public function getPreparedSql() { return $this->_sqlString; }
+	public function setPreparedSql($value) { $this->_sqlString = $value; }
 
 	public function getParameterNames($needed = true)
 	{
@@ -37,7 +37,7 @@ 
 		return $this->_parameterNames;
 	}
 
-	public function setParameterNames($value){ $this->_parameterNames = $value; }
+	public function setParameterNames($value) { $this->_parameterNames = $value; }
 
 	public function getParameterValues($needed = true)
 	{
@@ -46,7 +46,7 @@ 
 		return $this->_parameterValues;
 	}
 
-	public function setParameterValues($value){ $this->_parameterValues = $value; }
+	public function setParameterValues($value) { $this->_parameterValues = $value; }
 
 	public function __sleep()
 	{

Braces +12 added lines, -6 removed lines

@@ -32,8 +32,9 @@ 
 
 	public function getParameterNames($needed = true)
 	{
-		if (!$this->_parameterNames and $needed)
-			$this->_parameterNames = new TList;
+		if (!$this->_parameterNames and $needed) {
+					$this->_parameterNames = new TList;
+		}
 		return $this->_parameterNames;
 	}
 
@@ -41,8 +42,9 @@ 
 
 	public function getParameterValues($needed = true)
 	{
-		if (!$this->_parameterValues and $needed)
-			$this->_parameterValues = new TMap;
+		if (!$this->_parameterValues and $needed) {
+					$this->_parameterValues = new TMap;
+		}
 		return $this->_parameterValues;
 	}
 
@@ -51,8 +53,12 @@ 
 	public function __sleep()
 	{
 		$exprops = []; $cn = __CLASS__;
-		if (!$this->_parameterNames or !$this->_parameterNames->getCount()) $exprops[] = "\0$cn\0_parameterNames";
-		if (!$this->_parameterValues or !$this->_parameterValues->getCount()) $exprops[] = "\0$cn\0_parameterValues";
+		if (!$this->_parameterNames or !$this->_parameterNames->getCount()) {
+			$exprops[] = "\0$cn\0_parameterNames";
+		}
+		if (!$this->_parameterValues or !$this->_parameterValues->getCount()) {
+			$exprops[] = "\0$cn\0_parameterValues";
+		}
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }

framework/Data/SqlMap/Statements/TPreparedCommand.php

Spacing +5 added lines, -5 removed lines

@@ -34,10 +34,10 @@ 
 		$connection->setActive(true);
 		$sql = $prepared->getPreparedSql();
 
-		if($sqlText instanceof TSimpleDynamicSql)
+		if ($sqlText instanceof TSimpleDynamicSql)
 			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
 
-		if($max !== null || $skip !== null)
+		if ($max !== null || $skip !== null)
 		{
 			$builder = TDbMetaData::getInstance($connection)->createCommandBuilder();
 			$sql = $builder->applyLimitOffset($sql, $max, $skip);
@@ -54,14 +54,14 @@ 
 		//$parameters = $prepared->getParameterValues();
 		$registry = $manager->getTypeHandlers();
 		if ($properties)
-		for($i = 0, $k = $properties->getCount(); $i < $k; $i++)
+		for ($i = 0, $k = $properties->getCount(); $i < $k; $i++)
 		{
 			$property = $statement->parameterMap()->getProperty($i);
 			$value = $statement->parameterMap()->getPropertyValue($registry, $property, $parameterObject);
 			$dbType = $property->getDbType();
-			if($dbType == '') //relies on PHP lax comparison
+			if ($dbType == '') //relies on PHP lax comparison
 				$command->bindValue($i + 1, $value, TDbCommandBuilder::getPdoType($value));
-			elseif(strpos($dbType, 'PDO::') === 0)
+			elseif (strpos($dbType, 'PDO::') === 0)
 				$command->bindValue($i + 1, $value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
 			else
 				$command->bindValue($i + 1, $value);

Braces +16 added lines, -9 removed lines

@@ -34,8 +34,9 @@ 
 		$connection->setActive(true);
 		$sql = $prepared->getPreparedSql();
 
-		if($sqlText instanceof TSimpleDynamicSql)
-			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
+		if($sqlText instanceof TSimpleDynamicSql) {
+					$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
+		}
 
 		if($max !== null || $skip !== null)
 		{
@@ -53,18 +54,24 @@ 
 		$properties = $prepared->getParameterNames(false);
 		//$parameters = $prepared->getParameterValues();
 		$registry = $manager->getTypeHandlers();
-		if ($properties)
-		for($i = 0, $k = $properties->getCount(); $i < $k; $i++)
+		if ($properties) {
+				for($i = 0, $k = $properties->getCount();
+		}
+		$i < $k; $i++)
 		{
 			$property = $statement->parameterMap()->getProperty($i);
 			$value = $statement->parameterMap()->getPropertyValue($registry, $property, $parameterObject);
 			$dbType = $property->getDbType();
-			if($dbType == '') //relies on PHP lax comparison
+			if($dbType == '') {
+				//relies on PHP lax comparison
 				$command->bindValue($i + 1, $value, TDbCommandBuilder::getPdoType($value));
-			elseif(strpos($dbType, 'PDO::') === 0)
-				$command->bindValue($i + 1, $value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
-			else
-				$command->bindValue($i + 1, $value);
+			} elseif(strpos($dbType, 'PDO::') === 0) {
+							$command->bindValue($i + 1, $value, constant($property->getDbType()));
+			}
+			//assumes PDO types, e.g. PDO::PARAM_INT
+			else {
+							$command->bindValue($i + 1, $value);
+			}
 		}
 	}
 }

framework/Data/SqlMap/Statements/TMappedStatement.php

Spacing +73 added lines, -76 removed lines

@@ -174,11 +174,11 @@ 
 	 */
 	protected function executeSQLQueryLimit($connection, $command, $max, $skip)
 	{
-		if($max > -1 || $skip > -1)
+		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();
@@ -237,14 +237,13 @@ 
 	public function runQueryForList($connection, $parameter, $sql, $result, $delegate = null)
 	{
 		$registry = $this->getManager()->getTypeHandlers();
-		$list = $result instanceof \ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$list = $result instanceof \ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
 		$reader = $sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
-		if($delegate !== null)
+		if ($delegate !== null)
 		{
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
@@ -254,14 +253,14 @@ 
 		else
 		{
 			//var_dump($sql,$parameter);
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 //				var_dump($row);
 				$list[] = $this->applyResultMap($row);
 			}
 		}
 
-		if(!$this->_groupBy->isEmpty())
+		if (!$this->_groupBy->isEmpty())
 		{
 			$list = $this->_groupBy->collect();
 			$this->initialGroupByResults();
@@ -315,15 +314,14 @@ 
 		//$recordSet = $this->executeSQLQuery($connection, $sql);
 		$connection->setActive(true);
 		$reader = $command->query();
-		if($delegate !== null)
+		if ($delegate !== null)
 		{
 			//while($row = $recordSet->fetchRow())
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty === null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
+				$value = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
@@ -331,12 +329,11 @@ 
 		else
 		{
 			//while($row = $recordSet->fetchRow())
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty === null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$map[$key] = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -351,19 +348,19 @@ 
 	 */
 	protected function raiseRowDelegate($handler, $param)
 	{
-		if(is_string($handler))
+		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;
-			if(is_string($object))	// static method call
+			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);
@@ -406,10 +403,10 @@ 
 	{
 		$object = null;
 		$connection->setActive(true);
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 			$object = $this->applyResultMap($row, $result);
 
-		if(!$this->_groupBy->isEmpty())
+		if (!$this->_groupBy->isEmpty())
 		{
 			$list = $this->_groupBy->collect();
 			$this->initialGroupByResults();
@@ -437,7 +434,7 @@ 
 //		var_dump($command,$parameter);
 		$result = $command->execute();
 
-		if($generatedKey === null)
+		if ($generatedKey === null)
 			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
 
 		$this->executePostSelect($connection);
@@ -453,10 +450,10 @@ 
 	 */
 	protected function getPreGeneratedSelectKey($connection, $parameter)
 	{
-		if($this->_statement instanceof TSqlMapInsert)
+		if ($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey !== null) && !$selectKey->getIsAfter())
+			if (($selectKey !== null) && !$selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -469,10 +466,10 @@ 
 	 */
 	protected function getPostGeneratedSelectKey($connection, $parameter)
 	{
-		if($this->_statement instanceof TSqlMapInsert)
+		if ($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey !== null) && $selectKey->getIsAfter())
+			if (($selectKey !== null) && $selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -489,7 +486,7 @@ 
 		$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;
 	}
@@ -517,7 +514,7 @@ 
 	 */
 	protected function executePostSelect($connection)
 	{
-		while(count($this->_selectQueue))
+		while (count($this->_selectQueue))
 		{
 			$postSelect = array_shift($this->_selectQueue);
 			$method = $postSelect->getMethod();
@@ -526,15 +523,15 @@ 
 			$keys = $postSelect->getKeys();
 			$resultObject = $postSelect->getResultObject();
 
-			if($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
+			if ($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
 			{
 				$values = $statement->executeQueryForList($connection, $keys, null);
 
-				if($method == self::QUERY_FOR_ARRAY)
+				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);
@@ -559,19 +556,19 @@ 
 	 */
 	protected function applyResultMap($row, &$resultObject = null)
 	{
-		if($row === false) return null;
+		if ($row === false) return null;
 
 		$resultMapName = $this->_statement->getResultMap();
 		$resultClass = $this->_statement->getResultClass();
 
 		$obj = null;
-		if($this->getManager()->getResultMaps()->contains($resultMapName))
+		if ($this->getManager()->getResultMaps()->contains($resultMapName))
 			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
-		elseif(strlen($resultClass) > 0)
+		elseif (strlen($resultClass) > 0)
 			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
 		else
 			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
+		if (class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
 			//Create a new clean active record.
 			$obj = TActiveRecord::createRecord(get_class($obj), $obj);
 		return $obj;
@@ -586,15 +583,15 @@ 
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
 	{
-		if($resultObject === null)
+		if ($resultObject === null)
 		{
 			$registry = $this->getManager()->getTypeHandlers();
 			$resultObject = $this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
-		if($resultObject instanceof \ArrayAccess)
+		if ($resultObject instanceof \ArrayAccess)
 			return $this->fillResultArrayList($row, $resultObject);
-		elseif(is_object($resultObject))
+		elseif (is_object($resultObject))
 			return $this->fillResultObjectProperty($row, $resultObject);
 		else
 			return $this->fillDefaultResultMap(null, $row, $resultObject);
@@ -608,11 +605,11 @@ 
 	 */
 	protected function fillResultArrayList($row, $resultObject)
 	{
-		if($resultObject instanceof TList)
-			foreach($row as $v)
+		if ($resultObject instanceof TList)
+			foreach ($row as $v)
 				$resultObject[] = $v;
 		else
-			foreach($row as $k => $v)
+			foreach ($row as $k => $v)
 				$resultObject[$k] = $v;
 		return $resultObject;
 	}
@@ -627,10 +624,10 @@ 
 	{
 		$index = 0;
 		$registry = $this->getManager()->getTypeHandlers();
-		foreach($row as $k => $v)
+		foreach ($row as $k => $v)
 		{
 			$property = new TResultProperty;
-			if(is_string($k) && strlen($k) > 0)
+			if (is_string($k) && strlen($k) > 0)
 				$property->setColumn($k);
 			$property->setColumnIndex(++$index);
 			$type = gettype(TPropertyAccess::get($resultObject, $k));
@@ -654,15 +651,15 @@ 
 		$registry = $this->getManager()->getTypeHandlers();
 		$resultMap = $resultMap->resolveSubMap($registry, $row);
 
-		if($resultObject === null)
+		if ($resultObject === null)
 			$resultObject = $resultMap->createInstanceOfResult($registry);
 
-		if(is_object($resultObject))
+		if (is_object($resultObject))
 		{
-			if(strlen($resultMap->getGroupBy()) > 0)
+			if (strlen($resultMap->getGroupBy()) > 0)
 				return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
 			else
-				foreach($resultMap->getColumns() as $property)
+				foreach ($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
 		}
 		else
@@ -684,26 +681,26 @@ 
 	{
 		$group = $this->getResultMapGroupKey($resultMap, $row);
 
-		if(empty($parent))
+		if (empty($parent))
 		{
 			$rootObject = ['object' => $resultObject, 'property' => null];
 			$this->_groupBy->add(null, $group, $rootObject);
 		}
 
-		foreach($resultMap->getColumns() as $property)
+		foreach ($resultMap->getColumns() as $property)
 		{
 			//set properties.
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
 			$nested = $property->getResultMapping();
 
 			//nested property
-			if($this->getManager()->getResultMaps()->contains($nested))
+			if ($this->getManager()->getResultMaps()->contains($nested))
 			{
 				$nestedMap = $this->getManager()->getResultMap($nested);
 				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
-				if(empty($parent))
+				if (empty($parent))
 					$this->_groupBy->add($group, $groupKey, '');
 
 				//get the nested result mapping value
@@ -711,7 +708,7 @@ 
 
 				//add it to the object tree graph
 				$groupObject = ['object' => $value, 'property' => $property->getProperty()];
-				if(empty($parent))
+				if (empty($parent))
 					$this->_groupBy->add($group, $groupKey, $groupObject);
 				else
 					$this->_groupBy->add($parent, $groupKey, $groupObject);
@@ -729,10 +726,10 @@ 
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
 		$groupBy = $resultMap->getGroupBy();
-		if(isset($row[$groupBy]))
-			return $resultMap->getID() . $row[$groupBy];
+		if (isset($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)
+		if ($resultObject === null)
 			$resultObject = '';
 
-		if($resultMap !== null)
+		if ($resultMap !== null)
 			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
 		else
 			$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;
@@ -771,9 +768,9 @@ 
 	{
 		$result = [];
 		$registry = $this->getManager()->getTypeHandlers();
-		foreach($resultMap->getColumns() as $column)
+		foreach ($resultMap->getColumns() as $column)
 		{
-			if(($column->getType() === null)
+			if (($column->getType() === null)
 				&& ($resultObject !== null) && !is_object($resultObject))
 			$column->setType(gettype($resultObject));
 			$result[$column->getProperty()] = $column->getPropertyValue($registry, $row);
@@ -807,25 +804,25 @@ 
 		$key = $property->getProperty();
 		$nested = $property->getNestedResultMap();
 		$registry = $this->getManager()->getTypeHandlers();
-		if($key === '')
+		if ($key === '')
 		{
 			$resultObject = $property->getPropertyValue($registry, $row);
 		}
-		elseif(strlen($select) == 0 && ($nested === null))
+		elseif (strlen($select) == 0 && ($nested === null))
 		{
 			$value = $property->getPropertyValue($registry, $row);
 
 			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
-			if(is_array($resultObject) || is_object($resultObject))
+			if (is_array($resultObject) || is_object($resultObject))
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
 		}
-		elseif($nested !== null)
+		elseif ($nested !== null)
 		{
-			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
+			if ($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
-				if(strlen($resultMap->getGroupBy()) <= 0)
+				if (strlen($resultMap->getGroupBy()) <= 0)
 					throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
@@ -833,7 +830,7 @@ 
 			else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
+				if ($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
 					$obj = null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
@@ -862,10 +859,10 @@ 
 		$postSelect->setResultProperty($property);
 		$postSelect->setKeys($key);
 
-		if($property->instanceOfListType($resultObject))
+		if ($property->instanceOfListType($resultObject))
 		{
 			$values = null;
-			if($property->getLazyLoad())
+			if ($property->getLazyLoad())
 			{
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
@@ -874,12 +871,12 @@ 
 			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);
 
-		if(!$property->getLazyLoad())
+		if (!$property->getLazyLoad())
 			$this->_selectQueue[] = $postSelect;
 	}
 
@@ -893,10 +890,10 @@ 
 	protected function getPostSelectKeys($resultMap, $property, $row)
 	{
 		$value = $property->getColumn();
-		if(is_int(strpos($value . ',', 0)) || is_int(strpos($value, '=', 0)))
+		if (is_int(strpos($value.',', 0)) || is_int(strpos($value, '=', 0)))
 		{
 			$keys = [];
-			foreach(explode(',', $value) as $entry)
+			foreach (explode(',', $value) as $entry)
 			{
 				$pair = explode('=', $entry);
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
@@ -920,7 +917,7 @@ 
 	protected function fillPropertyWithResultMap($resultMap, $row, &$resultObject)
 	{
 		$dataFound = false;
-		foreach($resultMap->getColumns() as $property)
+		foreach ($resultMap->getColumns() as $property)
 		{
 			$this->_IsRowDataFound = false;
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);

Braces +130 added lines, -105 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,14 +352,14 @@ 
 		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;
-			if(is_string($object))	// static method call
+			if(is_string($object)) {
+				// static method call
 				call_user_func($handler, $this, $param);
-			else
+			} else
 			{
 				if(($pos = strrpos($method, '.')) !== false)
 				{
@@ -370,9 +368,9 @@ 
 				}
 				$object->$method($this, $param);
 			}
+		} else {
+					throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 		}
-		else
-			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
 	/**
@@ -406,8 +404,9 @@ 
 	{
 		$object = null;
 		$connection->setActive(true);
-		foreach($command->query() as $row)
-			$object = $this->applyResultMap($row, $result);
+		foreach($command->query() as $row) {
+					$object = $this->applyResultMap($row, $result);
+		}
 
 		if(!$this->_groupBy->isEmpty())
 		{
@@ -437,8 +436,9 @@ 
 //		var_dump($command,$parameter);
 		$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);
@@ -456,8 +456,9 @@ 
 		if($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey !== null) && !$selectKey->getIsAfter())
-				return $this->executeSelectKey($connection, $parameter, $selectKey);
+			if(($selectKey !== null) && !$selectKey->getIsAfter()) {
+							return $this->executeSelectKey($connection, $parameter, $selectKey);
+			}
 		}
 	}
 
@@ -472,8 +473,9 @@ 
 		if($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey !== null) && $selectKey->getIsAfter())
-				return $this->executeSelectKey($connection, $parameter, $selectKey);
+			if(($selectKey !== null) && $selectKey->getIsAfter()) {
+							return $this->executeSelectKey($connection, $parameter, $selectKey);
+			}
 		}
 	}
 
@@ -489,8 +491,9 @@ 
 		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
 		$generatedKey = $mappedStatement->executeQueryForObject(
 									$connection, $parameter, null);
-		if(strlen($prop = $selectKey->getProperty()) > 0)
-				TPropertyAccess::set($parameter, $prop, $generatedKey);
+		if(strlen($prop = $selectKey->getProperty()) > 0) {
+						TPropertyAccess::set($parameter, $prop, $generatedKey);
+		}
 		return $generatedKey;
 	}
 
@@ -530,11 +533,11 @@ 
 			{
 				$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);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -559,21 +562,25 @@ 
 	 */
 	protected function applyResultMap($row, &$resultObject = null)
 	{
-		if($row === false) return null;
+		if($row === false) {
+			return null;
+		}
 
 		$resultMapName = $this->_statement->getResultMap();
 		$resultClass = $this->_statement->getResultClass();
 
 		$obj = null;
-		if($this->getManager()->getResultMaps()->contains($resultMapName))
-			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
-		elseif(strlen($resultClass) > 0)
-			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
-		else
-			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
-			//Create a new clean active record.
+		if($this->getManager()->getResultMaps()->contains($resultMapName)) {
+					$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
+		} elseif(strlen($resultClass) > 0) {
+					$obj = $this->fillResultClass($resultClass, $row, $resultObject);
+		} else {
+					$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);
+		}
 		return $obj;
 	}
 
@@ -592,12 +599,13 @@ 
 			$resultObject = $this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
-		if($resultObject instanceof \ArrayAccess)
-			return $this->fillResultArrayList($row, $resultObject);
-		elseif(is_object($resultObject))
-			return $this->fillResultObjectProperty($row, $resultObject);
-		else
-			return $this->fillDefaultResultMap(null, $row, $resultObject);
+		if($resultObject instanceof \ArrayAccess) {
+					return $this->fillResultArrayList($row, $resultObject);
+		} elseif(is_object($resultObject)) {
+					return $this->fillResultObjectProperty($row, $resultObject);
+		} else {
+					return $this->fillDefaultResultMap(null, $row, $resultObject);
+		}
 	}
 
 	/**
@@ -608,12 +616,13 @@ 
 	 */
 	protected function fillResultArrayList($row, $resultObject)
 	{
-		if($resultObject instanceof TList)
-			foreach($row as $v)
+		if($resultObject instanceof TList) {
+					foreach($row as $v)
 				$resultObject[] = $v;
-		else
-			foreach($row as $k => $v)
+		} else {
+					foreach($row as $k => $v)
 				$resultObject[$k] = $v;
+		}
 		return $resultObject;
 	}
 
@@ -630,8 +639,9 @@ 
 		foreach($row as $k => $v)
 		{
 			$property = new TResultProperty;
-			if(is_string($k) && strlen($k) > 0)
-				$property->setColumn($k);
+			if(is_string($k) && strlen($k) > 0) {
+							$property->setColumn($k);
+			}
 			$property->setColumnIndex(++$index);
 			$type = gettype(TPropertyAccess::get($resultObject, $k));
 			$property->setType($type);
@@ -654,18 +664,19 @@ 
 		$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))
 		{
-			if(strlen($resultMap->getGroupBy()) > 0)
-				return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
-			else
-				foreach($resultMap->getColumns() as $property)
+			if(strlen($resultMap->getGroupBy()) > 0) {
+							return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
+			} else {
+							foreach($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+			}
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -703,18 +714,20 @@ 
 				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
-				if(empty($parent))
-					$this->_groupBy->add($group, $groupKey, '');
+				if(empty($parent)) {
+									$this->_groupBy->add($group, $groupKey, '');
+				}
 
 				//get the nested result mapping value
 				$value = $this->fillResultMap($nested, $row, $groupKey);
 
 				//add it to the object tree graph
 				$groupObject = ['object' => $value, 'property' => $property->getProperty()];
-				if(empty($parent))
-					$this->_groupBy->add($group, $groupKey, $groupObject);
-				else
-					$this->_groupBy->add($parent, $groupKey, $groupObject);
+				if(empty($parent)) {
+									$this->_groupBy->add($group, $groupKey, $groupObject);
+				} else {
+									$this->_groupBy->add($parent, $groupKey, $groupObject);
+				}
 			}
 		}
 		return $resultObject;
@@ -729,10 +742,11 @@ 
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
 		$groupBy = $resultMap->getGroupBy();
-		if(isset($row[$groupBy]))
-			return $resultMap->getID() . $row[$groupBy];
-		else
-			return $resultMap->getID() . crc32(serialize($row));
+		if(isset($row[$groupBy])) {
+					return $resultMap->getID() . $row[$groupBy];
+		} else {
+					return $resultMap->getID() . crc32(serialize($row));
+		}
 	}
 
 	/**
@@ -745,19 +759,22 @@ 
 	 */
 	protected function fillDefaultResultMap($resultMap, $row, $resultObject)
 	{
-		if($resultObject === null)
-			$resultObject = '';
+		if($resultObject === null) {
+					$resultObject = '';
+		}
 
-		if($resultMap !== null)
-			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
-		else
-			$result = $row;
+		if($resultMap !== null) {
+					$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
+		} else {
+					$result = $row;
+		}
 
 		//if scalar result types
-		if(count($result) == 1 && ($type = gettype($resultObject)) != 'array')
-			return $this->getScalarResult($result, $type);
-		else
-			return $result;
+		if(count($result) == 1 && ($type = gettype($resultObject)) != 'array') {
+					return $this->getScalarResult($result, $type);
+		} else {
+					return $result;
+		}
 	}
 
 	/**
@@ -774,8 +791,9 @@ 
 		foreach($resultMap->getColumns() as $column)
 		{
 			if(($column->getType() === null)
-				&& ($resultObject !== null) && !is_object($resultObject))
-			$column->setType(gettype($resultObject));
+				&& ($resultObject !== null) && !is_object($resultObject)) {
+						$column->setType(gettype($resultObject));
+			}
 			$result[$column->getProperty()] = $column->getPropertyValue($registry, $row);
 		}
 		return $result;
@@ -810,35 +828,34 @@ 
 		if($key === '')
 		{
 			$resultObject = $property->getPropertyValue($registry, $row);
-		}
-		elseif(strlen($select) == 0 && ($nested === null))
+		} elseif(strlen($select) == 0 && ($nested === null))
 		{
 			$value = $property->getPropertyValue($registry, $row);
 
 			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
-			if(is_array($resultObject) || is_object($resultObject))
-				TPropertyAccess::set($resultObject, $key, $value);
-			else
-				$resultObject = $value;
-		}
-		elseif($nested !== null)
+			if(is_array($resultObject) || is_object($resultObject)) {
+							TPropertyAccess::set($resultObject, $key, $value);
+			} else {
+							$resultObject = $value;
+			}
+		} elseif($nested !== null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
-				if(strlen($resultMap->getGroupBy()) <= 0)
-					throw new TSqlMapExecutionException(
+				if(strlen($resultMap->getGroupBy()) <= 0) {
+									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;
+				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,17 +887,18 @@ 
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
+			} else {
+							$postSelect->setMethod(self::QUERY_FOR_LIST);
 			}
-			else
-				$postSelect->setMethod(self::QUERY_FOR_LIST);
+		} elseif($property->instanceOfArrayType($resultObject)) {
+					$postSelect->setMethod(self::QUERY_FOR_ARRAY);
+		} else {
+					$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 		}
-		elseif($property->instanceOfArrayType($resultObject))
-			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
-		else
-			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
-		if(!$property->getLazyLoad())
-			$this->_selectQueue[] = $postSelect;
+		if(!$property->getLazyLoad()) {
+					$this->_selectQueue[] = $postSelect;
+		}
 	}
 
 	/**
@@ -902,8 +920,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry = $this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry, $row);
@@ -932,15 +949,23 @@ 
 
 	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";
+		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

framework/Data/SqlMap/TSqlMapManager.php

Spacing +12 added lines, -12 removed lines

@@ -93,7 +93,7 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers === null)
+		if ($this->_typeHandlers === null)
 			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway === null)
+		if ($this->_gateway === null)
 			$this->_gateway = $this->createSqlMapGateway();
 		return $this->_gateway;
 	}
@@ -124,7 +124,7 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
+		if ($this->_cacheDependencies === null)
 			$this->_cacheDependencies = new TChainedCacheDependency();
 
 		return $this->_cacheDependencies;
@@ -156,7 +156,7 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
+		if ($this->_mappedStatements->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
 		return $this->_mappedStatements[$name];
 	}
@@ -170,7 +170,7 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		if ($this->_mappedStatements->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
 		$this->_mappedStatements->add($key, $statement);
 	}
@@ -191,7 +191,7 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
+		if ($this->_resultMaps->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
 		return $this->_resultMaps[$name];
 	}
@@ -203,7 +203,7 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		if ($this->_resultMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
 		$this->_resultMaps->add($key, $result);
 	}
@@ -223,7 +223,7 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
+		if ($this->_parameterMaps->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
 		return $this->_parameterMaps[$name];
 	}
@@ -235,7 +235,7 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		if ($this->_parameterMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}
@@ -247,7 +247,7 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
+		if ($this->_cacheModels->contains($cacheModel->getID()))
 			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
 		else
 			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
@@ -261,7 +261,7 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
+		if (!$this->_cacheModels->contains($name))
 			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
 		return $this->_cacheModels[$name];
 	}
@@ -271,7 +271,7 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
+		foreach ($this->_cacheModels as $cache)
 			$cache->flush();
 	}
 }

Braces +38 added lines, -26 removed lines

@@ -93,8 +93,9 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers === null)
-			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
+		if($this->_typeHandlers === null) {
+					$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
+		}
 		return $this->_typeHandlers;
 	}
 
@@ -103,8 +104,9 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway === null)
-			$this->_gateway = $this->createSqlMapGateway();
+		if($this->_gateway === null) {
+					$this->_gateway = $this->createSqlMapGateway();
+		}
 		return $this->_gateway;
 	}
 
@@ -124,8 +126,9 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies = new TChainedCacheDependency();
+		if($this->_cacheDependencies === null) {
+					$this->_cacheDependencies = new TChainedCacheDependency();
+		}
 
 		return $this->_cacheDependencies;
 	}
@@ -156,8 +159,9 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		if($this->_mappedStatements->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		}
 		return $this->_mappedStatements[$name];
 	}
 
@@ -170,8 +174,9 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		if($this->_mappedStatements->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		}
 		$this->_mappedStatements->add($key, $statement);
 	}
 
@@ -191,8 +196,9 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		if($this->_resultMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		}
 		return $this->_resultMaps[$name];
 	}
 
@@ -203,8 +209,9 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		if($this->_resultMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		}
 		$this->_resultMaps->add($key, $result);
 	}
 
@@ -223,8 +230,9 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		if($this->_parameterMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		}
 		return $this->_parameterMaps[$name];
 	}
 
@@ -235,8 +243,9 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		if($this->_parameterMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		}
 		$this->_parameterMaps->add($key, $parameter);
 	}
 
@@ -247,10 +256,11 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
-			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
-		else
-			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		if($this->_cacheModels->contains($cacheModel->getID())) {
+					throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
+		} else {
+					$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		}
 	}
 
 	/**
@@ -261,8 +271,9 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
-			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		if(!$this->_cacheModels->contains($name)) {
+					throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		}
 		return $this->_cacheModels[$name];
 	}
 
@@ -271,8 +282,9 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
-			$cache->flush();
+		foreach($this->_cacheModels as $cache) {
+					$cache->flush();
+		}
 	}
 }
 

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Spacing +19 added lines, -19 removed lines

@@ -78,17 +78,17 @@ 
 	{
 		static $stack = [];
 
-		$results = call_user_func_array([$this->getSourceRecord(),$method], $args);
+		$results = call_user_func_array([$this->getSourceRecord(), $method], $args);
 		$validArray = is_array($results) && count($results) > 0;
-		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
+		if ($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
+			while ($obj = array_pop($stack))
 				$obj->collectForeignObjects($results);
 		}
-		elseif($results instanceof TActiveRecordRelation)
+		elseif ($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
-		elseif($results === null || !$validArray)
+		elseif ($results === null || !$validArray)
 			$stack = [];
 		return $results;
 	}
@@ -118,17 +118,17 @@ 
 		$matchingTableName = strtolower($recordTableInfo->getTableName());
 		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
 		$tableInfo = $from;
-		if($from instanceof TActiveRecord)
+		if ($from instanceof TActiveRecord)
 			$tableInfo = $gateway->getRecordTableInfo($from);
 		//find first non-empty FK
-		foreach($tableInfo->getForeignKeys() as $fkeys)
+		foreach ($tableInfo->getForeignKeys() as $fkeys)
 		{
 			$fkTable = strtolower($fkeys['table']);
-			if($fkTable === $matchingTableName || $fkTable === $matchingFullTableName)
+			if ($fkTable === $matchingTableName || $fkTable === $matchingFullTableName)
 			{
 				$hasFkField = !$loose && $this->getContext()->hasFkField();
 				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
-				if(!empty($key))
+				if (!empty($key))
 					return $key;
 			}
 		}
@@ -155,9 +155,9 @@ 
 		$matching = [];
 		preg_match_all('/\s*(\S+\.)?([\w-]+)\s*/', $this->getContext()->getFkField(), $matching);
 		$fields = [];
-		foreach($fkeys as $fkName => $field)
+		foreach ($fkeys as $fkName => $field)
 		{
-			if(in_array($fkName, $matching[2]))
+			if (in_array($fkName, $matching[2]))
 				$fields[$fkName] = $field;
 		}
 		return $fields;
@@ -171,8 +171,8 @@ 
 	protected function getObjectHash($obj, $properties)
 	{
 		$ids = [];
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		foreach ($properties as $property)
+			$ids[] = is_object($obj) ? (string) $obj->getColumnValue($property) : (string) $obj[$property];
 		return serialize($ids);
 	}
 
@@ -196,13 +196,13 @@ 
 	 */
 	protected function getIndexValues($keys, $results)
 	{
-		if(!is_array($results) && !$results instanceof \ArrayAccess)
+		if (!is_array($results) && !$results instanceof \ArrayAccess)
 			$results = [$results];
 		$values = [];
-		foreach($results as $result)
+		foreach ($results as $result)
 		{
 			$value = [];
-			foreach($keys as $name)
+			foreach ($keys as $name)
 				$value[] = $result->getColumnValue($name);
 			$values[] = $value;
 		}
@@ -219,7 +219,7 @@ 
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections = [];
-		foreach($fkObjects as $fkObject)
+		foreach ($fkObjects as $fkObject)
 			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
 		$this->setResultCollection($results, $collections, $properties);
 	}
@@ -232,9 +232,9 @@ 
 	 */
 	protected function setResultCollection(&$results, &$collections, $properties)
 	{
-		if(is_array($results) || $results instanceof \ArrayAccess)
+		if (is_array($results) || $results instanceof \ArrayAccess)
 		{
-			for($i = 0,$k = count($results);$i < $k;$i++)
+			for ($i = 0, $k = count($results); $i < $k; $i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
 		}
 		else

Braces +35 added lines, -24 removed lines

@@ -83,13 +83,16 @@ 
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} elseif($results instanceof TActiveRecordRelation) {
+					$stack[] = $this;
+		}
+		//call it later
+		elseif($results === null || !$validArray) {
+					$stack = [];
 		}
-		elseif($results instanceof TActiveRecordRelation)
-			$stack[] = $this; //call it later
-		elseif($results === null || !$validArray)
-			$stack = [];
 		return $results;
 	}
 
@@ -118,8 +121,9 @@ 
 		$matchingTableName = strtolower($recordTableInfo->getTableName());
 		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
 		$tableInfo = $from;
-		if($from instanceof TActiveRecord)
-			$tableInfo = $gateway->getRecordTableInfo($from);
+		if($from instanceof TActiveRecord) {
+					$tableInfo = $gateway->getRecordTableInfo($from);
+		}
 		//find first non-empty FK
 		foreach($tableInfo->getForeignKeys() as $fkeys)
 		{
@@ -128,8 +132,9 @@ 
 			{
 				$hasFkField = !$loose && $this->getContext()->hasFkField();
 				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
-				if(!empty($key))
-					return $key;
+				if(!empty($key)) {
+									return $key;
+				}
 			}
 		}
 
@@ -157,8 +162,9 @@ 
 		$fields = [];
 		foreach($fkeys as $fkName => $field)
 		{
-			if(in_array($fkName, $matching[2]))
-				$fields[$fkName] = $field;
+			if(in_array($fkName, $matching[2])) {
+							$fields[$fkName] = $field;
+			}
 		}
 		return $fields;
 	}
@@ -171,8 +177,9 @@ 
 	protected function getObjectHash($obj, $properties)
 	{
 		$ids = [];
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		foreach($properties as $property) {
+					$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		}
 		return serialize($ids);
 	}
 
@@ -196,14 +203,16 @@ 
 	 */
 	protected function getIndexValues($keys, $results)
 	{
-		if(!is_array($results) && !$results instanceof \ArrayAccess)
-			$results = [$results];
+		if(!is_array($results) && !$results instanceof \ArrayAccess) {
+					$results = [$results];
+		}
 		$values = [];
 		foreach($results as $result)
 		{
 			$value = [];
-			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
+			foreach($keys as $name) {
+							$value[] = $result->getColumnValue($name);
+			}
 			$values[] = $value;
 		}
 		return $values;
@@ -219,8 +228,9 @@ 
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections = [];
-		foreach($fkObjects as $fkObject)
-			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+		foreach($fkObjects as $fkObject) {
+					$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+		}
 		$this->setResultCollection($results, $collections, $properties);
 	}
 
@@ -234,11 +244,12 @@ 
 	{
 		if(is_array($results) || $results instanceof \ArrayAccess)
 		{
-			for($i = 0,$k = count($results);$i < $k;$i++)
-				$this->setObjectProperty($results[$i], $properties, $collections);
+			for($i = 0,$k = count($results);$i < $k;$i++) {
+							$this->setObjectProperty($results[$i], $properties, $collections);
+			}
+		} else {
+					$this->setObjectProperty($results, $properties, $collections);
 		}
-		else
-			$this->setObjectProperty($results, $properties, $collections);
 	}
 
 	/**

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Spacing +11 added lines, -11 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys === null)
+		if ($this->_fkeys === null)
 			$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
 		return $this->_fkeys;
 	}
@@ -117,7 +117,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:[];
+		return isset($this->_relation[4]) ? $this->_relation[4] : [];
 	}
 
 	/**
@@ -174,14 +174,14 @@ 
 	 */
 	public function getRelationHandler($criteria = null)
 	{
-		if(!$this->hasRecordRelation())
+		if (!$this->hasRecordRelation())
 		{
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria === null)
+		if ($criteria === null)
 			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
-		switch($this->getRelationType())
+		switch ($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
 				return new TActiveRecordHasMany($this, $criteria);
@@ -202,14 +202,14 @@ 
 	public function updateAssociatedRecords($updateBelongsTo = false)
 	{
 		$success = true;
-		foreach($this->_record->getRecordRelations() as $data)
+		foreach ($this->_record->getRecordRelations() as $data)
 		{
 			list($property, $relation) = $data;
 			$belongsTo = $relation[0] == TActiveRecord::BELONGS_TO;
-			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
+			if (($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
 				$obj = $this->getSourceRecord();
-				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
+				if (!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
 					$context = new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
 					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
@@ -221,9 +221,9 @@ 
 
 	protected function isEmptyFkObject($obj)
 	{
-		if(is_object($obj))
+		if (is_object($obj))
 			return $obj instanceof TList ? $obj->count() === 0 : false;
-		elseif(is_array($obj))
+		elseif (is_array($obj))
 			return count($obj) === 0;
 		else
 			return empty($obj);

Braces +13 added lines, -10 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys === null)
-			$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
+		if($this->_fkeys === null) {
+					$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
+		}
 		return $this->_fkeys;
 	}
 
@@ -179,8 +180,9 @@ 
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria === null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		if($criteria === null) {
+					$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		}
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -221,12 +223,13 @@ 
 
 	protected function isEmptyFkObject($obj)
 	{
-		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
-		elseif(is_array($obj))
-			return count($obj) === 0;
-		else
-			return empty($obj);
+		if(is_object($obj)) {
+					return $obj instanceof TList ? $obj->count() === 0 : false;
+		} elseif(is_array($obj)) {
+					return count($obj) === 0;
+		} else {
+					return empty($obj);
+		}
 	}
 }
 

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Spacing +21 added lines, -21 removed lines

@@ -121,13 +121,13 @@ 
 	 */
 	protected function getAssociationTable()
 	{
-		if($this->_association === null)
+		if ($this->_association === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$conn = $this->getSourceRecord()->getDbConnection();
 			//table name may include the fk column name separated with a dot.
 			$table = explode('.', $this->getContext()->getAssociationTable());
-			if(count($table) > 1)
+			if (count($table) > 1)
 			{
 				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
 				$this->_association_columns = preg_split('/\s*[, ]\*/', $columns);
@@ -142,7 +142,7 @@ 
 	 */
 	protected function getSourceTable()
 	{
-		if($this->_sourceTable === null)
+		if ($this->_sourceTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
@@ -155,7 +155,7 @@ 
 	 */
 	protected function getForeignTable()
 	{
-		if($this->_foreignTable === null)
+		if ($this->_foreignTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$fkObject = $this->getContext()->getForeignRecordFinder();
@@ -195,10 +195,10 @@ 
 		$command = $this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
 		$srcProps = array_keys($sourceKeys);
 		$collections = [];
-		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
+		foreach ($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
+			foreach ($srcProps as $column)
 				unset($row[$column]);
 			$obj = $this->createFkObject($type, $row, $foreignKeys);
 			$collections[$hash][] = $obj;
@@ -215,10 +215,10 @@ 
 	protected function createFkObject($type, $row, $foreignKeys)
 	{
 		$obj = TActiveRecord::createRecord($type, $row);
-		if(count($this->_association_columns) > 0)
+		if (count($this->_association_columns) > 0)
 		{
 			$i = 0;
-			foreach($foreignKeys as $ref => $fk)
+			foreach ($foreignKeys as $ref => $fk)
 				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
 		}
 		return $obj;
@@ -235,7 +235,7 @@ 
 		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where = $criteria->getCondition()) === null)
+		if (($where = $criteria->getCondition()) === null)
 			$where = '1=1';
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
@@ -260,8 +260,8 @@ 
 		$table = $this->getAssociationTable();
 		$tableName = $table->getTableFullName();
 		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
-		foreach($columnNames as $name)
-			$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
+		foreach ($columnNames as $name)
+			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -283,9 +283,9 @@ 
 		$joins = [];
 		$hasAssociationColumns = count($this->_association_columns) > 0;
 		$i = 0;
-		foreach($foreignKeys as $ref => $fk)
+		foreach ($foreignKeys as $ref => $fk)
 		{
-			if($hasAssociationColumns)
+			if ($hasAssociationColumns)
 				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
 				$refField = $refInfo->getColumn($ref)->getColumnName();
@@ -306,11 +306,11 @@ 
 		$obj = $this->getContext()->getSourceRecord();
 		$fkObjects = &$obj->{$this->getContext()->getProperty()};
 		$success = true;
-		if(($total = count($fkObjects)) > 0)
+		if (($total = count($fkObjects)) > 0)
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i = 0;$i < $total;$i++)
+			for ($i = 0; $i < $total; $i++)
 				$success = $fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
@@ -330,8 +330,8 @@ 
 	{
 		$condition = [];
 		$table = $this->getAssociationTable();
-		foreach($data as $name => $value)
-			$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		foreach ($data as $name => $value)
+			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
 		$command = $builder->createCountCommand(implode(' AND ', $condition), array_values($data));
 		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
@@ -348,10 +348,10 @@ 
 		$source = $this->getSourceRecordValues($obj);
 		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
 		$success = true;
-		foreach($fkObjects as $fkObject)
+		foreach ($fkObjects as $fkObject)
 		{
 			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
-			if(!$this->hasAssociationData($builder, $data))
+			if (!$this->hasAssociationData($builder, $data))
 				$success = $this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
@@ -363,7 +363,7 @@ 
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = [];
 		$i = 0;
-		foreach($sourceKeys as $name => $srcKey)
+		foreach ($sourceKeys as $name => $srcKey)
 			$data[$name] = $indexValues[0][$i++];
 		return $data;
 	}
@@ -371,7 +371,7 @@ 
 	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data = [];
-		foreach($foreignKeys as $name => $fKey)
+		foreach ($foreignKeys as $name => $fKey)
 			$data[$name] = $fkObject->getColumnValue($fKey);
 		return $data;
 	}

Braces +32 added lines, -22 removed lines

@@ -198,8 +198,9 @@ 
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
-				unset($row[$column]);
+			foreach($srcProps as $column) {
+							unset($row[$column]);
+			}
 			$obj = $this->createFkObject($type, $row, $foreignKeys);
 			$collections[$hash][] = $obj;
 		}
@@ -218,8 +219,9 @@ 
 		if(count($this->_association_columns) > 0)
 		{
 			$i = 0;
-			foreach($foreignKeys as $ref => $fk)
-				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			foreach($foreignKeys as $ref => $fk) {
+							$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			}
 		}
 		return $obj;
 	}
@@ -235,8 +237,9 @@ 
 		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where = $criteria->getCondition()) === null)
-			$where = '1=1';
+		if(($where = $criteria->getCondition()) === null) {
+					$where = '1=1';
+		}
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
 		$parameters = $criteria->getParameters()->toArray();
@@ -260,8 +263,9 @@ 
 		$table = $this->getAssociationTable();
 		$tableName = $table->getTableFullName();
 		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
-		foreach($columnNames as $name)
-			$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
+		foreach($columnNames as $name) {
+					$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
+		}
 		return implode(', ', $columns);
 	}
 
@@ -285,10 +289,11 @@ 
 		$i = 0;
 		foreach($foreignKeys as $ref => $fk)
 		{
-			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
-			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
+			if($hasAssociationColumns) {
+							$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+			} else {
+							$refField = $refInfo->getColumn($ref)->getColumnName();
+			}
 			$fkField = $fkInfo->getColumn($fk)->getColumnName();
 			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
@@ -310,8 +315,9 @@ 
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i = 0;$i < $total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			for($i = 0;$i < $total;$i++) {
+							$success = $fkObjects[$i]->save() && $success;
+			}
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -330,8 +336,9 @@ 
 	{
 		$condition = [];
 		$table = $this->getAssociationTable();
-		foreach($data as $name => $value)
-			$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		foreach($data as $name => $value) {
+					$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		}
 		$command = $builder->createCountCommand(implode(' AND ', $condition), array_values($data));
 		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
@@ -351,8 +358,9 @@ 
 		foreach($fkObjects as $fkObject)
 		{
 			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
-			if(!$this->hasAssociationData($builder, $data))
-				$success = $this->addAssociationData($builder, $data) && $success;
+			if(!$this->hasAssociationData($builder, $data)) {
+							$success = $this->addAssociationData($builder, $data) && $success;
+			}
 		}
 		return $success;
 	}
@@ -363,16 +371,18 @@ 
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = [];
 		$i = 0;
-		foreach($sourceKeys as $name => $srcKey)
-			$data[$name] = $indexValues[0][$i++];
+		foreach($sourceKeys as $name => $srcKey) {
+					$data[$name] = $indexValues[0][$i++];
+		}
 		return $data;
 	}
 
 	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data = [];
-		foreach($foreignKeys as $name => $fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+		foreach($foreignKeys as $name => $fKey) {
+					$data[$name] = $fkObject->getColumnValue($fKey);
+		}
 		return $data;
 	}
 }