pradosoft / prado

framework/Data/SqlMap/DataMapper/TObjectProxy.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	 */
 	public function __call($method, $params)
 	{
-		if($this->_handler->hasMethod($method))
+		if ($this->_handler->hasMethod($method))
 			return $this->_handler->intercept($method, $params);
 		else
 			return call_user_func_array([$this->_object, $method], $params);

Braces +5 added lines, -4 removed lines

@@ -43,9 +43,10 @@
 	 */
 	public function __call($method, $params)
 	{
-		if($this->_handler->hasMethod($method))
-			return $this->_handler->intercept($method, $params);
-		else
-			return call_user_func_array([$this->_object, $method], $params);
+		if($this->_handler->hasMethod($method)) {
+					return $this->_handler->intercept($method, $params);
+		} else {
+					return call_user_func_array([$this->_object, $method], $params);
+		}
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php

Spacing +13 added lines, -13 removed lines

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

Braces +22 added lines, -16 removed lines

@@ -54,12 +54,13 @@ 
 		{
 			if(!in_array($name, $except))
 			{
-				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
-				else
-					throw new TSqlMapConfigurationException(
+				if($obj->canSetProperty($name)) {
+									$obj->{$name} = (string)$value;
+				} else {
+									throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
 						$node, $this->getConfigFile());
+				}
 			}
 		}
 	}
@@ -73,13 +74,15 @@ 
 	{
 		$basedir = dirname($basefile);
 		$file = realpath($basedir . DIRECTORY_SEPARATOR . $resource);
-		if(!is_string($file) || !is_file($file))
-			$file = realpath($resource);
-		if(is_string($file) && is_file($file))
-			return $file;
-		else
-			throw new TSqlMapConfigurationException(
+		if(!is_string($file) || !is_file($file)) {
+					$file = realpath($resource);
+		}
+		if(is_string($file) && is_file($file)) {
+					return $file;
+		} else {
+					throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_resource', $resource);
+		}
 	}
 	/**
 	 * Load document using simple xml.
@@ -88,11 +91,13 @@ 
 	 */
 	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if(strpos($filename, '${') !== false)
-			$filename = $config->replaceProperties($filename);
-		if(!is_file($filename))
-			throw new TSqlMapConfigurationException(
+		if(strpos($filename, '${') !== false) {
+					$filename = $config->replaceProperties($filename);
+		}
+		if(!is_file($filename)) {
+					throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_config', $filename);
+		}
 		return simplexml_load_string($config->replaceProperties(file_get_contents($filename)));
 	}
 	/**
@@ -108,8 +113,9 @@ 
 		foreach(['id','ID','Id', 'iD'] as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
-			foreach($document->xpath($xpath) as $node)
-				return $node;
+			foreach($document->xpath($xpath) as $node) {
+							return $node;
+			}
 		}
 	}
 	/**

framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 		$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[] = $this->parseMapping($matches[1][$i], $scope);
 			$sqlText = str_replace($matches[0][$i], '?', $sqlText);
@@ -62,12 +62,12 @@ 
 		$mapping = new TParameterProperty;
 		$properties = explode(',', $token);
 		$mapping->setProperty(trim(array_shift($properties)));
-		foreach($properties as $property)
+		foreach ($properties as $property)
 		{
 			$prop = explode('=', $property);
 			$name = trim($prop[0]); $value = trim($prop[1]);
-			if($mapping->canSetProperty($name))
-				$mapping->{'set' . $name}($value);
+			if ($mapping->canSetProperty($name))
+				$mapping->{'set'.$name}($value);
 			else
 			{
 				throw new TSqlMapUndefinedException(

Braces +3 added lines, -3 removed lines

@@ -66,9 +66,9 @@
 		{
 			$prop = explode('=', $property);
 			$name = trim($prop[0]); $value = trim($prop[1]);
-			if($mapping->canSetProperty($name))
-				$mapping->{'set' . $name}($value);
-			else
+			if($mapping->canSetProperty($name)) {
+							$mapping->{'set' . $name}($value);
+			} else
 			{
 				throw new TSqlMapUndefinedException(
 						'sqlmap_undefined_property_inline_map',

framework/Data/SqlMap/Configuration/TParameterMap.php

Spacing +7 added lines, -7 removed lines

@@ -101,9 +101,9 @@ 
 	 */
 	public function getProperty($index)
 	{
-		if(is_string($index))
+		if (is_string($index))
 			return $this->_propertyMap->itemAt($index);
-		elseif(is_int($index))
+		elseif (is_int($index))
 			return $this->_properties->itemAt($index);
 		else
 			throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
@@ -147,12 +147,12 @@ 
 	{
 		$value = $this->getObjectValue($parameterValue, $property);
 
-		if(($handler = $this->createTypeHandler($property, $registry)) !== null)
+		if (($handler = $this->createTypeHandler($property, $registry)) !== null)
 			$value = $handler->getParameter($value);
 
 		$value = $this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType()) !== null)
+		if (($type = $property->getType()) !== null)
 			$value = $registry->convertToType($type, $value);
 
 		return $value;
@@ -169,7 +169,7 @@ 
 	{
 		$type = $property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $property->getTypeHandler())
+		if ($handler === null && $property->getTypeHandler())
 			$handler = Prado::createComponent($type);
 		return $handler;
 	}
@@ -207,9 +207,9 @@ 
 	 */
 	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue()) !== null)
