pradosoft / prado

framework/Data/SqlMap/Configuration/TParameterProperty.php

Braces +18 added lines, -6 removed lines

@@ -138,12 +138,24 @@
 	public function __sleep()
 	{
 		$exprops = []; $cn = 'TParameterProperty';
-		if ($this->_typeHandler === null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_type === null) $exprops[] = "\0$cn\0_type";
-		if ($this->_column === null) $exprops[] = "\0$cn\0_column";
-		if ($this->_dbType === null) $exprops[] = "\0$cn\0_dbType";
-		if ($this->_property === null) $exprops[] = "\0$cn\0_property";
-		if ($this->_nullValue === null) $exprops[] = "\0$cn\0_nullValue";
+		if ($this->_typeHandler === null) {
+			$exprops[] = "\0$cn\0_typeHandler";
+		}
+		if ($this->_type === null) {
+			$exprops[] = "\0$cn\0_type";
+		}
+		if ($this->_column === null) {
+			$exprops[] = "\0$cn\0_column";
+		}
+		if ($this->_dbType === null) {
+			$exprops[] = "\0$cn\0_dbType";
+		}
+		if ($this->_property === null) {
+			$exprops[] = "\0$cn\0_property";
+		}
+		if ($this->_nullValue === null) {
+			$exprops[] = "\0$cn\0_nullValue";
+		}
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }

framework/Data/SqlMap/Configuration/TSimpleDynamicParser.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		$matches = [];
 		$mappings = [];
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
-		for($i = 0, $k = count($matches[1]); $i < $k; $i++)
+		for ($i = 0, $k = count($matches[1]); $i < $k; $i++)
 		{
 			$mappings[] = $matches[1][$i];
 			$sqlText = str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);

framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php

Spacing +64 added lines, -64 removed lines

@@ -77,39 +77,39 @@ 
 		$this->_document = $document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
+		if ($bCacheDependencies === null)
 			$bCacheDependencies = true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
-		if($bCacheDependencies)
+		if ($bCacheDependencies)
 			$this->_manager->getCacheDependencies()
 					->getDependencies()
 					->add(new TFileCacheDependency($filename));
 
-		foreach($document->xpath('//resultMap') as $node)
+		foreach ($document->xpath('//resultMap') as $node)
 			$this->loadResultMap($node);
 
-		foreach($document->xpath('//parameterMap') as $node)
+		foreach ($document->xpath('//parameterMap') as $node)
 			$this->loadParameterMap($node);
 
-		foreach($document->xpath('//statement') as $node)
+		foreach ($document->xpath('//statement') as $node)
 			$this->loadStatementTag($node);
 
-		foreach($document->xpath('//select') as $node)
+		foreach ($document->xpath('//select') as $node)
 			$this->loadSelectTag($node);
 
-		foreach($document->xpath('//insert') as $node)
+		foreach ($document->xpath('//insert') as $node)
 			$this->loadInsertTag($node);
 
-		foreach($document->xpath('//update') as $node)
+		foreach ($document->xpath('//update') as $node)
 			$this->loadUpdateTag($node);
 
-		foreach($document->xpath('//delete') as $node)
+		foreach ($document->xpath('//delete') as $node)
 			$this->loadDeleteTag($node);
 
-		foreach($document->xpath('//procedure') as $node)
+		foreach ($document->xpath('//procedure') as $node)
 			$this->loadProcedureTag($node);
 
-		foreach($document->xpath('//cacheModel') as $node)
+		foreach ($document->xpath('//cacheModel') as $node)
 				$this->loadCacheModel($node);
 
 		$this->registerCacheTriggers();
@@ -124,16 +124,16 @@ 
 		$resultMap = $this->createResultMap($node);
 
 		//find extended result map.
-		if(strlen($extendMap = $resultMap->getExtends()) > 0)
+		if (strlen($extendMap = $resultMap->getExtends()) > 0)
 		{
-			if(!$this->_manager->getResultMaps()->contains($extendMap))
+			if (!$this->_manager->getResultMaps()->contains($extendMap))
 			{
 				$extendNode = $this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
-				if($extendNode !== null)
+				if ($extendNode !== null)
 					$this->loadResultMap($extendNode);
 			}
 
-			if(!$this->_manager->getResultMaps()->contains($extendMap))
+			if (!$this->_manager->getResultMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
 
@@ -142,7 +142,7 @@ 
 		}
 
 		//add the result map
-		if(!$this->_manager->getResultMaps()->contains($resultMap->getID()))
+		if (!$this->_manager->getResultMaps()->contains($resultMap->getID()))
 			$this->_manager->addResultMap($resultMap);
 	}
 
