pradosoft / prado

framework/Data/SqlMap/Configuration/TResultProperty.php

Spacing +14 added lines, -14 removed lines

@@ -63,7 +63,7 @@ 
 	 */
 	public function __construct($resultMap = null)
 	{
-		if($resultMap instanceof TResultMap)
+		if ($resultMap instanceof TResultMap)
 			$this->_hostResultMapID = $resultMap->getID();
 	}
 
@@ -244,11 +244,11 @@ 
 		$value = null;
 		$index = $this->getColumnIndex();
 		$name = $this->getColumn();
-		if($index > 0 && isset($row[$index]))
+		if ($index > 0 && isset($row[$index]))
 			$value = $this->getTypedValue($registry, $row[$index]);
-		elseif(isset($row[$name]))
+		elseif (isset($row[$name]))
 			$value = $this->getTypedValue($registry, $row[$name]);
-		if(($value === null) && ($this->getNullValue() !== null))
+		if (($value === null) && ($this->getNullValue() !== null))
 			$value = $this->getTypedValue($registry, $this->getNullValue());
 		return $value;
 	}
@@ -260,7 +260,7 @@ 
 	 */
 	protected function getTypedValue($registry, $value)
 	{
-		if(($handler = $this->createTypeHandler($registry)) !== null)
+		if (($handler = $this->createTypeHandler($registry)) !== null)
 			return $handler->getResult($value);
 		else
 			return $registry->convertToType($this->getType(), $value);
@@ -275,7 +275,7 @@ 
 	{
 		$type = $this->getTypeHandler() ? $this->getTypeHandler() : $this->getType();
 		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $this->getTypeHandler())
+		if ($handler === null && $this->getTypeHandler())
 			$handler = Prado::createComponent($type);
 		return $handler;
 	}
@@ -286,17 +286,17 @@ 
 	 */
 	protected function getPropertyValueType()
 	{
-		if(class_exists($type = $this->getType(), false)) //NO force autoloading
+		if (class_exists($type = $this->getType(), false)) //NO force autoloading
 		{
-			if($type === 'TList')
+			if ($type === 'TList')
 				return self::LIST_TYPE;
 			$class = new ReflectionClass($type);
-			if($class->isSubclassOf('TList'))
+			if ($class->isSubclassOf('TList'))
 				return self::LIST_TYPE;
-			if($class->implementsInterface('ArrayAccess'))
+			if ($class->implementsInterface('ArrayAccess'))
 				return self::ARRAY_TYPE;
 		}
-		if(strtolower($type) == 'array')
+		if (strtolower($type) == 'array')
 			return self::ARRAY_TYPE;
 	}
 
@@ -308,7 +308,7 @@ 
 	 */
 	public function instanceOfListType($target)
 	{
-		if($this->getType() === null)
+		if ($this->getType() === null)
 			return  TPropertyAccess::get($target, $this->getProperty()) instanceof TList;
 		return $this->getPropertyValueType() == self::LIST_TYPE;
 	}