+		if (($nullValue = $property->getNullValue()) !== null)
 		{
-			if($nullValue === $value)
+			if ($nullValue === $value)
 				$value = null;
 		}
 		return $value;

Braces +20 added lines, -16 removed lines

@@ -101,12 +101,13 @@ 
 	 */
 	public function getProperty($index)
 	{
-		if(is_string($index))
-			return $this->_propertyMap->itemAt($index);
-		elseif(is_int($index))
-			return $this->_properties->itemAt($index);
-		else
-			throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
+		if(is_string($index)) {
+					return $this->_propertyMap->itemAt($index);
+		} elseif(is_int($index)) {
+					return $this->_properties->itemAt($index);
+		} else {
+					throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
+		}
 	}
 
 	/**
@@ -147,13 +148,15 @@ 
 	{
 		$value = $this->getObjectValue($parameterValue, $property);
 
-		if(($handler = $this->createTypeHandler($property, $registry)) !== null)
-			$value = $handler->getParameter($value);
+		if(($handler = $this->createTypeHandler($property, $registry)) !== null) {
+					$value = $handler->getParameter($value);
+		}
 
 		$value = $this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType()) !== null)
-			$value = $registry->convertToType($type, $value);
+		if(($type = $property->getType()) !== null) {
+					$value = $registry->convertToType($type, $value);
+		}
 
 		return $value;
 	}
@@ -169,8 +172,9 @@ 
 	{
 		$type = $property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+		if($handler === null && $property->getTypeHandler()) {
+					$handler = Prado::createComponent($type);
+		}
 		return $handler;
 	}
 
@@ -186,8 +190,7 @@ 
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
-		}
-		catch (TInvalidPropertyException $e)
+		} catch (TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -209,8 +212,9 @@ 
 	{
 		if(($nullValue = $property->getNullValue()) !== null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue === $value) {
+							$value = null;
+			}
 		}
 		return $value;
 	}

framework/Data/SqlMap/Configuration/TResultMap.php

Spacing +5 added lines, -5 removed lines

@@ -165,7 +165,7 @@ 
 		$handler = $registry->getTypeHandler($this->getClass());
 		try
 		{
-			if($handler !== null)
+			if ($handler !== null)
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
@@ -187,14 +187,14 @@ 
 	public function resolveSubMap($registry, $row)
 	{
 		$subMap = $this;
-		if(($disc = $this->getDiscriminator()) !== null)
+		if (($disc = $this->getDiscriminator()) !== null)
 		{
 			$value = $disc->getMapping()->getPropertyValue($registry, $row);
-			$subMap = $disc->getSubMap((string)$value);
+			$subMap = $disc->getSubMap((string) $value);
 
-			if($subMap === null)
+			if ($subMap === null)
 				$subMap = $this;
-			elseif($subMap !== $this)
+			elseif ($subMap !== $this)
 				$subMap = $subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;

Braces +11 added lines, -10 removed lines

@@ -165,12 +165,12 @@ 
 		$handler = $registry->getTypeHandler($this->getClass());
 		try
 		{
-			if($handler !== null)
-				return $handler->createNewInstance();
-			else
-				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+			if($handler !== null) {
+							return $handler->createNewInstance();
+			} else {
+							return $registry->createInstanceOf($this->getClass());
+			}
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -192,10 +192,11 @@ 
 			$value = $disc->getMapping()->getPropertyValue($registry, $row);
 			$subMap = $disc->getSubMap((string)$value);
 
-			if($subMap === null)
-				$subMap = $this;
-			elseif($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry, $row);
+			if($subMap === null) {
+							$subMap = $this;
+			} elseif($subMap !== $this) {
+							$subMap = $subMap->resolveSubMap($registry, $row);
+			}
 		}
 		return $subMap;
 	}

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