pradosoft / prado

framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php

Doc Comments +4 added lines, -2 removed lines

@@ -73,6 +73,7 @@ 
 
 	/**
 	 * @param string cache implements of TSqlMapCacheTypes, either 'Basic', 'LRU' or 'FIFO'.
+	 * @param string $value
 	 */
 	public function setImplementation($value)
 	{
@@ -129,6 +130,7 @@ 
 	/**
 	 * Register a mapped statement that will trigger a cache flush.
 	 * @param TMappedStatement mapped statement that may flush the cache.
+	 * @param IMappedStatement $mappedStatement
 	 */
 	public function registerTriggerStatement($mappedStatement)
 	{
@@ -174,7 +176,7 @@ 
 	}
 
 	/**
-	 * @return float cache hit ratio.
+	 * @return integer cache hit ratio.
 	 */
 	public function getHitRatio()
 	{
@@ -223,7 +225,7 @@ 
 	}
 
 	/**
-	 * @param string serialized object
+	 * @param string string object
 	 * @return string crc32 hash of the serialized object.
 	 */
 	protected function generateKey($string)

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 	private $_hits = 0;
 	private $_requests = 0;
 	private $_id;
-	private $_implementation=TSqlMapCacheTypes::Basic;
+	private $_implementation = TSqlMapCacheTypes::Basic;
 	private $_properties = array();
 	private $_flushInterval = 0;
 
@@ -79,7 +79,7 @@ 
 		if (isset(self::$_cacheTypes[$value]))
 			$this->_implementation = $value;
 		else
-			$this->_implementation = TPropertyValue::ensureEnum($value,'TSqlMapCacheTypes');
+			$this->_implementation = TPropertyValue::ensureEnum($value, 'TSqlMapCacheTypes');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setFlushInterval($value)
 	{
-		$this->_flushInterval=TPropertyValue::ensureInteger($value);
+		$this->_flushInterval = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -102,12 +102,12 @@ 
 	 * Initialize the cache implementation, sets the actual cache contain if supplied.
 	 * @param ISqLMapCache cache implementation instance.
 	 */
-	public function initialize($cache=null)
+	public function initialize($cache = null)
 	{
-		if($cache===null)
-			$this->_cache= Prado::createComponent($this->getImplementationClass(), $this);
+		if ($cache === null)
+			$this->_cache = Prado::createComponent($this->getImplementationClass(), $this);
 		else
-			$this->_cache=$cache;
+			$this->_cache = $cache;
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 		$implementation = $this->_implementation;
 		if (isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
 
-		switch(TPropertyValue::ensureEnum($implementation,'TSqlMapCacheTypes'))
+		switch (TPropertyValue::ensureEnum($implementation, 'TSqlMapCacheTypes'))
 		{
 			case TSqlMapCacheTypes::FIFO: return 'TSqlMapFifoCache';
 			case TSqlMapCacheTypes::LRU : return 'TSqlMapLruCache';
@@ -132,7 +132,7 @@ 
 	 */
 	public function registerTriggerStatement($mappedStatement)
 	{
-		$mappedStatement->attachEventHandler('OnExecuteQuery',array($this, 'flush'));
+		$mappedStatement->attachEventHandler('OnExecuteQuery', array($this, 'flush'));
 	}
 
 	/**
@@ -149,13 +149,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;
 	}
@@ -166,10 +166,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);
 	}
 
@@ -178,7 +178,7 @@ 
 	 */
 	public function getHitRatio()
 	{
-		if($this->_requests != 0)
+		if ($this->_requests != 0)
 			return $this->_hits / $this->_requests;
 		else
 			return 0;
@@ -196,9 +196,9 @@ 
  */
 class TSqlMapCacheTypes extends TEnumerable
 {
-	const Basic='Basic';
-	const FIFO='FIFO';
-	const LRU='LRU';
+	const Basic = 'Basic';
+	const FIFO = 'FIFO';
+	const LRU = 'LRU';
 }
 
 /**
@@ -228,7 +228,7 @@ 
 	 */
 	protected function generateKey($string)
 	{
-		return sprintf('%x',crc32($string));
+		return sprintf('%x', crc32($string));
 	}
 
 	/**

Braces +30 added lines, -21 removed lines

@@ -76,10 +76,11 @@ 
 	 */
 	public function setImplementation($value)
 	{
-		if (isset(self::$_cacheTypes[$value]))
-			$this->_implementation = $value;
-		else
-			$this->_implementation = TPropertyValue::ensureEnum($value,'TSqlMapCacheTypes');
+		if (isset(self::$_cacheTypes[$value])) {
+					$this->_implementation = $value;
+		} else {
+					$this->_implementation = TPropertyValue::ensureEnum($value,'TSqlMapCacheTypes');
+		}
 	}
 
 	/**
@@ -104,10 +105,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;
+		}
 	}
 
 	/**
@@ -116,7 +118,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,'TSqlMapCacheTypes'))
 		{
@@ -149,14 +153,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;
 	}
 
@@ -166,11 +172,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);
+		}
 	}
 
 	/**
@@ -178,10 +186,11 @@ 
 	 */
 	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;
+		}
 	}
 }
 

framework/Data/SqlMap/Configuration/TSqlMapStatement.php

Doc Comments +1 added lines

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

Spacing +14 added lines, -14 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_ID=$value;
+		$this->_ID = $value;
 	}
 
 	/**
@@ -246,9 +246,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);
 	}
 
@@ -258,8 +258,8 @@ 
 	 */
 	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 array();
 	}
 
@@ -270,10 +270,10 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	protected function createInstanceOf($registry,$type,$row=null)
+	protected function createInstanceOf($registry, $type, $row = null)
 	{
 		$handler = $registry->getTypeHandler($type);
-		if($handler!==null)
+		if ($handler !== null)
 			return $handler->createNewInstance($row);
 		else
 			return $registry->createInstanceOf($type);
@@ -285,10 +285,10 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	public function createInstanceOfResultClass($registry,$row)
+	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()
@@ -308,7 +308,7 @@ 
 		if (!$this->_extendStatement) $exprops[] = "\0$cn\0_extendStatement";
 		if (!$this->_cache) $exprops[] = "\0$cn\0_cache";
 
-		return array_diff(parent::__sleep(),$exprops);
+		return array_diff(parent::__sleep(), $exprops);
 	}
 
 }
@@ -324,8 +324,8 @@ 
 {
 	private $_generate;
 
-	public function getGenerate(){ return $this->_generate; }
-	public function setGenerate($value){ $this->_generate = $value; }
+	public function getGenerate() { return $this->_generate; }
+	public function setGenerate($value) { $this->_generate = $value; }
 }
 
 /**
@@ -340,7 +340,7 @@ 
  */
 class TSqlMapInsert extends TSqlMapStatement
 {
-	private $_selectKey=null;
+	private $_selectKey = null;
 
 	/**
 	 * @return TSqlMapSelectKey select key element.

Braces +53 added lines, -24 removed lines

@@ -246,10 +246,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);
+		}
 	}
 
 	/**
@@ -258,8 +260,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 array();
 	}
 
@@ -273,10 +276,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);
+		}
 	}
 
 	/**
@@ -287,26 +291,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 = array("\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/Configuration/TSqlMapXmlConfiguration.php

Doc Comments +12 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	 * Create an instance of an object give by the attribute named 'class' in the
 	 * node and set the properties on the object given by attribute names and values.
 	 * @param SimpleXmlNode property node
-	 * @return Object new instance of class with class name given by 'class' attribute value.
+	 * @return TComponent new instance of class with class name given by 'class' attribute value.
 	 */
 	protected function createObjectFromNode($node)
 	{
@@ -44,6 +44,7 @@ 
 	 * @param Object object instance
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
+	 * @param TComponent $obj
 	 */
 	protected function setObjectPropFromNode($obj,$node,$except=array())
 	{
@@ -65,6 +66,8 @@ 
 	 * Gets the filename relative to the basefile.
 	 * @param string base filename
 	 * @param string relative filename
+	 * @param string $basefile
+	 * @param string $resource
 	 * @return string absolute filename.
 	 */
 	protected function getAbsoluteFilePath($basefile,$resource)
@@ -98,9 +101,10 @@ 
 
 	/**
 	 * Get element node by ID value (try for attribute name ID as case insensitive).
-	 * @param SimpleXmlDocument $document
+	 * @param SimpleXMLElement $document
 	 * @param string tag name.
 	 * @param string id value.
+	 * @param string $tag
 	 * @return SimpleXmlElement node if found, null otherwise.
 	 */
 	protected function getElementByIdValue($document, $tag, $value)
@@ -146,6 +150,7 @@ 
 
 	/**
 	 * @param TSqlMapManager manager instance.
+	 * @param TSqlMapManager $manager
 	 */
 	public function __construct($manager)
 	{
@@ -524,6 +529,7 @@ 
 	 * in the sql text. Extracts inline parameter maps.
 	 * @param TSqlMapStatement mapped statement.
 	 * @param SimpleXmlElement statement node.
+	 * @param TSqlMapStatement $statement
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
@@ -547,6 +553,7 @@ 
 	 * @param TSqlMapStatement statement object.
 	 * @param string sql text
 	 * @param SimpleXmlElement statement node.
+	 * @param string $sqlStatement
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
@@ -644,6 +651,7 @@ 
 	/**
 	 * Load the selectKey statement from xml mapping.
 	 * @param SimpleXmlElement selectkey node
+	 * @param TSqlMapInsert $insert
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
@@ -734,6 +742,7 @@ 
 	 * Load the flush interval
 	 * @param TSqlMapCacheModel cache model
 	 * @param SimpleXmlElement cache node
+	 * @param TSqlMapCacheModel $cacheModel
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
@@ -769,6 +778,7 @@ 
 	 * @param TSqlMapCacheModel cache model
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
+	 * @param TSqlMapCacheModel $cacheModel
 	 */
 	protected function loadFlushOnCache($cacheModel,$parent,$node)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TSqlMapXmlConfigBuilder, TSqlMapXmlConfiguration, TSqlMapXmlMappingConfiguration classes file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.SqlMap.Configuration
- */
+	 * TSqlMapXmlConfigBuilder, TSqlMapXmlConfiguration, TSqlMapXmlMappingConfiguration classes file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.SqlMap.Configuration
+	 */
 
 Prado::using('System.Data.SqlMap.Configuration.TSqlMapStatement');
 

Spacing +142 added lines, -142 removed lines

@@ -27,10 +27,10 @@ 
 	 */
 	protected function createObjectFromNode($node)
 	{
-		if(isset($node['class']))
+		if (isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
-			$this->setObjectPropFromNode($obj,$node,array('class'));
+			$obj = Prado::createComponent((string) $node['class']);
+			$this->setObjectPropFromNode($obj, $node, array('class'));
 			return $obj;
 		}
 		throw new TSqlMapConfigurationException(
@@ -45,14 +45,14 @@ 
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
 	 */
-	protected function setObjectPropFromNode($obj,$node,$except=array())
+	protected function setObjectPropFromNode($obj, $node, $except = array())
 	{
-		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),
@@ -67,13 +67,13 @@ 
 	 * @param string relative filename
 	 * @return string absolute filename.
 	 */
-	protected function getAbsoluteFilePath($basefile,$resource)
+	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(
@@ -85,12 +85,12 @@ 
 	 * @param string filename.
 	 * @return SimpleXmlElement xml document.
 	 */
-	protected function loadXmlDocument($filename,TSqlMapXmlConfiguration $config)
+	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)));
@@ -106,10 +106,10 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(array('id','ID','Id', 'iD') as $id)
+		foreach (array('id', 'ID', 'Id', 'iD') as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
-			foreach($document->xpath($xpath) as $node)
+			foreach ($document->xpath($xpath) as $node)
 				return $node;
 		}
 	}
@@ -142,14 +142,14 @@ 
 	/**
 	 * @var array global properties.
 	 */
-	private $_properties=array();
+	private $_properties = array();
 
 	/**
 	 * @param TSqlMapManager manager instance.
 	 */
 	public function __construct($manager)
 	{
-		$this->_manager=$manager;
+		$this->_manager = $manager;
 	}
 
 	public function getManager()
@@ -166,25 +166,25 @@ 
 	 * Configure the TSqlMapManager using the given xml file.
 	 * @param string SqlMap configuration xml file.
 	 */
-	public function configure($filename=null)
+	public function configure($filename = null)
 	{
-		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this);
+		$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();
@@ -197,7 +197,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']] = (string) $node['value'];
 	}
 
 	/**
@@ -226,9 +226,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);
@@ -243,14 +243,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(
@@ -258,7 +258,7 @@ 
 								$resultMap, $this->_configFile, $entry->getID());
 				}
 			}
-			if($entry->getDiscriminator()!==null)
+			if ($entry->getDiscriminator() !== null)
 				$entry->getDiscriminator()->initialize($this->_manager);
 		}
 	}
@@ -268,9 +268,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);
@@ -286,8 +286,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;
 	}
 }
@@ -309,25 +309,25 @@ 
 
 	private $_document;
 
-	private $_FlushOnExecuteStatements=array();
+	private $_FlushOnExecuteStatements = array();
 
 	/**
 	 * Regular expressions for escaping simple/inline parameter symbols
 	 */
-	const SIMPLE_MARK='$';
-	const INLINE_SYMBOL='#';
-	const ESCAPED_SIMPLE_MARK_REGEXP='/\$\$/';
-	const ESCAPED_INLINE_SYMBOL_REGEXP='/\#\#/';
-	const SIMPLE_PLACEHOLDER='`!!`';
-	const INLINE_PLACEHOLDER='`!!!`';
+	const SIMPLE_MARK = '$';
+	const INLINE_SYMBOL = '#';
+	const ESCAPED_SIMPLE_MARK_REGEXP = '/\$\$/';
+	const ESCAPED_INLINE_SYMBOL_REGEXP = '/\#\#/';
+	const SIMPLE_PLACEHOLDER = '`!!`';
+	const INLINE_PLACEHOLDER = '`!!!`';
 
 	/**
 	 * @param TSqlMapXmlConfiguration parent xml configuration.
 	 */
 	public function __construct(TSqlMapXmlConfiguration $xmlConfig)
 	{
-		$this->_xmlConfig=$xmlConfig;
-		$this->_manager=$xmlConfig->getManager();
+		$this->_xmlConfig = $xmlConfig;
+		$this->_manager = $xmlConfig->getManager();
 	}
 
 	protected function getConfigFile()
@@ -341,44 +341,44 @@ 
 	 */
 	public function configure($filename)
 	{
-		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this->_xmlConfig);
-		$this->_document=$document;
+		$this->_configFile = $filename;
+		$document = $this->loadXmlDocument($filename, $this->_xmlConfig);
+		$this->_document = $document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
+		if ($bCacheDependencies === null)
 			$bCacheDependencies = 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();
@@ -393,16 +393,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)
+				$extendNode = $this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
+				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);
 