@@ -321,10 +321,10 @@ 
 	 */
 	public function instanceOfArrayType($target)
 	{
-		if($this->getType() === null)
+		if ($this->getType() === null)
 		{
 			$prop = TPropertyAccess::get($target, $this->getProperty());
-			if(is_object($prop))
+			if (is_object($prop))
 				return $prop instanceof \ArrayAccess;
 			return is_array($prop);
 		}

Braces +67 added lines, -35 removed lines

@@ -63,8 +63,9 @@ 
 	 */
 	public function __construct($resultMap = null)
 	{
-		if($resultMap instanceof TResultMap)
-			$this->_hostResultMapID = $resultMap->getID();
+		if($resultMap instanceof TResultMap) {
+					$this->_hostResultMapID = $resultMap->getID();
+		}
 	}
 
 	/**
@@ -244,12 +245,14 @@ 
 		$value = null;
 		$index = $this->getColumnIndex();
 		$name = $this->getColumn();
-		if($index > 0 && isset($row[$index]))
-			$value = $this->getTypedValue($registry, $row[$index]);
-		elseif(isset($row[$name]))
-			$value = $this->getTypedValue($registry, $row[$name]);
-		if(($value === null) && ($this->getNullValue() !== null))
-			$value = $this->getTypedValue($registry, $this->getNullValue());
+		if($index > 0 && isset($row[$index])) {
+					$value = $this->getTypedValue($registry, $row[$index]);
+		} elseif(isset($row[$name])) {
+					$value = $this->getTypedValue($registry, $row[$name]);
+		}
+		if(($value === null) && ($this->getNullValue() !== null)) {
+					$value = $this->getTypedValue($registry, $this->getNullValue());
+		}
 		return $value;
 	}
 
@@ -260,10 +263,11 @@ 
 	 */
 	protected function getTypedValue($registry, $value)
 	{
-		if(($handler = $this->createTypeHandler($registry)) !== null)
-			return $handler->getResult($value);
-		else
-			return $registry->convertToType($this->getType(), $value);
+		if(($handler = $this->createTypeHandler($registry)) !== null) {
+					return $handler->getResult($value);
+		} else {
+					return $registry->convertToType($this->getType(), $value);
+		}
 	}
 
 	/**
@@ -275,8 +279,9 @@ 
 	{
 		$type = $this->getTypeHandler() ? $this->getTypeHandler() : $this->getType();
 		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $this->getTypeHandler())
-			$handler = Prado::createComponent($type);
+		if($handler === null && $this->getTypeHandler()) {
+					$handler = Prado::createComponent($type);
+		}
 		return $handler;
 	}
 
@@ -286,18 +291,23 @@ 
 	 */
 	protected function getPropertyValueType()
 	{
-		if(class_exists($type = $this->getType(), false)) //NO force autoloading
+		if(class_exists($type = $this->getType(), false)) {
+			//NO force autoloading
 		{
 			if($type === 'TList')
 				return self::LIST_TYPE;
+		}
 			$class = new ReflectionClass($type);
-			if($class->isSubclassOf('TList'))
-				return self::LIST_TYPE;
-			if($class->implementsInterface('ArrayAccess'))
-				return self::ARRAY_TYPE;
+			if($class->isSubclassOf('TList')) {
+							return self::LIST_TYPE;
+			}
+			if($class->implementsInterface('ArrayAccess')) {
+							return self::ARRAY_TYPE;
+			}
+		}
+		if(strtolower($type) == 'array') {
+					return self::ARRAY_TYPE;
 		}
-		if(strtolower($type) == 'array')
-			return self::ARRAY_TYPE;
 	}
 
 	/**
@@ -308,8 +318,9 @@ 
 	 */
 	public function instanceOfListType($target)
 	{
-		if($this->getType() === null)
-			return  TPropertyAccess::get($target, $this->getProperty()) instanceof TList;
+		if($this->getType() === null) {
+					return  TPropertyAccess::get($target, $this->getProperty()) instanceof TList;
+		}
 		return $this->getPropertyValueType() == self::LIST_TYPE;
 	}
 
@@ -324,8 +335,9 @@ 
 		if($this->getType() === null)
 		{
 			$prop = TPropertyAccess::get($target, $this->getProperty());
-			if(is_object($prop))
-				return $prop instanceof \ArrayAccess;
+			if(is_object($prop)) {
+							return $prop instanceof \ArrayAccess;
+			}
 			return is_array($prop);
 		}
 		return $this->getPropertyValueType() == self::ARRAY_TYPE;
@@ -334,16 +346,36 @@ 
 	public function __sleep()
 	{
 		$exprops = []; $cn = 'TResultProperty';
-		if ($this->_nullValue === null) $exprops[] = "\0$cn\0_nullValue";
-		if ($this->_propertyName === null) $exprops[] = "\0$cn\0_propertyNama";
-		if ($this->_columnName === null) $exprops[] = "\0$cn\0_columnName";
-		if ($this->_columnIndex == -1) $exprops[] = "\0$cn\0_columnIndex";
-		if ($this->_nestedResultMapName === null) $exprops[] = "\0$cn\0_nestedResultMapName";
-		if ($this->_nestedResultMap === null) $exprops[] = "\0$cn\0_nestedResultMap";
-		if ($this->_valueType === null) $exprops[] = "\0$cn\0_valueType";
-		if ($this->_typeHandler === null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_isLazyLoad === false) $exprops[] = "\0$cn\0_isLazyLoad";
-		if ($this->_select === null) $exprops[] = "\0$cn\0_select";
+		if ($this->_nullValue === null) {
+			$exprops[] = "\0$cn\0_nullValue";
+		}
+		if ($this->_propertyName === null) {
+			$exprops[] = "\0$cn\0_propertyNama";
+		}
+		if ($this->_columnName === null) {
+			$exprops[] = "\0$cn\0_columnName";
+		}
+		if ($this->_columnIndex == -1) {
+			$exprops[] = "\0$cn\0_columnIndex";
+		}
+		if ($this->_nestedResultMapName === null) {
+			$exprops[] = "\0$cn\0_nestedResultMapName";
+		}
+		if ($this->_nestedResultMap === null) {
+			$exprops[] = "\0$cn\0_nestedResultMap";
+		}
+		if ($this->_valueType === null) {
+			$exprops[] = "\0$cn\0_valueType";
+		}
+		if ($this->_typeHandler === null) {
+			$exprops[] = "\0$cn\0_typeHandler";
+		}
+		if ($this->_isLazyLoad === false) {
+			$exprops[] = "\0$cn\0_isLazyLoad";
+		}
+		if ($this->_select === null) {
+			$exprops[] = "\0$cn\0_select";
+		}
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }

framework/Data/SqlMap/Configuration/TSqlMapStatement.php

Spacing +5 added lines, -5 removed lines

@@ -248,9 +248,9 @@ 
 	 */
 	public function initialize($manager)
 	{
-		if(strlen($this->_resultMapName) > 0)
+		if (strlen($this->_resultMapName) > 0)
 			$this->_resultMap = $manager->getResultMap($this->_resultMapName);
-		if(strlen($this->_parameterMapName) > 0)
+		if (strlen($this->_parameterMapName) > 0)
 			$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 [];
 	}
@@ -275,7 +275,7 @@ 
 	protected function createInstanceOf($registry, $type, $row = null)
 	{
 		$handler = $registry->getTypeHandler($type);
-		if($handler !== null)
+		if ($handler !== null)
 			return $handler->createNewInstance($row);
 		else
 			return $registry->createInstanceOf($type);
@@ -289,7 +289,7 @@ 
 	 */
 	public function createInstanceOfResultClass($registry, $row)
 	{
-		if(strlen($type = $this->getResultClass()) > 0)
+		if (strlen($type = $this->getResultClass()) > 0)
 			return $this->createInstanceOf($registry, $type, $row);
 	}
 

Braces +53 added lines, -24 removed lines

@@ -248,10 +248,12 @@ 
 	 */
 	public function initialize($manager)
 	{
-		if(strlen($this->_resultMapName) > 0)
-			$this->_resultMap = $manager->getResultMap($this->_resultMapName);
-		if(strlen($this->_parameterMapName) > 0)
-			$this->_parameterMap = $manager->getParameterMap($this->_parameterMapName);
+		if(strlen($this->_resultMapName) > 0) {
+					$this->_resultMap = $manager->getResultMap($this->_resultMapName);
+		}
+		if(strlen($this->_parameterMapName) > 0) {
+					$this->_parameterMap = $manager->getParameterMap($this->_parameterMapName);
+		}
 	}
 
 	/**
@@ -260,8 +262,9 @@ 
 	 */
 	public function createInstanceOfListClass($registry)
 	{
-		if(strlen($type = $this->getListClass()) > 0)
-			return $this->createInstanceOf($registry, $type);
+		if(strlen($type = $this->getListClass()) > 0) {
+					return $this->createInstanceOf($registry, $type);
+		}
 		return [];
 	}
 
@@ -275,10 +278,11 @@ 
 	protected function createInstanceOf($registry, $type, $row = null)
 	{
 		$handler = $registry->getTypeHandler($type);
-		if($handler !== null)
-			return $handler->createNewInstance($row);
-		else
-			return $registry->createInstanceOf($type);
+		if($handler !== null) {
+					return $handler->createNewInstance($row);
+		} else {
+					return $registry->createInstanceOf($type);
+		}
 	}
 
 	/**
@@ -289,26 +293,51 @@ 
 	 */
 	public function createInstanceOfResultClass($registry, $row)
 	{
-		if(strlen($type = $this->getResultClass()) > 0)
-			return $this->createInstanceOf($registry, $type, $row);
+		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";
+		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/TSqlMapConfig.php

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	private function getCacheKey()
 	{
-		return $this->getID() . $this->getConfigFile();
+		return $this->getID().$this->getConfigFile();
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	public function clearCache()
 	{
 		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		if ($cache !== null) {
 			$cache->delete($this->getCacheKey());
 		}
 	}
@@ -66,16 +66,16 @@ 
 	 * @since 3.1.7
 	 */
 	public function getSqlMapManager() {
-		if(($manager = $this->loadCachedSqlMapManager()) === null)
+		if (($manager = $this->loadCachedSqlMapManager()) === null)
 		{
 			$manager = new TSqlMapManager($this->getDbConnection());
-			if(strlen($file = $this->getConfigFile()) > 0)
+			if (strlen($file = $this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif ($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -87,12 +87,12 @@ 
 	 */
 	protected function cacheSqlMapManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
+			if ($cache !== null) {
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					$dependencies = $manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -106,13 +106,13 @@ 
 	 */
 	protected function loadCachedSqlMapManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TSqlMapManager)
+				if ($manager instanceof TSqlMapManager)
 					return $manager;
 			}
 		}
@@ -134,12 +134,12 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(is_file($value))
+		if (is_file($value))
 			$this->_configFile = $value;
 		else
 		{
 			$file = Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
+			if ($file === null || !is_file($file))
 				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
 			else
 				$this->_configFile = $file;
@@ -177,7 +177,7 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap === null)
+		if ($this->_sqlmap === null)
 			$this->_sqlmap = $this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}

Braces +18 added lines, -15 removed lines

@@ -74,8 +74,7 @@ 
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -92,8 +91,9 @@ 
 			$cache = $this->getApplication()->getCache();
 			if($cache !== null) {
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									$dependencies = $manager->getCacheDependencies();
+				}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -112,8 +112,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TSqlMapManager)
-					return $manager;
+				if($manager instanceof TSqlMapManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -134,15 +135,16 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(is_file($value))
-			$this->_configFile = $value;
-		else
+		if(is_file($value)) {
+					$this->_configFile = $value;
+		} else
 		{
 			$file = Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
-			else
-				$this->_configFile = $file;
+			if($file === null || !is_file($file)) {
+							throw new TConfigurationException('sqlmap_configfile_invalid', $value);
+			} else {
+							$this->_configFile = $file;
+			}
 		}
 	}
 
@@ -177,8 +179,9 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap === null)
-			$this->_sqlmap = $this->createSqlMapGateway();
+		if($this->_sqlmap === null) {
+					$this->_sqlmap = $this->createSqlMapGateway();
+		}
 		return $this->_sqlmap;
 	}
 }

framework/Data/SqlMap/Statements/TSimpleDynamicSql.php

Spacing +2 added lines, -2 removed lines

@@ -32,10 +32,10 @@
 
 	public function replaceDynamicParameter($sql, $parameter)
 	{
-		foreach($this->_mappings as $property)
+		foreach ($this->_mappings as $property)
 		{
 			$value = TPropertyAccess::get($parameter, $property);
-			$sql = preg_replace('/' . TSimpleDynamicParser::DYNAMIC_TOKEN . '/', str_replace('$', '\$', $value), $sql, 1);
+			$sql = preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', str_replace('$', '\$', $value), $sql, 1);
 		}
 		return $sql;
 	}

framework/Data/SqlMap/Statements/TPreparedStatementFactory.php

Spacing +2 added lines, -2 removed lines

@@ -35,14 +35,14 @@
 	{
 		$this->_preparedStatement = new TPreparedStatement();
 		$this->_preparedStatement->setPreparedSql($this->_commandText);
-		if($this->_statement->parameterMap() !== null)
+		if ($this->_statement->parameterMap() !== null)
 			$this->createParametersForTextCommand();
 		return $this->_preparedStatement;
 	}
 
 	protected function createParametersForTextCommand()
 	{
-		foreach($this->_statement->ParameterMap()->getProperties() as $prop)
+		foreach ($this->_statement->ParameterMap()->getProperties() as $prop)
 			$this->_preparedStatement->getParameterNames()->add($prop->getProperty());
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -35,15 +35,17 @@
 	{
 		$this->_preparedStatement = new TPreparedStatement();
 		$this->_preparedStatement->setPreparedSql($this->_commandText);
-		if($this->_statement->parameterMap() !== null)
-			$this->createParametersForTextCommand();
+		if($this->_statement->parameterMap() !== null) {
+					$this->createParametersForTextCommand();
+		}
 		return $this->_preparedStatement;
 	}
 
 	protected function createParametersForTextCommand()
 	{
-		foreach($this->_statement->ParameterMap()->getProperties() as $prop)
-			$this->_preparedStatement->getParameterNames()->add($prop->getProperty());
+		foreach($this->_statement->ParameterMap()->getProperties() as $prop) {
+					$this->_preparedStatement->getParameterNames()->add($prop->getProperty());
+		}
 	}
 }
 

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);
+			}
 		}
 	}
 }