@@ -158,7 +158,7 @@ 
 		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
-		foreach($node->result as $result)
+		foreach ($node->result as $result)
 		{
 			$property = new TResultProperty($resultMap);
 			$this->setObjectPropFromNode($property, $result);
@@ -167,16 +167,16 @@ 
 
 		//create the discriminator
 		$discriminator = null;
-		if(isset($node->discriminator))
+		if (isset($node->discriminator))
 		{
 			$discriminator = new TDiscriminator();
 			$this->setObjectPropFromNode($discriminator, $node->discriminator);
 			$discriminator->initMapping($resultMap);
 		}
 
-		foreach($node->xpath('subMap') as $subMapNode)
+		foreach ($node->xpath('subMap') as $subMapNode)
 		{
-			if($discriminator === null)
+			if ($discriminator === null)
 				throw new TSqlMapConfigurationException(
 					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
 			$subMap = new TSubMap;
@@ -184,7 +184,7 @@ 
 			$discriminator->addSubMap($subMap);
 		}
 
-		if($discriminator !== null)
+		if ($discriminator !== null)
 			$resultMap->setDiscriminator($discriminator);
 
 		return $resultMap;
@@ -199,21 +199,21 @@ 
 	{
 		$parameterMap = $this->createParameterMap($node);
 
-		if(strlen($extendMap = $parameterMap->getExtends()) > 0)
+		if (strlen($extendMap = $parameterMap->getExtends()) > 0)
 		{
-			if(!$this->_manager->getParameterMaps()->contains($extendMap))
+			if (!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
 				$extendNode = $this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
-				if($extendNode !== null)
+				if ($extendNode !== null)
 					$this->loadParameterMap($extendNode);
 			}
 
-			if(!$this->_manager->getParameterMaps()->contains($extendMap))
+			if (!$this->_manager->getParameterMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile, $extendMap);
 			$superMap = $this->_manager->getParameterMap($extendMap);
 			$index = 0;
-			foreach($superMap->getPropertyNames() as $propertyName)
+			foreach ($superMap->getPropertyNames() as $propertyName)
 				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
 		}
 		$this->_manager->addParameterMap($parameterMap);
@@ -228,7 +228,7 @@ 
 	{
 		$parameterMap = new TParameterMap();
 		$this->setObjectPropFromNode($parameterMap, $node);
-		foreach($node->parameter as $parameter)
+		foreach ($node->parameter as $parameter)
 		{
 			$property = new TParameterProperty();
 			$this->setObjectPropFromNode($property, $parameter);
@@ -258,12 +258,12 @@ 
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
-		$commandText = (string)$node;
-		if(strlen($extend = $statement->getExtends()) > 0)
+		$commandText = (string) $node;
+		if (strlen($extend = $statement->getExtends()) > 0)
 		{
 			$superNode = $this->getElementByIdValue($this->_document, '*', $extend);
-			if($superNode !== null)
-				$commandText = (string)$superNode . $commandText;
+			if ($superNode !== null)
+				$commandText = (string) $superNode.$commandText;
 			else
 				throw new TSqlMapConfigurationException(
 						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
@@ -285,23 +285,23 @@ 
 		$scope['node'] = $node;
 
 		$sqlStatement = preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
-		if($statement->parameterMap() === null)
+		if ($statement->parameterMap() === null)
 		{
 			// Build a Parametermap with the inline parameters.
 			// if they exist. Then delete inline infos from sqltext.
 			$parameterParser = new TInlineParameterMapParser;
 			$sqlText = $parameterParser->parse($sqlStatement, $scope);
-			if(count($sqlText['parameters']) > 0)
+			if (count($sqlText['parameters']) > 0)
 			{
 				$map = new TParameterMap();
-				$map->setID($statement->getID() . '-InLineParameterMap');
+				$map->setID($statement->getID().'-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
-				foreach($sqlText['parameters'] as $property)
+				foreach ($sqlText['parameters'] as $property)
 					$map->addProperty($property);
 			}
 			$sqlStatement = $sqlText['sql'];
 		}
-		$sqlStatement = preg_replace('/' . self::INLINE_PLACEHOLDER . '/', self::INLINE_SYMBOL, $sqlStatement);
+		$sqlStatement = preg_replace('/'.self::INLINE_PLACEHOLDER.'/', self::INLINE_SYMBOL, $sqlStatement);
 
 		$this->prepareSql($statement, $sqlStatement, $node);
 	}
@@ -318,14 +318,14 @@ 
 		$simpleDynamic = new TSimpleDynamicParser;
 		$sqlStatement = preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
 		$dynamics = $simpleDynamic->parse($sqlStatement);
-		if(count($dynamics['parameters']) > 0)
+		if (count($dynamics['parameters']) > 0)
 		{
 			$sql = new TSimpleDynamicSql($dynamics['parameters']);
 			$sqlStatement = $dynamics['sql'];
 		}
 		else
 			$sql = new TStaticSql();
-		$sqlStatement = preg_replace('/' . self::SIMPLE_PLACEHOLDER . '/', self::SIMPLE_MARK, $sqlStatement);
+		$sqlStatement = preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
 	}
@@ -340,7 +340,7 @@ 
 		$this->setObjectPropFromNode($select, $node);
 		$this->processSqlStatement($select, $node);
 		$mappedStatement = new TMappedStatement($this->_manager, $select);
-		if(strlen($select->getCacheModel()) > 0)
+		if (strlen($select->getCacheModel()) > 0)
 			$mappedStatement = new TCachingStatement($mappedStatement);
 
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -367,7 +367,7 @@ 
 	{
 		$insert = new TSqlMapInsert;
 		$this->setObjectPropFromNode($insert, $node);
-		if(isset($node->selectKey))
+		if (isset($node->selectKey))
 			$this->loadSelectKeyTag($insert, $node->selectKey);
 		return $insert;
 	}
@@ -381,7 +381,7 @@ 
 		$selectKey = new TSqlMapSelectKey;
 		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
-		$selectKey->setID($insert->getID() . '.SelectKey');
+		$selectKey->setID($insert->getID().'.SelectKey');
 		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
 		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
@@ -431,24 +431,24 @@ 
 	protected function loadCacheModel($node)
 	{
 		$cacheModel = new TSqlMapCacheModel;
-		$properties = ['id','implementation'];
-		foreach($node->attributes() as $name => $value)
+		$properties = ['id', 'implementation'];
+		foreach ($node->attributes() as $name => $value)
 		{
-			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set' . $name}((string)$value);
+			if (in_array(strtolower($name), $properties))
+				$cacheModel->{'set'.$name}((string) $value);
 		}
 		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
 		$this->setObjectPropFromNode($cache, $node, $properties);
 
-		foreach($node->xpath('property') as $propertyNode)
+		foreach ($node->xpath('property') as $propertyNode)
 		{
 			$name = $propertyNode->attributes()->name;
-			if($name === null || $name === '') continue;
+			if ($name === null || $name === '') continue;
 
 			$value = $propertyNode->attributes()->value;
-			if($value === null || $value === '') continue;
+			if ($value === null || $value === '') continue;
 
-			if(!TPropertyAccess::has($cache, $name)) continue;
+			if (!TPropertyAccess::has($cache, $name)) continue;
 
 			TPropertyAccess::set($cache, $name, $value);
 		}
@@ -457,7 +457,7 @@ 
 
 		$cacheModel->initialize($cache);
 		$this->_manager->addCacheModel($cacheModel);
-		foreach($node->xpath('flushOnExecute') as $flush)
+		foreach ($node->xpath('flushOnExecute') as $flush)
 			$this->loadFlushOnCache($cacheModel, $node, $flush);
 	}
 
@@ -469,26 +469,26 @@ 
 	protected function loadFlushInterval($cacheModel, $node)
 	{
 		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
+		if ($flushInterval === null || count($flushInterval) === 0) return;
 		$duration = 0;
-		foreach($flushInterval[0]->attributes() as $name => $value)
+		foreach ($flushInterval[0]->attributes() as $name => $value)
 		{
-			switch(strToLower($name))
+			switch (strToLower($name))
 			{
 				case 'seconds':
-					$duration += (integer)$value;
+					$duration += (integer) $value;
 				break;
 				case 'minutes':
-					$duration += 60 * (integer)$value;
+					$duration += 60 * (integer) $value;
 				break;
 				case 'hours':
-					$duration += 3600 * (integer)$value;
+					$duration += 3600 * (integer) $value;
 				break;
 				case 'days':
-					$duration += 86400 * (integer)$value;
+					$duration += 86400 * (integer) $value;
 				break;
 				case 'duration':
-					$duration = (integer)$value;
+					$duration = (integer) $value;
 				break 2; // switch, foreach
 			}
 		}
@@ -504,12 +504,12 @@ 
 	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
 		$id = $cacheModel->getID();
-		if(!isset($this->_FlushOnExecuteStatements[$id]))
+		if (!isset($this->_FlushOnExecuteStatements[$id]))
 			$this->_FlushOnExecuteStatements[$id] = [];
-		foreach($node->attributes() as $name => $value)
+		foreach ($node->attributes() as $name => $value)
 		{
-			if(strtolower($name) === 'statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+			if (strtolower($name) === 'statement')
+				$this->_FlushOnExecuteStatements[$id][] = (string) $value;
 		}
 	}
 
@@ -518,10 +518,10 @@ 
 	 */
 	protected function registerCacheTriggers()
 	{
-		foreach($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
+		foreach ($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
 		{
 			$cacheModel = $this->_manager->getCacheModel($cacheID);
-			foreach($statementIDs as $statementID)
+			foreach ($statementIDs as $statementID)
 			{
 				$statement = $this->_manager->getMappedStatement($statementID);
 				$cacheModel->registerTriggerStatement($statement);

Braces +98 added lines, -62 removed lines

@@ -77,40 +77,52 @@ 
 		$this->_document = $document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
-			$bCacheDependencies = true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		if($bCacheDependencies === null) {
+					$bCacheDependencies = true;
+		}
+		//Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
-		if($bCacheDependencies)
-			$this->_manager->getCacheDependencies()
+		if($bCacheDependencies) {
+					$this->_manager->getCacheDependencies()
 					->getDependencies()
 					->add(new TFileCacheDependency($filename));
+		}
 
-		foreach($document->xpath('//resultMap') as $node)
-			$this->loadResultMap($node);
+		foreach($document->xpath('//resultMap') as $node) {
+					$this->loadResultMap($node);
+		}
 
-		foreach($document->xpath('//parameterMap') as $node)
-			$this->loadParameterMap($node);
+		foreach($document->xpath('//parameterMap') as $node) {
+					$this->loadParameterMap($node);
+		}
 
-		foreach($document->xpath('//statement') as $node)
-			$this->loadStatementTag($node);
+		foreach($document->xpath('//statement') as $node) {
+					$this->loadStatementTag($node);
+		}
 
-		foreach($document->xpath('//select') as $node)
-			$this->loadSelectTag($node);
+		foreach($document->xpath('//select') as $node) {
+					$this->loadSelectTag($node);
+		}
 
-		foreach($document->xpath('//insert') as $node)
-			$this->loadInsertTag($node);
+		foreach($document->xpath('//insert') as $node) {
+					$this->loadInsertTag($node);
+		}
 
-		foreach($document->xpath('//update') as $node)
-			$this->loadUpdateTag($node);
+		foreach($document->xpath('//update') as $node) {
+					$this->loadUpdateTag($node);
+		}
 
-		foreach($document->xpath('//delete') as $node)
-			$this->loadDeleteTag($node);
+		foreach($document->xpath('//delete') as $node) {
+					$this->loadDeleteTag($node);
+		}
 
-		foreach($document->xpath('//procedure') as $node)
-			$this->loadProcedureTag($node);
+		foreach($document->xpath('//procedure') as $node) {
+					$this->loadProcedureTag($node);
+		}
 
-		foreach($document->xpath('//cacheModel') as $node)
-				$this->loadCacheModel($node);
+		foreach($document->xpath('//cacheModel') as $node) {
+						$this->loadCacheModel($node);
+		}
 
 		$this->registerCacheTriggers();
 	}
@@ -129,21 +141,24 @@ 
 			if(!$this->_manager->getResultMaps()->contains($extendMap))
 			{
 				$extendNode = $this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
-				if($extendNode !== null)
-					$this->loadResultMap($extendNode);
+				if($extendNode !== null) {
+									$this->loadResultMap($extendNode);
+				}
 			}
 
-			if(!$this->_manager->getResultMaps()->contains($extendMap))
-				throw new TSqlMapConfigurationException(
+			if(!$this->_manager->getResultMaps()->contains($extendMap)) {
+							throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
+			}
 
 			$superMap = $this->_manager->getResultMap($extendMap);
 			$resultMap->getColumns()->mergeWith($superMap->getColumns());
 		}
 
 		//add the result map
-		if(!$this->_manager->getResultMaps()->contains($resultMap->getID()))
-			$this->_manager->addResultMap($resultMap);
+		if(!$this->_manager->getResultMaps()->contains($resultMap->getID())) {
+					$this->_manager->addResultMap($resultMap);
+		}
 	}
 
 	/**
@@ -176,16 +191,18 @@ 
 
 		foreach($node->xpath('subMap') as $subMapNode)
 		{
-			if($discriminator === null)
-				throw new TSqlMapConfigurationException(
+			if($discriminator === null) {
+							throw new TSqlMapConfigurationException(
 					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
+			}
 			$subMap = new TSubMap;
 			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
-		if($discriminator !== null)
-			$resultMap->setDiscriminator($discriminator);
+		if($discriminator !== null) {
+					$resultMap->setDiscriminator($discriminator);
+		}
 
 		return $resultMap;
 	}
@@ -204,17 +221,20 @@ 
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
 				$extendNode = $this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
-				if($extendNode !== null)
-					$this->loadParameterMap($extendNode);
+				if($extendNode !== null) {
+									$this->loadParameterMap($extendNode);
+				}
 			}
 
-			if(!$this->_manager->getParameterMaps()->contains($extendMap))
-				throw new TSqlMapConfigurationException(
+			if(!$this->_manager->getParameterMaps()->contains($extendMap)) {
+							throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile, $extendMap);
+			}
 			$superMap = $this->_manager->getParameterMap($extendMap);
 			$index = 0;
-			foreach($superMap->getPropertyNames() as $propertyName)
-				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
+			foreach($superMap->getPropertyNames() as $propertyName) {
+							$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
+			}
 		}
 		$this->_manager->addParameterMap($parameterMap);
 	}
@@ -262,11 +282,12 @@ 
 		if(strlen($extend = $statement->getExtends()) > 0)
 		{
 			$superNode = $this->getElementByIdValue($this->_document, '*', $extend);
-			if($superNode !== null)
-				$commandText = (string)$superNode . $commandText;
-			else
-				throw new TSqlMapConfigurationException(
+			if($superNode !== null) {
+							$commandText = (string)$superNode . $commandText;
+			} else {
+							throw new TSqlMapConfigurationException(
 						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
+			}
 		}
 		//$commandText = $this->_xmlConfig->replaceProperties($commandText);
 		$statement->initialize($this->_manager);
@@ -296,8 +317,9 @@ 
 				$map = new TParameterMap();
 				$map->setID($statement->getID() . '-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
-				foreach($sqlText['parameters'] as $property)
-					$map->addProperty($property);
+				foreach($sqlText['parameters'] as $property) {
+									$map->addProperty($property);
+				}
 			}
 			$sqlStatement = $sqlText['sql'];
 		}
@@ -322,9 +344,9 @@ 
 		{
 			$sql = new TSimpleDynamicSql($dynamics['parameters']);
 			$sqlStatement = $dynamics['sql'];
+		} else {
+					$sql = new TStaticSql();
 		}
-		else
-			$sql = new TStaticSql();
 		$sqlStatement = preg_replace('/' . self::SIMPLE_PLACEHOLDER . '/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
@@ -340,8 +362,9 @@ 
 		$this->setObjectPropFromNode($select, $node);
 		$this->processSqlStatement($select, $node);
 		$mappedStatement = new TMappedStatement($this->_manager, $select);
-		if(strlen($select->getCacheModel()) > 0)
-			$mappedStatement = new TCachingStatement($mappedStatement);
+		if(strlen($select->getCacheModel()) > 0) {
+					$mappedStatement = new TCachingStatement($mappedStatement);
+		}
 
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
@@ -367,8 +390,9 @@ 
 	{
 		$insert = new TSqlMapInsert;
 		$this->setObjectPropFromNode($insert, $node);
-		if(isset($node->selectKey))
-			$this->loadSelectKeyTag($insert, $node->selectKey);
+		if(isset($node->selectKey)) {
+					$this->loadSelectKeyTag($insert, $node->selectKey);
+		}
 		return $insert;
 	}
 
@@ -434,8 +458,9 @@ 
 		$properties = ['id','implementation'];
 		foreach($node->attributes() as $name => $value)
 		{
-			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set' . $name}((string)$value);
+			if(in_array(strtolower($name), $properties)) {
+							$cacheModel->{'set' . $name}((string)$value);
+			}
 		}
 		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
 		$this->setObjectPropFromNode($cache, $node, $properties);
@@ -443,12 +468,18 @@ 
 		foreach($node->xpath('property') as $propertyNode)
 		{
 			$name = $propertyNode->attributes()->name;
-			if($name === null || $name === '') continue;
+			if($name === null || $name === '') {
+				continue;
+			}
 
 			$value = $propertyNode->attributes()->value;
-			if($value === null || $value === '') continue;
+			if($value === null || $value === '') {
+				continue;
+			}
 
-			if(!TPropertyAccess::has($cache, $name)) continue;
+			if(!TPropertyAccess::has($cache, $name)) {
+				continue;
+			}
 
 			TPropertyAccess::set($cache, $name, $value);
 		}
@@ -457,8 +488,9 @@ 
 
 		$cacheModel->initialize($cache);
 		$this->_manager->addCacheModel($cacheModel);
-		foreach($node->xpath('flushOnExecute') as $flush)
-			$this->loadFlushOnCache($cacheModel, $node, $flush);
+		foreach($node->xpath('flushOnExecute') as $flush) {
+					$this->loadFlushOnCache($cacheModel, $node, $flush);
+		}
 	}
 
 	/**
@@ -469,7 +501,9 @@ 
 	protected function loadFlushInterval($cacheModel, $node)
 	{
 		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
+		if($flushInterval === null || count($flushInterval) === 0) {
+			return;
+		}
 		$duration = 0;
 		foreach($flushInterval[0]->attributes() as $name => $value)
 		{
@@ -504,12 +538,14 @@ 
 	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
 		$id = $cacheModel->getID();
-		if(!isset($this->_FlushOnExecuteStatements[$id]))
-			$this->_FlushOnExecuteStatements[$id] = [];
+		if(!isset($this->_FlushOnExecuteStatements[$id])) {
+					$this->_FlushOnExecuteStatements[$id] = [];
+		}
 		foreach($node->attributes() as $name => $value)
 		{
-			if(strtolower($name) === 'statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+			if(strtolower($name) === 'statement') {
+							$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+			}
 		}
 	}
 

framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php

Spacing +16 added lines, -16 removed lines

@@ -64,20 +64,20 @@ 
 		$this->_configFile = $filename;
 		$document = $this->loadXmlDocument($filename, $this);
 
-		foreach($document->xpath('//property') as $property)
+		foreach ($document->xpath('//property') as $property)
 			$this->loadGlobalProperty($property);
 
-		foreach($document->xpath('//typeHandler') as $handler)
+		foreach ($document->xpath('//typeHandler') as $handler)
 			$this->loadTypeHandler($handler);
 
-		foreach($document->xpath('//connection[last()]') as $conn)
+		foreach ($document->xpath('//connection[last()]') as $conn)
 			$this->loadDatabaseConnection($conn);
 
 		//try to load configuration in the current config file.
 		$mapping = new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
-		foreach($document->xpath('//sqlMap') as $sqlmap)
+		foreach ($document->xpath('//sqlMap') as $sqlmap)
 			$this->loadSqlMappingFiles($sqlmap);
 
 		$this->resolveResultMapping();
@@ -90,7 +90,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']] = (string) $node['value'];
 	}
 
 	/**
@@ -119,9 +119,9 @@ 
 	 */
 	protected function loadSqlMappingFiles($node)
 	{
-		if(strlen($resource = (string)$node['resource']) > 0)
+		if (strlen($resource = (string) $node['resource']) > 0)
 		{
-			if(strpos($resource, '${') !== false)
+			if (strpos($resource, '${') !== false)
 				$resource = $this->replaceProperties($resource);
 
 			$mapping = new TSqlMapXmlMappingConfiguration($this);
@@ -136,14 +136,14 @@ 
 	protected function resolveResultMapping()
 	{
 		$maps = $this->_manager->getResultMaps();
-		foreach($maps as $entry)
+		foreach ($maps as $entry)
 		{
-			foreach($entry->getColumns() as $item)
+			foreach ($entry->getColumns() as $item)
 			{
 				$resultMap = $item->getResultMapping();
-				if(strlen($resultMap) > 0)
+				if (strlen($resultMap) > 0)
 				{
-					if($maps->contains($resultMap))
+					if ($maps->contains($resultMap))
 						$item->setNestedResultMap($maps[$resultMap]);
 					else
 						throw new TSqlMapConfigurationException(
@@ -151,7 +151,7 @@ 
 								$resultMap, $this->_configFile, $entry->getID());
 				}
 			}
-			if($entry->getDiscriminator() !== null)
+			if ($entry->getDiscriminator() !== null)
 				$entry->getDiscriminator()->initialize($this->_manager);
 		}
 	}
@@ -161,9 +161,9 @@ 
 	 */
 	protected function attachCacheModels()
 	{
-		foreach($this->_manager->getMappedStatements() as $mappedStatement)
+		foreach ($this->_manager->getMappedStatements() as $mappedStatement)
 		{
-			if(strlen($model = $mappedStatement->getStatement()->getCacheModel()) > 0)
+			if (strlen($model = $mappedStatement->getStatement()->getCacheModel()) > 0)
 			{
 				$cache = $this->_manager->getCacheModel($model);
 				$mappedStatement->getStatement()->setCache($cache);
@@ -179,8 +179,8 @@ 
 	 */
 	public function replaceProperties($string)
 	{
-		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${' . $find . '}', $replace, $string);
+		foreach ($this->_properties as $find => $replace)
+			$string = str_replace('${'.$find.'}', $replace, $string);
 		return $string;
 	}
 }
\ No newline at end of file

Braces +26 added lines, -18 removed lines

@@ -64,21 +64,25 @@ 
 		$this->_configFile = $filename;
 		$document = $this->loadXmlDocument($filename, $this);
 
-		foreach($document->xpath('//property') as $property)
-			$this->loadGlobalProperty($property);
+		foreach($document->xpath('//property') as $property) {
+					$this->loadGlobalProperty($property);
+		}
 
-		foreach($document->xpath('//typeHandler') as $handler)
-			$this->loadTypeHandler($handler);
+		foreach($document->xpath('//typeHandler') as $handler) {
+					$this->loadTypeHandler($handler);
+		}
 
-		foreach($document->xpath('//connection[last()]') as $conn)
-			$this->loadDatabaseConnection($conn);
+		foreach($document->xpath('//connection[last()]') as $conn) {
+					$this->loadDatabaseConnection($conn);
+		}
 
 		//try to load configuration in the current config file.
 		$mapping = new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
-		foreach($document->xpath('//sqlMap') as $sqlmap)
-			$this->loadSqlMappingFiles($sqlmap);
+		foreach($document->xpath('//sqlMap') as $sqlmap) {
+					$this->loadSqlMappingFiles($sqlmap);
+		}
 
 		$this->resolveResultMapping();
 		$this->attachCacheModels();
@@ -121,8 +125,9 @@ 
 	{
 		if(strlen($resource = (string)$node['resource']) > 0)
 		{
-			if(strpos($resource, '${') !== false)
-				$resource = $this->replaceProperties($resource);
+			if(strpos($resource, '${') !== false) {
+							$resource = $this->replaceProperties($resource);
+			}
 
 			$mapping = new TSqlMapXmlMappingConfiguration($this);
 			$filename = $this->getAbsoluteFilePath($this->_configFile, $resource);
@@ -143,16 +148,18 @@ 
 				$resultMap = $item->getResultMapping();
 				if(strlen($resultMap) > 0)
 				{
-					if($maps->contains($resultMap))
-						$item->setNestedResultMap($maps[$resultMap]);
-					else
-						throw new TSqlMapConfigurationException(
+					if($maps->contains($resultMap)) {
+											$item->setNestedResultMap($maps[$resultMap]);
+					} else {
+											throw new TSqlMapConfigurationException(
 							'sqlmap_unable_to_find_result_mapping',
 								$resultMap, $this->_configFile, $entry->getID());
+					}
 				}
 			}
-			if($entry->getDiscriminator() !== null)
-				$entry->getDiscriminator()->initialize($this->_manager);
+			if($entry->getDiscriminator() !== null) {
+							$entry->getDiscriminator()->initialize($this->_manager);
+			}
 		}
 	}
 
@@ -179,8 +186,9 @@ 
 	 */
 	public function replaceProperties($string)
 	{
-		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${' . $find . '}', $replace, $string);
+		foreach($this->_properties as $find => $replace) {
+					$string = str_replace('${' . $find . '}', $replace, $string);
+		}
 		return $string;
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php

Spacing +7 added lines, -7 removed lines

@@ -109,7 +109,7 @@ 
 	 */
 	public function initialize($cache = null)
 	{
-		if($cache === null)
+		if ($cache === null)
 			$this->_cache = Prado::createComponent($this->getImplementationClass(), $this);
 		else
 			$this->_cache = $cache;
@@ -123,7 +123,7 @@ 
 		$implementation = $this->_implementation;
 		if (isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
 
-		switch(TPropertyValue::ensureEnum($implementation, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes'))
+		switch (TPropertyValue::ensureEnum($implementation, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes'))
 		{
 			case TSqlMapCacheTypes::FIFO: return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapFifoCache';
 			case TSqlMapCacheTypes::LRU : return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapLruCache';
@@ -154,13 +154,13 @@ 
 	 */
 	public function get($key)
 	{
-		if($key instanceof TSqlMapCacheKey)
+		if ($key instanceof TSqlMapCacheKey)
 			$key = $key->getHash();
 
 		//if flush ?
 		$value = $this->_cache->get($key);
 		$this->_requests++;
-		if($value !== null)
+		if ($value !== null)
 			$this->_hits++;
 		return $value;
 	}
@@ -171,10 +171,10 @@ 
 	 */
 	public function set($key, $value)
 	{
-		if($key instanceof TSqlMapCacheKey)
+		if ($key instanceof TSqlMapCacheKey)
 			$key = $key->getHash();
 
-		if($value !== null)
+		if ($value !== null)
 			$this->_cache->set($key, $value, $this->_flushInterval);
 	}
 
@@ -183,7 +183,7 @@ 
 	 */
 	public function getHitRatio()
 	{
-		if($this->_requests != 0)
+		if ($this->_requests != 0)
 			return $this->_hits / $this->_requests;
 		else
 			return 0;

Braces +30 added lines, -21 removed lines

@@ -81,10 +81,11 @@ 
 	 */
 	public function setImplementation($value)
 	{
-		if (isset(self::$_cacheTypes[$value]))
-			$this->_implementation = $value;
-		else
-			$this->_implementation = TPropertyValue::ensureEnum($value, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes');
+		if (isset(self::$_cacheTypes[$value])) {
+					$this->_implementation = $value;
+		} else {
+					$this->_implementation = TPropertyValue::ensureEnum($value, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes');
+		}
 	}
 
 	/**
@@ -109,10 +110,11 @@ 
 	 */
 	public function initialize($cache = null)
 	{
-		if($cache === null)
-			$this->_cache = Prado::createComponent($this->getImplementationClass(), $this);
-		else
-			$this->_cache = $cache;
+		if($cache === null) {
+					$this->_cache = Prado::createComponent($this->getImplementationClass(), $this);
+		} else {
+					$this->_cache = $cache;
+		}
 	}
 
 	/**
@@ -121,7 +123,9 @@ 
 	public function getImplementationClass()
 	{
 		$implementation = $this->_implementation;
-		if (isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
+		if (isset(self::$_cacheTypes[$implementation])) {
+			return self::$_cacheTypes[$implementation];
+		}
 
 		switch(TPropertyValue::ensureEnum($implementation, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes'))
 		{
@@ -154,14 +158,16 @@ 
 	 */
 	public function get($key)
 	{
-		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+		if($key instanceof TSqlMapCacheKey) {
+					$key = $key->getHash();
+		}
 
 		//if flush ?
 		$value = $this->_cache->get($key);
 		$this->_requests++;
-		if($value !== null)
-			$this->_hits++;
+		if($value !== null) {
+					$this->_hits++;
+		}
 		return $value;
 	}
 
@@ -171,11 +177,13 @@ 
 	 */
 	public function set($key, $value)
 	{
-		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+		if($key instanceof TSqlMapCacheKey) {
+					$key = $key->getHash();
+		}
 
-		if($value !== null)
-			$this->_cache->set($key, $value, $this->_flushInterval);
+		if($value !== null) {
+					$this->_cache->set($key, $value, $this->_flushInterval);
+		}
 	}
 
 	/**
@@ -183,9 +191,10 @@ 
 	 */
 	public function getHitRatio()
 	{
-		if($this->_requests != 0)
-			return $this->_hits / $this->_requests;
-		else
-			return 0;
+		if($this->_requests != 0) {
+					return $this->_hits / $this->_requests;
+		} else {
+					return 0;
+		}
 	}
 }
\ No newline at end of file

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