@@ -411,7 +411,7 @@ 
 		}
 
 		//add the result map
-		if(!$this->_manager->getResultMaps()->contains($resultMap->getID()))
+		if (!$this->_manager->getResultMaps()->contains($resultMap->getID()))
 			$this->_manager->addResultMap($resultMap);
 	}
 
@@ -424,36 +424,36 @@ 
 	protected function createResultMap($node)
 	{
 		$resultMap = new TResultMap();
-		$this->setObjectPropFromNode($resultMap,$node);
+		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
-		foreach($node->result as $result)
+		foreach ($node->result as $result)
 		{
 			$property = new TResultProperty($resultMap);
-			$this->setObjectPropFromNode($property,$result);
+			$this->setObjectPropFromNode($property, $result);
 			$resultMap->addResultProperty($property);
 		}
 
 		//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);
+					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
 			$subMap = new TSubMap;
-			$this->setObjectPropFromNode($subMap,$subMapNode);
+			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
-		if($discriminator!==null)
+		if ($discriminator !== null)
 			$resultMap->setDiscriminator($discriminator);
 
 		return $resultMap;
@@ -468,22 +468,22 @@ 
 	{
 		$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)
+				$extendNode = $this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
+				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);
+					'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);
 	}
@@ -496,11 +496,11 @@ 
 	protected function createParameterMap($node)
 	{
 		$parameterMap = new TParameterMap();
-		$this->setObjectPropFromNode($parameterMap,$node);
-		foreach($node->parameter as $parameter)
+		$this->setObjectPropFromNode($parameterMap, $node);
+		foreach ($node->parameter as $parameter)
 		{
 			$property = new TParameterProperty();
-			$this->setObjectPropFromNode($property,$parameter);
+			$this->setObjectPropFromNode($property, $parameter);
 			$parameterMap->addProperty($property);
 		}
 		return $parameterMap;
@@ -513,7 +513,7 @@ 
 	protected function loadStatementTag($node)
 	{
 		$statement = new TSqlMapStatement();
-		$this->setObjectPropFromNode($statement,$node);
+		$this->setObjectPropFromNode($statement, $node);
 		$this->processSqlStatement($statement, $node);
 		$mappedStatement = new TMappedStatement($this->_manager, $statement);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -527,15 +527,15 @@ 
 	 */
 	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;
+			$superNode = $this->getElementByIdValue($this->_document, '*', $extend);
+			if ($superNode !== null)
+				$commandText = (string) $superNode . $commandText;
 			else
 				throw new TSqlMapConfigurationException(
-						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile,$node);
+						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
 		}
 		//$commandText = $this->_xmlConfig->replaceProperties($commandText);
 		$statement->initialize($this->_manager);
@@ -553,24 +553,24 @@ 
 		$scope['file'] = $this->_configFile;
 		$scope['node'] = $node;
 
-		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP,self::INLINE_PLACEHOLDER,$sqlStatement);
-		if($statement->parameterMap() === null)
+		$sqlStatement = preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
+		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);
 	}
@@ -582,19 +582,19 @@ 
 	 * @param SimpleXmlElement statement node.
 	 * @todo Extend to dynamic sql.
 	 */
-	protected function prepareSql($statement,$sqlStatement, $node)
+	protected function prepareSql($statement, $sqlStatement, $node)
 	{
 		$simpleDynamic = new TSimpleDynamicParser;
-		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP,self::SIMPLE_PLACEHOLDER,$sqlStatement);
+		$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);
 	}
@@ -606,10 +606,10 @@ 
 	protected function loadSelectTag($node)
 	{
 		$select = new TSqlMapSelect;
-		$this->setObjectPropFromNode($select,$node);
-		$this->processSqlStatement($select,$node);
+		$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);
@@ -635,9 +635,9 @@ 
 	protected function createInsertStatement($node)
 	{
 		$insert = new TSqlMapInsert;
-		$this->setObjectPropFromNode($insert,$node);
-		if(isset($node->selectKey))
-			$this->loadSelectKeyTag($insert,$node->selectKey);
+		$this->setObjectPropFromNode($insert, $node);
+		if (isset($node->selectKey))
+			$this->loadSelectKeyTag($insert, $node->selectKey);
 		return $insert;
 	}
 
@@ -648,10 +648,10 @@ 
 	protected function loadSelectKeyTag($insert, $node)
 	{
 		$selectKey = new TSqlMapSelectKey;
-		$this->setObjectPropFromNode($selectKey,$node);
+		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
-		$selectKey->setID($insert->getID().'.SelectKey');
-		$this->processSqlStatement($selectKey,$node);
+		$selectKey->setID($insert->getID() . '.SelectKey');
+		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
 		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -664,7 +664,7 @@ 
 	protected function loadUpdateTag($node)
 	{
 		$update = new TSqlMapUpdate;
-		$this->setObjectPropFromNode($update,$node);
+		$this->setObjectPropFromNode($update, $node);
 		$this->processSqlStatement($update, $node);
 		$mappedStatement = new TUpdateMappedStatement($this->_manager, $update);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -677,7 +677,7 @@ 
 	protected function loadDeleteTag($node)
 	{
 		$delete = new TSqlMapDelete;
-		$this->setObjectPropFromNode($delete,$node);
+		$this->setObjectPropFromNode($delete, $node);
 		$this->processSqlStatement($delete, $node);
 		$mappedStatement = new TDeleteMappedStatement($this->_manager, $delete);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -700,34 +700,34 @@ 
 	protected function loadCacheModel($node)
 	{
 		$cacheModel = new TSqlMapCacheModel;
-		$properties = array('id','implementation');
-		foreach($node->attributes() as $name=>$value)
+		$properties = array('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);
+		$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);
 		}
 
-		$this->loadFlushInterval($cacheModel,$node);
+		$this->loadFlushInterval($cacheModel, $node);
 
 		$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);
 	}
 
 	/**
@@ -738,26 +738,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
 			}
 		}
@@ -770,15 +770,15 @@ 
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
 	 */
-	protected function loadFlushOnCache($cacheModel,$parent,$node)
+	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
 		$id = $cacheModel->getID();
-		if(!isset($this->_FlushOnExecuteStatements[$id]))
+		if (!isset($this->_FlushOnExecuteStatements[$id]))
 			$this->_FlushOnExecuteStatements[$id] = array();
-		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;
 		}
 	}
 
@@ -787,10 +787,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 +145 added lines, -96 removed lines

@@ -51,12 +51,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());
+				}
 			}
 		}
 	}
@@ -71,13 +72,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);
+		}
 	}
 
 	/**
@@ -87,12 +90,14 @@ 
 	 */
 	protected function loadXmlDocument($filename,TSqlMapXmlConfiguration $config)
 	{
-		if( strpos($filename, '${') !== false)
-			$filename = $config->replaceProperties($filename);
+		if( strpos($filename, '${') !== false) {
+					$filename = $config->replaceProperties($filename);
+		}
 
-		if(!is_file($filename))
-			throw new TSqlMapConfigurationException(
+		if(!is_file($filename)) {
+					throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_config', $filename);
+		}
 		return simplexml_load_string($config->replaceProperties(file_get_contents($filename)));
 	}
 
@@ -109,8 +114,9 @@ 
 		foreach(array('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;
+			}
 		}
 	}
 
@@ -171,21 +177,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();
@@ -228,8 +238,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);
@@ -250,16 +261,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);
+			}
 		}
 	}
 
@@ -286,8 +299,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;
 	}
 }
@@ -346,40 +360,51 @@ 
 		$this->_document=$document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
-			$bCacheDependencies = Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		if($bCacheDependencies === null) {
+					$bCacheDependencies = 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();
 	}
@@ -398,21 +423,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);
+		}
 	}
 
 	/**
@@ -445,16 +473,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;
 	}
@@ -473,17 +503,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);
 	}
@@ -531,11 +564,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);
@@ -565,8 +599,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'];
 		}
@@ -591,9 +626,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);
@@ -609,8 +644,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);
 	}
@@ -636,8 +672,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;
 	}
 
@@ -703,8 +740,9 @@ 
 		$properties = array('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);
@@ -712,12 +750,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);
 		}
@@ -726,8 +770,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);
+		}
 	}
 
 	/**
@@ -738,7 +783,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)
 		{
@@ -773,12 +820,14 @@ 
 	protected function loadFlushOnCache($cacheModel,$parent,$node)
 	{
 		$id = $cacheModel->getID();
-		if(!isset($this->_FlushOnExecuteStatements[$id]))
-			$this->_FlushOnExecuteStatements[$id] = array();
+		if(!isset($this->_FlushOnExecuteStatements[$id])) {
+					$this->_FlushOnExecuteStatements[$id] = array();
+		}
 		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/DataMapper/TLazyLoadList.php

Doc Comments +1 added lines

@@ -116,6 +116,7 @@
 	/**
 	 * @param object handler to method calls.
 	 * @param object the object to by proxied.
+	 * @param TLazyLoadList $handler
 	 */
 	public function __construct($handler, $object)
 	{

Spacing +12 added lines, -12 removed lines

@@ -20,9 +20,9 @@ 
 {
 	private $_param;
 	private $_target;
-	private $_propertyName='';
-	private $_statement='';
-	private $_loaded=false;
+	private $_propertyName = '';
+	private $_statement = '';
+	private $_loaded = false;
 	private $_innerList;
 	private $_connection;
 
@@ -39,7 +39,7 @@ 
 		$this->_param = $param;
 		$this->_target = $target;
 		$this->_statement = $mappedStatement;
-		$this->_connection=$mappedStatement->getManager()->getDbConnection();
+		$this->_connection = $mappedStatement->getManager()->getDbConnection();
 		$this->_propertyName = $propertyName;
 	}
 
@@ -55,10 +55,10 @@ 
 	{
 		$handler = new self($mappedStatement, $param, $target, $propertyName);
 		$statement = $mappedStatement->getStatement();
-		$registry=$mappedStatement->getManager()->getTypeHandlers();
+		$registry = $mappedStatement->getManager()->getTypeHandlers();
 		$list = $statement->createInstanceOfListClass($registry);
-		if(!is_object($list))
-			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list',$statement->getID());
+		if (!is_object($list))
+			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
 		return new TObjectProxy($handler, $list);
 	}
 
@@ -77,9 +77,9 @@ 
 	 */
 	protected function fetchListData()
 	{
-		if($this->_loaded == false)
+		if ($this->_loaded == false)
 		{
-			$this->_innerList = $this->_statement->executeQueryForList($this->_connection,$this->_param);
+			$this->_innerList = $this->_statement->executeQueryForList($this->_connection, $this->_param);
 			$this->_loaded = true;
 			//replace the target property with real list
 			TPropertyAccess::set($this->_target, $this->_propertyName, $this->_innerList);
@@ -94,7 +94,7 @@ 
 	public function hasMethod($method)
 	{
 		$this->fetchListData();
-		if(is_object($this->_innerList))
+		if (is_object($this->_innerList))
 			return in_array($method, get_class_methods($this->_innerList));
 		return false;
 	}
@@ -130,9 +130,9 @@ 
 	 * @param array method arguments
 	 * @return mixed method return value.
 	 */
-	public function __call($method,$params)
+	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(array($this->_object, $method), $params);

Braces +11 added lines, -8 removed lines

@@ -57,8 +57,9 @@ 
 		$statement = $mappedStatement->getStatement();
 		$registry=$mappedStatement->getManager()->getTypeHandlers();
 		$list = $statement->createInstanceOfListClass($registry);
-		if(!is_object($list))
-			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list',$statement->getID());
+		if(!is_object($list)) {
+					throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list',$statement->getID());
+		}
 		return new TObjectProxy($handler, $list);
 	}
 
@@ -94,8 +95,9 @@ 
 	public function hasMethod($method)
 	{
 		$this->fetchListData();
-		if(is_object($this->_innerList))
-			return in_array($method, get_class_methods($this->_innerList));
+		if(is_object($this->_innerList)) {
+					return in_array($method, get_class_methods($this->_innerList));
+		}
 		return false;
 	}
 }
@@ -132,10 +134,11 @@ 
 	 */
 	public function __call($method,$params)
 	{
-		if($this->_handler->hasMethod($method))
-			return $this->_handler->intercept($method, $params);
-		else
-			return call_user_func_array(array($this->_object, $method), $params);
+		if($this->_handler->hasMethod($method)) {
+					return $this->_handler->intercept($method, $params);
+		} else {
+					return call_user_func_array(array($this->_object, $method), $params);
+		}
 	}
 }
 

framework/Data/SqlMap/DataMapper/TSqlMapCache.php

Doc Comments +10 added lines

@@ -28,6 +28,7 @@ 
 	/**
 	 * Create a new cache with limited cache size.
 	 * @param TSqlMapCacheModel $cacheModel.
+	 * @param integer $cacheModel
 	 */
 	public function __construct($cacheModel=null)
 	{
@@ -93,6 +94,7 @@ 
 class TSqlMapFifoCache extends TSqlMapCache
 {
 	/**
+	 * @param string $key
 	 * @return mixed Gets a cached object with the specified key.
 	 */
 	public function get($key)
@@ -105,6 +107,8 @@ 
 	 * The expire and dependency parameters are ignored.
 	 * @param string cache key
 	 * @param mixed value to cache.
+	 * @param string $key
+	 * @param TComponent $value
 	 */
 	public function set($key, $value,$expire=0,$dependency=null)
 	{
@@ -129,6 +133,7 @@ 
 class TSqlMapLruCache extends TSqlMapCache
 {
 	/**
+	 * @param string $key
 	 * @return mixed Gets a cached object with the specified key.
 	 */
 	public function get($key)
@@ -146,6 +151,8 @@ 
 	 * The expire and dependency parameters are ignored.
 	 * @param string the key identifying the value to be cached
 	 * @param mixed the value to be cached
+	 * @param string $key
+	 * @param TComponent $value
 	 */
 	public function set($key, $value,$expire=0,$dependency=null)
 	{
@@ -205,6 +212,9 @@ 
 		return $keyList;
 	}
 
+	/**
+	 * @param TList $keyList
+	 */
 	protected function setKeyList($keyList)
 	{
 		$this->getCache()->set($this->getKeyListId(), $keyList);

Spacing +24 added lines, -24 removed lines

@@ -29,11 +29,11 @@ 
 	 * Create a new cache with limited cache size.
 	 * @param TSqlMapCacheModel $cacheModel.
 	 */
-	public function __construct($cacheModel=null)
+	public function __construct($cacheModel = null)
 	{
 		$this->_cache = new TMap;
 		$this->_keyList = new TList;
-		$this->_cacheModel=$cacheModel;
+		$this->_cacheModel = $cacheModel;
 	}
 
 	/**
@@ -42,7 +42,7 @@ 
 	 */
 	public function setCacheSize($value)
 	{
-		$this->_cacheSize=TPropertyValue::ensureInteger($value,100);
+		$this->_cacheSize = TPropertyValue::ensureInteger($value, 100);
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	/**
 	 * @throws TSqlMapException not implemented.
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire = 0, $dependency = null)
 	{
 		throw new TSqlMapException('sqlmap_use_set_to_store_cache');
 	}
@@ -106,11 +106,11 @@ 
 	 * @param string cache key
 	 * @param mixed value to cache.
 	 */
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire = 0, $dependency = null)
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
-		if($this->_keyList->getCount() > $this->_cacheSize)
+		if ($this->_keyList->getCount() > $this->_cacheSize)
 		{
 			$oldestKey = $this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);
@@ -133,7 +133,7 @@ 
 	 */
 	public function get($key)
 	{
-		if($this->_keyList->contains($key))
+		if ($this->_keyList->contains($key))
 		{
 			$this->_keyList->remove($key);
 			$this->_keyList->add($key);
@@ -147,11 +147,11 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param mixed the value to be cached
 	 */
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire = 0, $dependency = null)
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
-		if($this->_keyList->getCount() > $this->_cacheSize)
+		if ($this->_keyList->getCount() > $this->_cacheSize)
 		{
 			$oldestKey = $this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);
@@ -169,15 +169,15 @@ 
  */
 class TSqlMapApplicationCache implements ICache
 {
-	protected $_cacheModel=null;
+	protected $_cacheModel = null;
 
 	/**
 	 * Create a new cache with limited cache size.
 	 * @param TSqlMapCacheModel $cacheModel.
 	 */
-	public function __construct($cacheModel=null)
+	public function __construct($cacheModel = null)
 	{
-		$this->_cacheModel=$cacheModel;
+		$this->_cacheModel = $cacheModel;
 	}
 
 	/**
@@ -186,9 +186,9 @@ 
 	 */
 	protected function getKeyListId()
 	{
-		$id='keyList';
+		$id = 'keyList';
 		if ($this->_cacheModel instanceof TSqlMapCacheModel)
-				$id.='_'.$this->_cacheModel->getId();
+				$id .= '_' . $this->_cacheModel->getId();
 		return $id;
 	}
 	/**
@@ -197,9 +197,9 @@ 
 	 */
 	protected function getKeyList()
 	{
-		if (($keyList=$this->getCache()->get($this->getKeyListId()))===false)
+		if (($keyList = $this->getCache()->get($this->getKeyListId())) === false)
 		{
-			$keyList=new TList();
+			$keyList = new TList();
 			$this->getCache()->set($this->getKeyListId(), $keyList);
 		}
 		return $keyList;
@@ -215,7 +215,7 @@ 
 	 */
 	public function delete($key)
 	{
-		$keyList=$this->getKeyList();
+		$keyList = $this->getKeyList();
 		$keyList->remove($key);
 		$this->getCache()->delete($key);
 		$this->setKeyList($keyList);
@@ -226,8 +226,8 @@ 
 	 */
 	public function flush()
 	{
-		$keyList=$this->getKeyList();
-		$cache=$this->getCache();
+		$keyList = $this->getKeyList();
+		$cache = $this->getCache();
 		foreach ($keyList as $key)
 		{
 			$cache->delete($key);
@@ -245,7 +245,7 @@ 
 		if ($result === false)
 		{
 			// if the key has not been found in cache (e.g expired), remove from keylist
-			$keyList=$this->getKeyList();
+			$keyList = $this->getKeyList();
 			if ($keyList->contains($key))
 			{
 				$keyList->remove($key);
@@ -260,10 +260,10 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param mixed the value to be cached
 	 */
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire = 0, $dependency = null)
 	{
-		$this->getCache()->set($key, $value, $expire,$dependency);
-		$keyList=$this->getKeyList();
+		$this->getCache()->set($key, $value, $expire, $dependency);
+		$keyList = $this->getKeyList();
 		if (!$keyList->contains($key))
 		{
 			$keyList->add($key);
@@ -282,7 +282,7 @@ 
 	/**
 	 * @throws TSqlMapException not implemented.
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire = 0, $dependency = null)
 	{
 		throw new TSqlMapException('sqlmap_use_set_to_store_cache');
 	}

Braces +3 added lines, -2 removed lines

@@ -187,8 +187,9 @@
 	protected function getKeyListId()
 	{
 		$id='keyList';
-		if ($this->_cacheModel instanceof TSqlMapCacheModel)
-				$id.='_'.$this->_cacheModel->getId();
+		if ($this->_cacheModel instanceof TSqlMapCacheModel) {
+						$id.='_'.$this->_cacheModel->getId();
+		}
 		return $id;
 	}
 	/**

framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php

Doc Comments +3 added lines

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

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
 	private $_parameter;
 	private $_prevPageList;
 	private $_nextPageList;
-	private $_delegate=null;
+	private $_delegate = null;
 
 	/**
 	 * Create a new SqlMap paged list.
@@ -41,12 +41,12 @@ 
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
 	 */
-	public function __construct(IMappedStatement $statement,$parameter, $pageSize, $delegate=null, $page=0)
+	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate = null, $page = 0)
 	{
 		parent::__construct();
 		parent::setCustomPaging(true);
-		$this->initialize($statement,$parameter, $pageSize, $page);
-		$this->_delegate=$delegate;
+		$this->initialize($statement, $parameter, $pageSize, $page);
+		$this->_delegate = $delegate;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	{
 		$total = $data instanceof TList ? $data->getCount() : count($data);
 		$pageSize = $this->getPageSize();
-		if($total < 1)
+		if ($total < 1)
 		{
 			$param->setData($data);
 			$this->_prevPageList = null;
@@ -122,10 +122,10 @@ 
 			return;
 		}
 
-		if($param->getNewPageIndex() < 1)
+		if ($param->getNewPageIndex() < 1)
 		{
 			$this->_prevPageList = null;
-			if($total <= $pageSize)
+			if ($total <= $pageSize)
 			{
 				$param->setData($data);
 				$this->_nextPageList = null;
@@ -133,18 +133,18 @@ 
 			else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize-1,$total);
+				$this->_nextPageList = array_slice($data, $pageSize - 1, $total);
 			}
 		}
 		else
 		{
-			if($total <= $pageSize)
+			if ($total <= $pageSize)
 			{
 				$this->_prevPageList = array_slice($data, 0, $total);
 				$param->setData(array());
 				$this->_nextPageList = null;
 			}
-			else if($total <= $pageSize*2)
+			else if ($total <= $pageSize * 2)
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
@@ -154,7 +154,7 @@ 
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize*2, $total-$pageSize*2);
+				$this->_nextPageList = array_slice($data, $pageSize * 2, $total - $pageSize * 2);
 			}
 		}
 	}
@@ -168,7 +168,7 @@ 
 	{
 		$index = $param->getNewPageIndex();
 		$pageSize = $this->getPageSize();
-		return $index < 1 ? array($index, $pageSize*2) : array(($index-1)*$pageSize, $pageSize*3);
+		return $index < 1 ? array($index, $pageSize * 2) : array(($index - 1) * $pageSize, $pageSize * 3);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function getIsNextPageAvailable()
 	{
-		return $this->_nextPageList!==null;
+		return $this->_nextPageList !== null;
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getIsPreviousPageAvailable()
 	{
-		return $this->_prevPageList!==null;
+		return $this->_prevPageList !== null;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return ($this->_nextPageList===null) || $this->_nextPageList->getCount() < 1;
+		return ($this->_nextPageList === null) || $this->_nextPageList->getCount() < 1;
 	}
 
 	/**

Braces +4 added lines, -8 removed lines

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

framework/Data/SqlMap/Statements/IMappedStatement.php

Doc Comments +4 added lines

@@ -40,6 +40,7 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param string The property of the result object to be used as the key.
 	 * @param string The property of the result object to be used as the value (or null)
+	 * @param TDbConnection $connection
 	 * @return TMap A map of object containing the rows keyed by <tt>$keyProperty</tt>.
 	 */
 	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null);
@@ -50,6 +51,7 @@ 
 	 * number of row effected.
 	 * @param IDbConnection database connection to execute the query
 	 * @param mixed The object used to set the parameters in the SQL.
+	 * @param TDbConnection $connection
 	 * @return integer The number of row effected.
 	 */
 	public function executeUpdate($connection, $parameter);
@@ -62,6 +64,7 @@ 
 	 * @param TList A list to populate the result with.
 	 * @param integer The number of rows to skip over.
 	 * @param integer The maximum number of rows to return.
+	 * @param TDbConnection $connection
 	 * @return TList A TList of result objects.
 	 */
 	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1);
@@ -73,6 +76,7 @@ 
 	 * @param IDbConnection database connection to execute the query
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param object The result object.
+	 * @param TDbConnection $connection
 	 * @return object result.
 	 */
 	public function executeQueryForObject($connection,$parameter, $result=null);

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param string The property of the result object to be used as the value (or null)
 	 * @return TMap A map of object containing the rows keyed by <tt>$keyProperty</tt>.
 	 */
-	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null);
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null);
 
 
 	/**
@@ -64,7 +64,7 @@ 
 	 * @param integer The maximum number of rows to return.
 	 * @return TList A TList of result objects.
 	 */
-	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1);
+	public function executeQueryForList($connection, $parameter, $result = null, $skip = -1, $max = -1);
 
 
 	/**
@@ -75,6 +75,6 @@ 
 	 * @param object The result object.
 	 * @return object result.
 	 */
-	public function executeQueryForObject($connection,$parameter, $result=null);
+	public function executeQueryForObject($connection, $parameter, $result = null);
 }
 

framework/Data/SqlMap/Statements/TCachingStatement.php

Doc Comments +4 added lines

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

Spacing +9 added lines, -9 removed lines

@@ -40,15 +40,15 @@ 
 		return $this->_mappedStatement->getManager();
 	}
 
-	public function executeQueryForMap($connection, $parameter,$keyProperty, $valueProperty=null,  $skip=-1, $max=-1,$delegate=null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null, $skip = -1, $max = -1, $delegate = null)
 	{
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);
-		$key = $this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty,$skip, $max));
+		$key = $this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty, $skip, $max));
 		$map = $this->getStatement()->getCache()->get($key);
-		if($map===null)
+		if ($map === null)
 		{
 			$map = $this->_mappedStatement->runQueryForMap(
-				$connection, $parameter, $sql, $keyProperty, $valueProperty,  $delegate);
+				$connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 			$this->getStatement()->getCache()->set($key, $map);
 		}
 		return $map;
@@ -64,12 +64,12 @@ 
 		return $this->executeInsert($connection, $parameter);
 	}
 
-	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
+	public function executeQueryForList($connection, $parameter, $result = null, $skip = -1, $max = -1, $delegate = null)
 	{
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);
 		$key = $this->getCacheKey(array(clone($sql), $parameter, $skip, $max));
 		$list = $this->getStatement()->getCache()->get($key);
-		if($list===null)
+		if ($list === null)
 		{
 			$list = $this->_mappedStatement->runQueryForList(
 				$connection, $parameter, $sql, $result, $delegate);
@@ -78,12 +78,12 @@ 
 		return $list;
 	}
 
-	public function executeQueryForObject($connection, $parameter, $result=null)
+	public function executeQueryForObject($connection, $parameter, $result = null)
 	{
 		$sql = $this->createCommand($connection, $parameter);
 		$key = $this->getCacheKey(array(clone($sql), $parameter));
 		$object = $this->getStatement()->getCache()->get($key);
-		if($object===null)
+		if ($object === null)
 		{
 			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);
 			$this->getStatement()->getCache()->set($key, $object);
@@ -97,7 +97,7 @@ 
 		return $cacheKey->getHash();
 	}
 
-	protected function createCommand($connection, $parameter, $skip=null, $max=null)
+	protected function createCommand($connection, $parameter, $skip = null, $max = null)
 	{
 		return $this->_mappedStatement->getCommand()->create($this->getManager(),
 					$connection, $this->getStatement(), $parameter, $skip, $max);

framework/Data/SqlMap/Statements/TMappedStatement.php

Doc Comments +14 added lines, -1 removed lines

@@ -84,7 +84,7 @@ 
 	}
 
 	/**
-	 * @return TSqlMapper The SqlMap used by this MappedStatement
+	 * @return TSqlMapManager The SqlMap used by this MappedStatement
 	 */
 	public function getManager()
 	{
@@ -469,6 +469,7 @@ 
 	 * @param IDbConnection database connection
 	 * @param mixed insert statement parameter
 	 * @param TSqlMapSelectKey select key statement
+	 * @param TSqlMapSelectKey $selectKey
 	 * @return string last insert ID.
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
@@ -569,6 +570,7 @@ 
 	 * @param string result object class name
 	 * @param array a result set row retrieved from the database
 	 * @param object the result object, will create if necessary.
+	 * @param string $resultClass
 	 * @return object result object filled with data
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
@@ -591,6 +593,7 @@ 
 	 * Apply the result to a TList or an array.
 	 * @param array a result set row retrieved from the database
 	 * @param object result object, array or list
+	 * @param ArrayAccess $resultObject
 	 * @return object result filled with data.
 	 */
 	protected function fillResultArrayList($row, $resultObject)
@@ -633,6 +636,7 @@ 
 	 * @param string result map name.
 	 * @param array a result set row retrieved from the database
 	 * @param object result object to fill, will create new instances if required.
+	 * @param string $parentGroup
 	 * @return object result object filled with data.
 	 */
 	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
@@ -772,6 +776,7 @@ 
 	 * Converts the first array value to scalar value of given type.
 	 * @param array list of results
 	 * @param string scalar type.
+	 * @param string $type
 	 * @return mixed scalar value.
 	 */
 	protected function getScalarResult($result, $type)
@@ -961,6 +966,10 @@ 
 	public function setKeys($value){ $this->_keys = $value; }
 
 	public function getMethod(){ return $this->_method; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setMethod($value){ $this->_method = $value; }
 }
 
@@ -1003,6 +1012,7 @@ 
 	 * @param string parent node id
 	 * @param string new node id
 	 * @param mixed node value
+	 * @param string $node
 	 */
 	public function add($parent, $node, $object='')
 	{
@@ -1168,6 +1178,9 @@ 
 	private $_parameterObject;
 	private $_list;
 
+	/**
+	 * @param ArrayAccess $list
+	 */
 	public function __construct($result, $parameter, &$list)
 	{
 		$this->_resultObject = $result;

Spacing +147 added lines, -150 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * @var TPostSelectBinding[] post select statement queue.
 	 */
-	private $_selectQueue=array();
+	private $_selectQueue = array();
 
 	/**
 	 * @var boolean true when data is mapped to a particular row.
@@ -161,11 +161,11 @@ 
 	 */
 	protected function executeSQLQueryLimit($connection, $command, $max, $skip)
 	{
-		if($max>-1 || $skip > -1)
+		if ($max > -1 || $skip > -1)
 		{
-			$maxStr=$max>0?' LIMIT '.$max:'';
-			$skipStr=$skip>0?' OFFSET '.$skip:'';
-			$command->setText($command->getText().$maxStr.$skipStr);
+			$maxStr = $max > 0 ? ' LIMIT ' . $max : '';
+			$skipStr = $skip > 0 ? ' OFFSET ' . $skip : '';
+			$command->setText($command->getText() . $maxStr . $skipStr);
 		}
 		$connection->setActive(true);
 		return $command->query();
@@ -199,9 +199,9 @@ 
 	 * @param callback row delegate handler
 	 * @see executeQueryForList()
 	 */
-	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
+	public function executeQueryForList($connection, $parameter, $result = null, $skip = -1, $max = -1, $delegate = null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter,$skip,$max);
+		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForList($connection, $parameter, $sql, $result, $delegate);
 	}
 
@@ -221,17 +221,16 @@ 
 	 * @return array a list of result objects
 	 * @see executeQueryForList()
 	 */
-	public function runQueryForList($connection, $parameter, $sql, $result, $delegate=null)
+	public function runQueryForList($connection, $parameter, $sql, $result, $delegate = null)
 	{
-		$registry=$this->getManager()->getTypeHandlers();
-		$list = $result instanceof ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$registry = $this->getManager()->getTypeHandlers();
+		$list = $result instanceof ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
 		$reader = $sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
-		if($delegate!==null)
+		if ($delegate !== null)
 		{
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
@@ -241,14 +240,14 @@ 
 		else
 		{
 			//var_dump($sql,$parameter);
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 //				var_dump($row);
 				$list[] = $this->applyResultMap($row);
 			}
 		}
 
-		if(!$this->_groupBy->isEmpty())
+		if (!$this->_groupBy->isEmpty())
 		{
 			$list = $this->_groupBy->collect();
 			$this->initialGroupByResults();
@@ -272,7 +271,7 @@ 
 	 * @param callback row delegate handler
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 */
-	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null,  $skip=-1, $max=-1, $delegate=null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null, $skip = -1, $max = -1, $delegate = null)
 	{
 		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForMap($connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
@@ -296,21 +295,20 @@ 
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 * @see executeQueryForMap()
 	 */
-	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty=null, $delegate=null)
+	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty = null, $delegate = null)
 	{
 		$map = array();
 		//$recordSet = $this->executeSQLQuery($connection, $sql);
 		$connection->setActive(true);
 		$reader = $command->query();
-		if($delegate!==null)
+		if ($delegate !== null)
 		{
 			//while($row = $recordSet->fetchRow())
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty===null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
+				$value = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
@@ -318,12 +316,11 @@ 
 		else
 		{
 			//while($row = $recordSet->fetchRow())
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty===null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$map[$key] = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -338,24 +335,24 @@ 
 	 */
 	protected function raiseRowDelegate($handler, $param)
 	{
-		if(is_string($handler))
+		if (is_string($handler))
 		{
-			call_user_func($handler,$this,$param);
+			call_user_func($handler, $this, $param);
 		}
-		else if(is_callable($handler,true))
+		else if (is_callable($handler, true))
 		{
 			// an array: 0 - object, 1 - method name/path
-			list($object,$method)=$handler;
-			if(is_string($object))	// static method call
-				call_user_func($handler,$this,$param);
+			list($object, $method) = $handler;
+			if (is_string($object))	// static method call
+				call_user_func($handler, $this, $param);
 			else
 			{
-				if(($pos=strrpos($method,'.'))!==false)
+				if (($pos = strrpos($method, '.')) !== false)
 				{
-					$object=$this->getSubProperty(substr($method,0,$pos));
-					$method=substr($method,$pos+1);
+					$object = $this->getSubProperty(substr($method, 0, $pos));
+					$method = substr($method, $pos + 1);
 				}
-				$object->$method($this,$param);
+				$object->$method($this, $param);
 			}
 		}
 		else
@@ -370,7 +367,7 @@ 
 	 * @param mixed The result object.
 	 * @return ${return}
 	 */
-	public function executeQueryForObject($connection, $parameter, $result=null)
+	public function executeQueryForObject($connection, $parameter, $result = null)
 	{
 		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 		return $this->runQueryForObject($connection, $sql, $result);
@@ -393,10 +390,10 @@ 
 	{
 		$object = null;
 		$connection->setActive(true);
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 			$object = $this->applyResultMap($row, $result);
 
-		if(!$this->_groupBy->isEmpty())
+		if (!$this->_groupBy->isEmpty())
 		{
 			$list = $this->_groupBy->collect();
 			$this->initialGroupByResults();
@@ -424,7 +421,7 @@ 
 //		var_dump($command,$parameter);
 		$result = $command->execute();
 
-		if($generatedKey===null)
+		if ($generatedKey === null)
 			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
 
 		$this->executePostSelect($connection);
@@ -440,10 +437,10 @@ 
 	 */
 	protected function getPreGeneratedSelectKey($connection, $parameter)
 	{
-		if($this->_statement instanceof TSqlMapInsert)
+		if ($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey!==null) && !$selectKey->getIsAfter())
+			if (($selectKey !== null) && !$selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -456,10 +453,10 @@ 
 	 */
 	protected function getPostGeneratedSelectKey($connection, $parameter)
 	{
-		if($this->_statement instanceof TSqlMapInsert)
+		if ($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey!==null) && $selectKey->getIsAfter())
+			if (($selectKey !== null) && $selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -476,7 +473,7 @@ 
 		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
 		$generatedKey = $mappedStatement->executeQueryForObject(
 									$connection, $parameter, null);
-		if(strlen($prop = $selectKey->getProperty()) > 0)
+		if (strlen($prop = $selectKey->getProperty()) > 0)
 				TPropertyAccess::set($parameter, $prop, $generatedKey);
 		return $generatedKey;
 	}
@@ -490,7 +487,7 @@ 
 	 */
 	public function executeUpdate($connection, $parameter)
 	{
-		$sql = $this->_command->create($this->getManager(),$connection, $this->_statement, $parameter);
+		$sql = $this->_command->create($this->getManager(), $connection, $this->_statement, $parameter);
 		$affectedRows = $sql->execute();
 		//$this->executeSQLQuery($connection, $sql);
 		$this->executePostSelect($connection);
@@ -504,7 +501,7 @@ 
 	 */
 	protected function executePostSelect($connection)
 	{
-		while(count($this->_selectQueue))
+		while (count($this->_selectQueue))
 		{
 			$postSelect = array_shift($this->_selectQueue);
 			$method = $postSelect->getMethod();
@@ -513,15 +510,15 @@ 
 			$keys = $postSelect->getKeys();
 			$resultObject = $postSelect->getResultObject();
 
-			if($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
+			if ($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
 			{
 				$values = $statement->executeQueryForList($connection, $keys, null);
 
-				if($method == self::QUERY_FOR_ARRAY)
+				if ($method == self::QUERY_FOR_ARRAY)
 					$values = $values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
 			}
-			else if($method == self::QUERY_FOR_OBJECT)
+			else if ($method == self::QUERY_FOR_OBJECT)
 			{
 				$value = $statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -544,23 +541,23 @@ 
 	 * @param object the result object, will create if necessary.
 	 * @return object the result filled with data, null if not filled.
 	 */
-	protected function applyResultMap($row, &$resultObject=null)
+	protected function applyResultMap($row, &$resultObject = null)
 	{
-		if($row === false) return null;
+		if ($row === false) return null;
 
 		$resultMapName = $this->_statement->getResultMap();
 		$resultClass = $this->_statement->getResultClass();
 
-		$obj=null;
-		if($this->getManager()->getResultMaps()->contains($resultMapName))
+		$obj = null;
+		if ($this->getManager()->getResultMaps()->contains($resultMapName))
 			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
-		else if(strlen($resultClass) > 0)
+		else if (strlen($resultClass) > 0)
 			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
 		else
 			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord)
+		if (class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
 			//Create a new clean active record.
-			$obj=TActiveRecord::createRecord(get_class($obj),$obj);
+			$obj = TActiveRecord::createRecord(get_class($obj), $obj);
 		return $obj;
 	}
 
@@ -573,15 +570,15 @@ 
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
 	{
-		if($resultObject===null)
+		if ($resultObject === null)
 		{
 			$registry = $this->getManager()->getTypeHandlers();
-			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);
+			$resultObject = $this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
-		if($resultObject instanceOf ArrayAccess)
+		if ($resultObject instanceOf ArrayAccess)
 			return $this->fillResultArrayList($row, $resultObject);
-		else if(is_object($resultObject))
+		else if (is_object($resultObject))
 			return $this->fillResultObjectProperty($row, $resultObject);
 		else
 			return $this->fillDefaultResultMap(null, $row, $resultObject);
@@ -595,11 +592,11 @@ 
 	 */
 	protected function fillResultArrayList($row, $resultObject)
 	{
-		if($resultObject instanceof TList)
-			foreach($row as $v)
+		if ($resultObject instanceof TList)
+			foreach ($row as $v)
 				$resultObject[] = $v;
 		else
-			foreach($row as $k => $v)
+			foreach ($row as $k => $v)
 				$resultObject[$k] = $v;
 		return $resultObject;
 	}
@@ -613,17 +610,17 @@ 
 	protected function fillResultObjectProperty($row, $resultObject)
 	{
 		$index = 0;
-		$registry=$this->getManager()->getTypeHandlers();
-		foreach($row as $k=>$v)
+		$registry = $this->getManager()->getTypeHandlers();
+		foreach ($row as $k=>$v)
 		{
 			$property = new TResultProperty;
-			if(is_string($k) && strlen($k) > 0)
+			if (is_string($k) && strlen($k) > 0)
 				$property->setColumn($k);
 			$property->setColumnIndex(++$index);
-			$type = gettype(TPropertyAccess::get($resultObject,$k));
+			$type = gettype(TPropertyAccess::get($resultObject, $k));
 			$property->setType($type);
-			$value = $property->getPropertyValue($registry,$row);
-			TPropertyAccess::set($resultObject, $k,$value);
+			$value = $property->getPropertyValue($registry, $row);
+			TPropertyAccess::set($resultObject, $k, $value);
 		}
 		return $resultObject;
 	}
@@ -635,21 +632,21 @@ 
 	 * @param object result object to fill, will create new instances if required.
 	 * @return object result object filled with data.
 	 */
-	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
+	protected function fillResultMap($resultMapName, $row, $parentGroup = null, &$resultObject = null)
 	{
 		$resultMap = $this->getManager()->getResultMap($resultMapName);
 		$registry = $this->getManager()->getTypeHandlers();
-		$resultMap = $resultMap->resolveSubMap($registry,$row);
+		$resultMap = $resultMap->resolveSubMap($registry, $row);
 
-		if($resultObject===null)
+		if ($resultObject === null)
 			$resultObject = $resultMap->createInstanceOfResult($registry);
 
-		if(is_object($resultObject))
+		if (is_object($resultObject))
 		{
-			if(strlen($resultMap->getGroupBy()) > 0)
+			if (strlen($resultMap->getGroupBy()) > 0)
 				return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
 			else
-				foreach($resultMap->getColumns() as $property)
+				foreach ($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
 		}
 		else
@@ -671,26 +668,26 @@ 
 	{
 		$group = $this->getResultMapGroupKey($resultMap, $row);
 
-		if(empty($parent))
+		if (empty($parent))
 		{
 			$rootObject = array('object'=>$resultObject, 'property' => null);
 			$this->_groupBy->add(null, $group, $rootObject);
 		}
 
-		foreach($resultMap->getColumns() as $property)
+		foreach ($resultMap->getColumns() as $property)
 		{
 			//set properties.
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
 			$nested = $property->getResultMapping();
 
 			//nested property
-			if($this->getManager()->getResultMaps()->contains($nested))
+			if ($this->getManager()->getResultMaps()->contains($nested))
 			{
 				$nestedMap = $this->getManager()->getResultMap($nested);
 				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
-				if(empty($parent))
+				if (empty($parent))
 					$this->_groupBy->add($group, $groupKey, '');
 
 				//get the nested result mapping value
@@ -698,7 +695,7 @@ 
 
 				//add it to the object tree graph
 				$groupObject = array('object'=>$value, 'property' => $property->getProperty());
-				if(empty($parent))
+				if (empty($parent))
 					$this->_groupBy->add($group, $groupKey, $groupObject);
 				else
 					$this->_groupBy->add($parent, $groupKey, $groupObject);
@@ -716,10 +713,10 @@ 
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
 		$groupBy = $resultMap->getGroupBy();
-		if(isset($row[$groupBy]))
-			return $resultMap->getID().$row[$groupBy];
+		if (isset($row[$groupBy]))
+			return $resultMap->getID() . $row[$groupBy];
 		else
-			return $resultMap->getID().crc32(serialize($row));
+			return $resultMap->getID() . crc32(serialize($row));
 	}
 
 	/**
@@ -732,16 +729,16 @@ 
 	 */
 	protected function fillDefaultResultMap($resultMap, $row, $resultObject)
 	{
-		if($resultObject===null)
-			$resultObject='';
+		if ($resultObject === null)
+			$resultObject = '';
 
-		if($resultMap!==null)
+		if ($resultMap !== null)
 			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
 		else
 			$result = $row;
 
 		//if scalar result types
-		if(count($result) == 1 && ($type = gettype($resultObject))!= 'array')
+		if (count($result) == 1 && ($type = gettype($resultObject)) != 'array')
 			return $this->getScalarResult($result, $type);
 		else
 			return $result;
@@ -757,13 +754,13 @@ 
 	protected function fillArrayResultMap($resultMap, $row, $resultObject)
 	{
 		$result = array();
-		$registry=$this->getManager()->getTypeHandlers();
-		foreach($resultMap->getColumns() as $column)
+		$registry = $this->getManager()->getTypeHandlers();
+		foreach ($resultMap->getColumns() as $column)
 		{
-			if(($column->getType()===null)
-				&& ($resultObject!==null) && !is_object($resultObject))
+			if (($column->getType() === null)
+				&& ($resultObject !== null) && !is_object($resultObject))
 			$column->setType(gettype($resultObject));
-			$result[$column->getProperty()] = $column->getPropertyValue($registry,$row);
+			$result[$column->getProperty()] = $column->getPropertyValue($registry, $row);
 		}
 		return $result;
 	}
@@ -793,26 +790,26 @@ 
 		$select = $property->getSelect();
 		$key = $property->getProperty();
 		$nested = $property->getNestedResultMap();
-		$registry=$this->getManager()->getTypeHandlers();
-		if($key === '')
+		$registry = $this->getManager()->getTypeHandlers();
+		if ($key === '')
 		{
-			$resultObject = $property->getPropertyValue($registry,$row);
+			$resultObject = $property->getPropertyValue($registry, $row);
 		}
-		else if(strlen($select) == 0 && ($nested===null))
+		else if (strlen($select) == 0 && ($nested === null))
 		{
-			$value = $property->getPropertyValue($registry,$row);
+			$value = $property->getPropertyValue($registry, $row);
 
 			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
-			if(is_array($resultObject) || is_object($resultObject))
+			if (is_array($resultObject) || is_object($resultObject))
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
 		}
-		else if($nested!==null)
+		else if ($nested !== null)
 		{
-			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
+			if ($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
-				if(strlen($resultMap->getGroupBy()) <= 0)
+				if (strlen($resultMap->getGroupBy()) <= 0)
 					throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
@@ -820,7 +817,7 @@ 
 			else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
+				if ($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
 					$obj = null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
@@ -849,10 +846,10 @@ 
 		$postSelect->setResultProperty($property);
 		$postSelect->setKeys($key);
 
-		if($property->instanceOfListType($resultObject))
+		if ($property->instanceOfListType($resultObject))
 		{
 			$values = null;
-			if($property->getLazyLoad())
+			if ($property->getLazyLoad())
 			{
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
@@ -861,12 +858,12 @@ 
 			else
 				$postSelect->setMethod(self::QUERY_FOR_LIST);
 		}
-		else if($property->instanceOfArrayType($resultObject))
+		else if ($property->instanceOfArrayType($resultObject))
 			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
 		else
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
-		if(!$property->getLazyLoad())
+		if (!$property->getLazyLoad())
 			$this->_selectQueue[] = $postSelect;
 	}
 
@@ -877,23 +874,23 @@ 
 	 * @param array current row data.
 	 * @return array list of primary key values.
 	 */
-	protected function getPostSelectKeys($resultMap, $property,$row)
+	protected function getPostSelectKeys($resultMap, $property, $row)
 	{
 		$value = $property->getColumn();
-		if(is_int(strpos($value.',',0)) || is_int(strpos($value, '=',0)))
+		if (is_int(strpos($value . ',', 0)) || is_int(strpos($value, '=', 0)))
 		{
 			$keys = array();
-			foreach(explode(',', $value) as $entry)
+			foreach (explode(',', $value) as $entry)
 			{
-				$pair =explode('=',$entry);
+				$pair = explode('=', $entry);
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
 		}
 		else
 		{
-			$registry=$this->getManager()->getTypeHandlers();
-			return $property->getPropertyValue($registry,$row);
+			$registry = $this->getManager()->getTypeHandlers();
+			return $property->getPropertyValue($registry, $row);
 		}
 	}
 
@@ -907,7 +904,7 @@ 
 	protected function fillPropertyWithResultMap($resultMap, $row, &$resultObject)
 	{
 		$dataFound = false;
-		foreach($resultMap->getColumns() as $property)
+		foreach ($resultMap->getColumns() as $property)
 		{
 			$this->_IsRowDataFound = false;
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
@@ -929,7 +926,7 @@ 
 		if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
 		if (is_null($this->_groupBy)) $exprops[] = "\0$cn\0_groupBy";
 		if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
-		return array_diff(parent::__sleep(),$exprops);
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 
@@ -942,26 +939,26 @@ 
  */
 class TPostSelectBinding
 {
-	private $_statement=null;
-	private $_property=null;
-	private $_resultObject=null;
-	private $_keys=null;
-	private $_method=TMappedStatement::QUERY_FOR_LIST;
+	private $_statement = null;
+	private $_property = null;
+	private $_resultObject = null;
+	private $_keys = null;
+	private $_method = TMappedStatement::QUERY_FOR_LIST;
 
-	public function getStatement(){ return $this->_statement; }
-	public function setStatement($value){ $this->_statement = $value; }
+	public function getStatement() { return $this->_statement; }
+	public function setStatement($value) { $this->_statement = $value; }
 
-	public function getResultProperty(){ return $this->_property; }
-	public function setResultProperty($value){ $this->_property = $value; }
+	public function getResultProperty() { return $this->_property; }
+	public function setResultProperty($value) { $this->_property = $value; }
 
-	public function getResultObject(){ return $this->_resultObject; }
-	public function setResultObject($value){ $this->_resultObject = $value; }
+	public function getResultObject() { return $this->_resultObject; }
+	public function setResultObject($value) { $this->_resultObject = $value; }
 
-	public function getKeys(){ return $this->_keys; }
-	public function setKeys($value){ $this->_keys = $value; }
+	public function getKeys() { return $this->_keys; }
+	public function setKeys($value) { $this->_keys = $value; }
 
-	public function getMethod(){ return $this->_method; }
-	public function setMethod($value){ $this->_method = $value; }
+	public function getMethod() { return $this->_method; }
+	public function setMethod($value) { $this->_method = $value; }
 }
 
 /**
@@ -1004,26 +1001,26 @@ 
 	 * @param string new node id
 	 * @param mixed node value
 	 */
-	public function add($parent, $node, $object='')
+	public function add($parent, $node, $object = '')
 	{
-		if(isset($this->_entries[$parent]) && ($this->_entries[$parent]!==null)
-			&& isset($this->_entries[$node]) && ($this->_entries[$node]!==null))
+		if (isset($this->_entries[$parent]) && ($this->_entries[$parent] !== null)
+			&& isset($this->_entries[$node]) && ($this->_entries[$node] !== null))
 		{
 			$this->_entries[$node] = $object;
 			return;
 		}
 		$this->_entries[$node] = $object;
-		if(empty($parent))
+		if (empty($parent))
 		{
-			if(isset($this->_entries[$node]))
+			if (isset($this->_entries[$node]))
 				return;
 			$this->_tree[$node] = array();
 		}
 		$found = $this->addNode($this->_tree, $parent, $node);
-		if(!$found && !empty($parent))
+		if (!$found && !empty($parent))
 		{
 			$this->_tree[$parent] = array();
-			if(!isset($this->_entries[$parent]) || $object !== '')
+			if (!isset($this->_entries[$parent]) || $object !== '')
 				$this->_entries[$parent] = $object;
 			$this->addNode($this->_tree, $parent, $node);
 		}
@@ -1040,11 +1037,11 @@ 
 	{
 		$found = false;
 		reset($childs);
-		for($i = 0, $k = count($childs); $i < $k; $i++)
+		for ($i = 0, $k = count($childs); $i < $k; $i++)
 		{
 			$key = key($childs);
 			next($childs);
-			if($key == $parent)
+			if ($key == $parent)
 			{
 				$found = true;
 				$childs[$key][$node] = array();
@@ -1062,7 +1059,7 @@ 
 	 */
 	public function collect()
 	{
-		while(count($this->_tree) > 0)
+		while (count($this->_tree) > 0)
 			$this->collectChildren(null, $this->_tree);
 		return $this->getCollection();
 	}
@@ -1074,8 +1071,8 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach($nodes as $node)
-			if(count($node) != 0)
+		foreach ($nodes as $node)
+			if (count($node) != 0)
 				return true;
 		return $hasChildren;
 	}
@@ -1089,10 +1086,10 @@ 
 	{
 		$noChildren = !$this->hasChildren($nodes);
 		$childs = array();
-		for(reset($nodes); $key = key($nodes);)
+		for (reset($nodes); $key = key($nodes);)
 		{
 			next($nodes);
-			if($noChildren)
+			if ($noChildren)
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
@@ -1100,7 +1097,7 @@ 
 			else
 				$this->collectChildren($key, $nodes[$key]);
 		}
-		if(count($childs) > 0)
+		if (count($childs) > 0)
 			$this->onChildNodesVisited($parent, $childs);
 	}
 
@@ -1111,7 +1108,7 @@ 
 	 */
 	protected function onChildNodesVisited($parent, $nodes)
 	{
-		if(empty($parent) || empty($this->_entries[$parent]))
+		if (empty($parent) || empty($this->_entries[$parent]))
 			return;
 
 		$parentObject = $this->_entries[$parent]['object'];
@@ -1119,21 +1116,21 @@ 
 
 		$list = TPropertyAccess::get($parentObject, $property);
 
-		foreach($nodes as $node)
+		foreach ($nodes as $node)
 		{
-			if($list instanceof TList)
+			if ($list instanceof TList)
 				$parentObject->{$property}[] = $this->_entries[$node]['object'];
-			else if(is_array($list))
+			else if (is_array($list))
 				$list[] = $this->_entries[$node]['object'];
 			else
 				throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
 		}
 
-		if(is_array($list))
+		if (is_array($list))
 			TPropertyAccess::set($parentObject, $property, $list);
 
-		if($this->_entries[$parent]['property'] === null)
+		if ($this->_entries[$parent]['property'] === null)
 			$this->_list[] = $parentObject;
 	}
 
@@ -1151,7 +1148,7 @@ 
 		if (!count($this->_tree)) $exprops[] = "\0$cn\0_tree";
 		if (!count($this->_entries)) $exprops[] = "\0$cn\0_entries";
 		if (!count($this->_list)) $exprops[] = "\0$cn\0_list";
-		return array_diff(parent::__sleep(),$exprops);
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

Braces +173 added lines, -134 removed lines

@@ -237,8 +237,7 @@ 
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//var_dump($sql,$parameter);
 			foreach($reader as $row)
@@ -314,8 +313,7 @@ 
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
@@ -341,14 +339,14 @@ 
 		if(is_string($handler))
 		{
 			call_user_func($handler,$this,$param);
-		}
-		else if(is_callable($handler,true))
+		} else if(is_callable($handler,true))
 		{
 			// an array: 0 - object, 1 - method name/path
 			list($object,$method)=$handler;
-			if(is_string($object))	// static method call
+			if(is_string($object)) {
+				// static method call
 				call_user_func($handler,$this,$param);
-			else
+			} else
 			{
 				if(($pos=strrpos($method,'.'))!==false)
 				{
@@ -357,9 +355,9 @@ 
 				}
 				$object->$method($this,$param);
 			}
+		} else {
+					throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 		}
-		else
-			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
 	/**
@@ -393,8 +391,9 @@ 
 	{
 		$object = null;
 		$connection->setActive(true);
-		foreach($command->query() as $row)
-			$object = $this->applyResultMap($row, $result);
+		foreach($command->query() as $row) {
+					$object = $this->applyResultMap($row, $result);
+		}
 
 		if(!$this->_groupBy->isEmpty())
 		{
@@ -424,8 +423,9 @@ 
 //		var_dump($command,$parameter);
 		$result = $command->execute();
 
-		if($generatedKey===null)
-			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
+		if($generatedKey===null) {
+					$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
+		}
 
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($command);
@@ -443,8 +443,9 @@ 
 		if($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey!==null) && !$selectKey->getIsAfter())
-				return $this->executeSelectKey($connection, $parameter, $selectKey);
+			if(($selectKey!==null) && !$selectKey->getIsAfter()) {
+							return $this->executeSelectKey($connection, $parameter, $selectKey);
+			}
 		}
 	}
 
@@ -459,8 +460,9 @@ 
 		if($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey!==null) && $selectKey->getIsAfter())
-				return $this->executeSelectKey($connection, $parameter, $selectKey);
+			if(($selectKey!==null) && $selectKey->getIsAfter()) {
+							return $this->executeSelectKey($connection, $parameter, $selectKey);
+			}
 		}
 	}
 
@@ -476,8 +478,9 @@ 
 		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
 		$generatedKey = $mappedStatement->executeQueryForObject(
 									$connection, $parameter, null);
-		if(strlen($prop = $selectKey->getProperty()) > 0)
-				TPropertyAccess::set($parameter, $prop, $generatedKey);
+		if(strlen($prop = $selectKey->getProperty()) > 0) {
+						TPropertyAccess::set($parameter, $prop, $generatedKey);
+		}
 		return $generatedKey;
 	}
 
@@ -517,11 +520,11 @@ 
 			{
 				$values = $statement->executeQueryForList($connection, $keys, null);
 
-				if($method == self::QUERY_FOR_ARRAY)
-					$values = $values->toArray();
+				if($method == self::QUERY_FOR_ARRAY) {
+									$values = $values->toArray();
+				}
 				TPropertyAccess::set($resultObject, $property, $values);
-			}
-			else if($method == self::QUERY_FOR_OBJECT)
+			} else if($method == self::QUERY_FOR_OBJECT)
 			{
 				$value = $statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -546,21 +549,25 @@ 
 	 */
 	protected function applyResultMap($row, &$resultObject=null)
 	{
-		if($row === false) return null;
+		if($row === false) {
+			return null;
+		}
 
 		$resultMapName = $this->_statement->getResultMap();
 		$resultClass = $this->_statement->getResultClass();
 
 		$obj=null;
-		if($this->getManager()->getResultMaps()->contains($resultMapName))
-			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
-		else if(strlen($resultClass) > 0)
-			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
-		else
-			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord)
-			//Create a new clean active record.
+		if($this->getManager()->getResultMaps()->contains($resultMapName)) {
+					$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
+		} else if(strlen($resultClass) > 0) {
+					$obj = $this->fillResultClass($resultClass, $row, $resultObject);
+		} else {
+					$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
+		}
+		if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord) {
+					//Create a new clean active record.
 			$obj=TActiveRecord::createRecord(get_class($obj),$obj);
+		}
 		return $obj;
 	}
 
@@ -579,12 +586,13 @@ 
 			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);
 		}
 
-		if($resultObject instanceOf ArrayAccess)
-			return $this->fillResultArrayList($row, $resultObject);
-		else if(is_object($resultObject))
-			return $this->fillResultObjectProperty($row, $resultObject);
-		else
-			return $this->fillDefaultResultMap(null, $row, $resultObject);
+		if($resultObject instanceOf ArrayAccess) {
+					return $this->fillResultArrayList($row, $resultObject);
+		} else if(is_object($resultObject)) {
+					return $this->fillResultObjectProperty($row, $resultObject);
+		} else {
+					return $this->fillDefaultResultMap(null, $row, $resultObject);
+		}
 	}
 
 	/**
@@ -595,12 +603,13 @@ 
 	 */
 	protected function fillResultArrayList($row, $resultObject)
 	{
-		if($resultObject instanceof TList)
-			foreach($row as $v)
+		if($resultObject instanceof TList) {
+					foreach($row as $v)
 				$resultObject[] = $v;
-		else
-			foreach($row as $k => $v)
+		} else {
+					foreach($row as $k => $v)
 				$resultObject[$k] = $v;
+		}
 		return $resultObject;
 	}
 
@@ -617,8 +626,9 @@ 
 		foreach($row as $k=>$v)
 		{
 			$property = new TResultProperty;
-			if(is_string($k) && strlen($k) > 0)
-				$property->setColumn($k);
+			if(is_string($k) && strlen($k) > 0) {
+							$property->setColumn($k);
+			}
 			$property->setColumnIndex(++$index);
 			$type = gettype(TPropertyAccess::get($resultObject,$k));
 			$property->setType($type);
@@ -641,18 +651,19 @@ 
 		$registry = $this->getManager()->getTypeHandlers();
 		$resultMap = $resultMap->resolveSubMap($registry,$row);
 
-		if($resultObject===null)
-			$resultObject = $resultMap->createInstanceOfResult($registry);
+		if($resultObject===null) {
+					$resultObject = $resultMap->createInstanceOfResult($registry);
+		}
 
 		if(is_object($resultObject))
 		{
-			if(strlen($resultMap->getGroupBy()) > 0)
-				return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
-			else
-				foreach($resultMap->getColumns() as $property)
+			if(strlen($resultMap->getGroupBy()) > 0) {
+							return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
+			} else {
+							foreach($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+			}
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -690,18 +701,20 @@ 
 				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
-				if(empty($parent))
-					$this->_groupBy->add($group, $groupKey, '');
+				if(empty($parent)) {
+									$this->_groupBy->add($group, $groupKey, '');
+				}
 
 				//get the nested result mapping value
 				$value = $this->fillResultMap($nested, $row, $groupKey);
 
 				//add it to the object tree graph
 				$groupObject = array('object'=>$value, 'property' => $property->getProperty());
-				if(empty($parent))
-					$this->_groupBy->add($group, $groupKey, $groupObject);
-				else
-					$this->_groupBy->add($parent, $groupKey, $groupObject);
+				if(empty($parent)) {
+									$this->_groupBy->add($group, $groupKey, $groupObject);
+				} else {
+									$this->_groupBy->add($parent, $groupKey, $groupObject);
+				}
 			}
 		}
 		return $resultObject;
@@ -716,10 +729,11 @@ 
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
 		$groupBy = $resultMap->getGroupBy();
-		if(isset($row[$groupBy]))
-			return $resultMap->getID().$row[$groupBy];
-		else
-			return $resultMap->getID().crc32(serialize($row));
+		if(isset($row[$groupBy])) {
+					return $resultMap->getID().$row[$groupBy];
+		} else {
+					return $resultMap->getID().crc32(serialize($row));
+		}
 	}
 
 	/**
@@ -732,19 +746,22 @@ 
 	 */
 	protected function fillDefaultResultMap($resultMap, $row, $resultObject)
 	{
-		if($resultObject===null)
-			$resultObject='';
+		if($resultObject===null) {
+					$resultObject='';
+		}
 
-		if($resultMap!==null)
-			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
-		else
-			$result = $row;
+		if($resultMap!==null) {
+					$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
+		} else {
+					$result = $row;
+		}
 
 		//if scalar result types
-		if(count($result) == 1 && ($type = gettype($resultObject))!= 'array')
-			return $this->getScalarResult($result, $type);
-		else
-			return $result;
+		if(count($result) == 1 && ($type = gettype($resultObject))!= 'array') {
+					return $this->getScalarResult($result, $type);
+		} else {
+					return $result;
+		}
 	}
 
 	/**
@@ -761,8 +778,9 @@ 
 		foreach($resultMap->getColumns() as $column)
 		{
 			if(($column->getType()===null)
-				&& ($resultObject!==null) && !is_object($resultObject))
-			$column->setType(gettype($resultObject));
+				&& ($resultObject!==null) && !is_object($resultObject)) {
+						$column->setType(gettype($resultObject));
+			}
 			$result[$column->getProperty()] = $column->getPropertyValue($registry,$row);
 		}
 		return $result;
@@ -797,35 +815,34 @@ 
 		if($key === '')
 		{
 			$resultObject = $property->getPropertyValue($registry,$row);
-		}
-		else if(strlen($select) == 0 && ($nested===null))
+		} else if(strlen($select) == 0 && ($nested===null))
 		{
 			$value = $property->getPropertyValue($registry,$row);
 
 			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
-			if(is_array($resultObject) || is_object($resultObject))
-				TPropertyAccess::set($resultObject, $key, $value);
-			else
-				$resultObject = $value;
-		}
-		else if($nested!==null)
+			if(is_array($resultObject) || is_object($resultObject)) {
+							TPropertyAccess::set($resultObject, $key, $value);
+			} else {
+							$resultObject = $value;
+			}
+		} else if($nested!==null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
-				if(strlen($resultMap->getGroupBy()) <= 0)
-					throw new TSqlMapExecutionException(
+				if(strlen($resultMap->getGroupBy()) <= 0) {
+									throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
-			}
-			else
+				}
+			} else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
-					$obj = null;
+				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false) {
+									$obj = null;
+				}
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
-		}
-		else //'select' ResultProperty
+		} else //'select' ResultProperty
 		{
 			$this->enquequePostSelect($select, $resultMap, $property, $row, $resultObject);
 		}
@@ -857,17 +874,18 @@ 
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
+			} else {
+							$postSelect->setMethod(self::QUERY_FOR_LIST);
 			}
-			else
-				$postSelect->setMethod(self::QUERY_FOR_LIST);
+		} else if($property->instanceOfArrayType($resultObject)) {
+					$postSelect->setMethod(self::QUERY_FOR_ARRAY);
+		} else {
+					$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 		}
-		else if($property->instanceOfArrayType($resultObject))
-			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
-		else
-			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
-		if(!$property->getLazyLoad())
-			$this->_selectQueue[] = $postSelect;
+		if(!$property->getLazyLoad()) {
+					$this->_selectQueue[] = $postSelect;
+		}
 	}
 
 	/**
@@ -889,8 +907,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry=$this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry,$row);
@@ -920,15 +937,23 @@ 
 	public function __wakeup()
 	{
 		parent::__wakeup();
-		if (is_null($this->_selectQueue)) $this->_selectQueue = array();
+		if (is_null($this->_selectQueue)) {
+			$this->_selectQueue = array();
+		}
 	}
 
 	public function __sleep()
 	{
 		$exprops = array(); $cn = __CLASS__;
-		if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
-		if (is_null($this->_groupBy)) $exprops[] = "\0$cn\0_groupBy";
-		if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
+		if (!count($this->_selectQueue)) {
+			$exprops[] = "\0$cn\0_selectQueue";
+		}
+		if (is_null($this->_groupBy)) {
+			$exprops[] = "\0$cn\0_groupBy";
+		}
+		if (!$this->_IsRowDataFound) {
+			$exprops[] = "\0$cn\0_IsRowDataFound";
+		}
 		return array_diff(parent::__sleep(),$exprops);
 	}
 }
@@ -1015,16 +1040,18 @@ 
 		$this->_entries[$node] = $object;
 		if(empty($parent))
 		{
-			if(isset($this->_entries[$node]))
-				return;
+			if(isset($this->_entries[$node])) {
+							return;
+			}
 			$this->_tree[$node] = array();
 		}
 		$found = $this->addNode($this->_tree, $parent, $node);
 		if(!$found && !empty($parent))
 		{
 			$this->_tree[$parent] = array();
-			if(!isset($this->_entries[$parent]) || $object !== '')
-				$this->_entries[$parent] = $object;
+			if(!isset($this->_entries[$parent]) || $object !== '') {
+							$this->_entries[$parent] = $object;
+			}
 			$this->addNode($this->_tree, $parent, $node);
 		}
 	}
@@ -1048,8 +1075,7 @@ 
 			{
 				$found = true;
 				$childs[$key][$node] = array();
-			}
-			else
+			} else
 			{
 				$found = $found || $this->addNode($childs[$key], $parent, $node);
 			}
@@ -1062,8 +1088,9 @@ 
 	 */
 	public function collect()
 	{
-		while(count($this->_tree) > 0)
-			$this->collectChildren(null, $this->_tree);
+		while(count($this->_tree) > 0) {
+					$this->collectChildren(null, $this->_tree);
+		}
 		return $this->getCollection();
 	}
 
@@ -1074,9 +1101,10 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach($nodes as $node)
-			if(count($node) != 0)
+		foreach($nodes as $node) {
+					if(count($node) != 0)
 				return true;
+		}
 		return $hasChildren;
 	}
 
@@ -1096,12 +1124,13 @@ 
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
+			} else {
+							$this->collectChildren($key, $nodes[$key]);
 			}
-			else
-				$this->collectChildren($key, $nodes[$key]);
 		}
-		if(count($childs) > 0)
-			$this->onChildNodesVisited($parent, $childs);
+		if(count($childs) > 0) {
+					$this->onChildNodesVisited($parent, $childs);
+		}
 	}
 
 	/**
@@ -1111,8 +1140,9 @@ 
 	 */
 	protected function onChildNodesVisited($parent, $nodes)
 	{
-		if(empty($parent) || empty($this->_entries[$parent]))
-			return;
+		if(empty($parent) || empty($this->_entries[$parent])) {
+					return;
+		}
 
 		$parentObject = $this->_entries[$parent]['object'];
 		$property = $this->_entries[$nodes[0]]['property'];
@@ -1121,20 +1151,23 @@ 
 
 		foreach($nodes as $node)
 		{
-			if($list instanceof TList)
-				$parentObject->{$property}[] = $this->_entries[$node]['object'];
-			else if(is_array($list))
-				$list[] = $this->_entries[$node]['object'];
-			else
-				throw new TSqlMapExecutionException(
+			if($list instanceof TList) {
+							$parentObject->{$property}[] = $this->_entries[$node]['object'];
+			} else if(is_array($list)) {
+							$list[] = $this->_entries[$node]['object'];
+			} else {
+							throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
+			}
 		}
 
-		if(is_array($list))
-			TPropertyAccess::set($parentObject, $property, $list);
+		if(is_array($list)) {
+					TPropertyAccess::set($parentObject, $property, $list);
+		}
 
-		if($this->_entries[$parent]['property'] === null)
-			$this->_list[] = $parentObject;
+		if($this->_entries[$parent]['property'] === null) {
+					$this->_list[] = $parentObject;
+		}
 	}
 
 	/**
@@ -1148,9 +1181,15 @@ 
 	public function __sleep()
 	{
 		$exprops = array(); $cn = __CLASS__;
-		if (!count($this->_tree)) $exprops[] = "\0$cn\0_tree";
-		if (!count($this->_entries)) $exprops[] = "\0$cn\0_entries";
-		if (!count($this->_list)) $exprops[] = "\0$cn\0_list";
+		if (!count($this->_tree)) {
+			$exprops[] = "\0$cn\0_tree";
+		}
+		if (!count($this->_entries)) {
+			$exprops[] = "\0$cn\0_entries";
+		}
+		if (!count($this->_list)) {
+			$exprops[] = "\0$cn\0_list";
+		}
 		return array_diff(parent::__sleep(),$exprops);
 	}
 }