pradosoft / prado

framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 
 	/**
 	 * @param TSqlMapManager manager instance.
+	 * @param \Prado\Data\SqlMap\TSqlMapManager $manager
 	 */
 	public function __construct($manager)
 	{

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
 	public function configure($filename=null)
 	{
 		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this);
+		$document=$this->loadXmlDocument($filename, $this);
 
 		foreach($document->xpath('//property') as $property)
 			$this->loadGlobalProperty($property);
@@ -73,7 +73,7 @@ 
 			$this->loadDatabaseConnection($conn);
 
 		//try to load configuration in the current config file.
-		$mapping = new TSqlMapXmlMappingConfiguration($this);
+		$mapping=new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
 		foreach($document->xpath('//sqlMap') as $sqlmap)
@@ -89,7 +89,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']]=(string) $node['value'];
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	protected function loadTypeHandler($node)
 	{
-		$handler = $this->createObjectFromNode($node);
+		$handler=$this->createObjectFromNode($node);
 		$this->_manager->getTypeHandlers()->registerTypeHandler($handler);
 	}
 
@@ -108,7 +108,7 @@ 
 	 */
 	protected function loadDatabaseConnection($node)
 	{
-		$conn = $this->createObjectFromNode($node);
+		$conn=$this->createObjectFromNode($node);
 		$this->_manager->setDbConnection($conn);
 	}
 
@@ -118,13 +118,13 @@ 
 	 */
 	protected function loadSqlMappingFiles($node)
 	{
-		if(strlen($resource = (string)$node['resource']) > 0)
+		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);
+			$mapping=new TSqlMapXmlMappingConfiguration($this);
+			$filename=$this->getAbsoluteFilePath($this->_configFile, $resource);
 			$mapping->configure($filename);
 		}
 	}
@@ -134,12 +134,12 @@ 
 	 */
 	protected function resolveResultMapping()
 	{
-		$maps = $this->_manager->getResultMaps();
+		$maps=$this->_manager->getResultMaps();
 		foreach($maps as $entry)
 		{
 			foreach($entry->getColumns() as $item)
 			{
-				$resultMap = $item->getResultMapping();
+				$resultMap=$item->getResultMapping();
 				if(strlen($resultMap) > 0)
 				{
 					if($maps->contains($resultMap))
@@ -162,9 +162,9 @@ 
 	{
 		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);
+				$cache=$this->_manager->getCacheModel($model);
 				$mappedStatement->getStatement()->setCache($cache);
 			}
 		}
@@ -179,7 +179,7 @@ 
 	public function replaceProperties($string)
 	{
 		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${'.$find.'}', $replace, $string);
+			$string=str_replace('${'.$find.'}', $replace, $string);
 		return $string;
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php

Doc Comments +5 added lines

@@ -255,6 +255,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)
 	{
@@ -278,6 +279,7 @@ 
 	 * @param TSqlMapStatement statement object.
 	 * @param string sql text
 	 * @param SimpleXmlElement statement node.
+	 * @param string $sqlStatement
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
@@ -375,6 +377,7 @@ 
 	/**
 	 * Load the selectKey statement from xml mapping.
 	 * @param SimpleXmlElement selectkey node
+	 * @param TSqlMapInsert $insert
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
@@ -465,6 +468,7 @@ 
 	 * Load the flush interval
 	 * @param TSqlMapCacheModel cache model
 	 * @param SimpleXmlElement cache node
+	 * @param TSqlMapCacheModel $cacheModel
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
@@ -500,6 +504,7 @@ 
 	 * @param TSqlMapCacheModel cache model
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
+	 * @param TSqlMapCacheModel $cacheModel
 	 */
 	protected function loadFlushOnCache($cacheModel,$parent,$node)
 	{

Spacing +96 added lines, -96 removed lines

@@ -73,12 +73,12 @@ 
 	public function configure($filename)
 	{
 		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this->_xmlConfig);
+		$document=$this->loadXmlDocument($filename, $this->_xmlConfig);
 		$this->_document=$document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
-			$bCacheDependencies = true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		if($bCacheDependencies===null)
+			$bCacheDependencies=true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
 		if($bCacheDependencies)
 			$this->_manager->getCacheDependencies()
@@ -121,14 +121,14 @@ 
 	 */
 	protected function loadResultMap($node)
 	{
-		$resultMap = $this->createResultMap($node);
+		$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))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'resultMap',$extendMap);
+				$extendNode=$this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
 				if($extendNode!==null)
 					$this->loadResultMap($extendNode);
 			}
@@ -137,7 +137,7 @@ 
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
 
-			$superMap = $this->_manager->getResultMap($extendMap);
+			$superMap=$this->_manager->getResultMap($extendMap);
 			$resultMap->getColumns()->mergeWith($superMap->getColumns());
 		}
 
@@ -154,22 +154,22 @@ 
 	 */
 	protected function createResultMap($node)
 	{
-		$resultMap = new TResultMap();
-		$this->setObjectPropFromNode($resultMap,$node);
+		$resultMap=new TResultMap();
+		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
 		foreach($node->result as $result)
 		{
-			$property = new TResultProperty($resultMap);
-			$this->setObjectPropFromNode($property,$result);
+			$property=new TResultProperty($resultMap);
+			$this->setObjectPropFromNode($property, $result);
 			$resultMap->addResultProperty($property);
 		}
 
 		//create the discriminator
-		$discriminator = null;
+		$discriminator=null;
 		if(isset($node->discriminator))
 		{
-			$discriminator = new TDiscriminator();
+			$discriminator=new TDiscriminator();
 			$this->setObjectPropFromNode($discriminator, $node->discriminator);
 			$discriminator->initMapping($resultMap);
 		}
@@ -178,9 +178,9 @@ 
 		{
 			if($discriminator===null)
 				throw new TSqlMapConfigurationException(
-					'sqlmap_undefined_discriminator', $node, $this->_configFile,$subMapNode);
-			$subMap = new TSubMap;
-			$this->setObjectPropFromNode($subMap,$subMapNode);
+					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
+			$subMap=new TSubMap;
+			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
@@ -197,24 +197,24 @@ 
 	 */
 	protected function loadParameterMap($node)
 	{
-		$parameterMap = $this->createParameterMap($node);
+		$parameterMap=$this->createParameterMap($node);
 
-		if(strlen($extendMap = $parameterMap->getExtends()) > 0)
+		if(strlen($extendMap=$parameterMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'parameterMap',$extendMap);
+				$extendNode=$this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
 				if($extendNode!==null)
 					$this->loadParameterMap($extendNode);
 			}
 
 			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;
+					'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));
+				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
 		}
 		$this->_manager->addParameterMap($parameterMap);
 	}
@@ -226,12 +226,12 @@ 
 	 */
 	protected function createParameterMap($node)
 	{
-		$parameterMap = new TParameterMap();
-		$this->setObjectPropFromNode($parameterMap,$node);
+		$parameterMap=new TParameterMap();
+		$this->setObjectPropFromNode($parameterMap, $node);
 		foreach($node->parameter as $parameter)
 		{
-			$property = new TParameterProperty();
-			$this->setObjectPropFromNode($property,$parameter);
+			$property=new TParameterProperty();
+			$this->setObjectPropFromNode($property, $parameter);
 			$parameterMap->addProperty($property);
 		}
 		return $parameterMap;
@@ -243,10 +243,10 @@ 
 	 */
 	protected function loadStatementTag($node)
 	{
-		$statement = new TSqlMapStatement();
-		$this->setObjectPropFromNode($statement,$node);
+		$statement=new TSqlMapStatement();
+		$this->setObjectPropFromNode($statement, $node);
 		$this->processSqlStatement($statement, $node);
-		$mappedStatement = new TMappedStatement($this->_manager, $statement);
+		$mappedStatement=new TMappedStatement($this->_manager, $statement);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -258,15 +258,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);
+			$superNode=$this->getElementByIdValue($this->_document, '*', $extend);
 			if($superNode!==null)
-				$commandText = (string)$superNode . $commandText;
+				$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);
@@ -281,27 +281,27 @@ 
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
-		$scope['file'] = $this->_configFile;
-		$scope['node'] = $node;
+		$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);
+			$parameterParser=new TInlineParameterMapParser;
+			$sqlText=$parameterParser->parse($sqlStatement, $scope);
 			if(count($sqlText['parameters']) > 0)
 			{
-				$map = new TParameterMap();
+				$map=new TParameterMap();
 				$map->setID($statement->getID().'-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
 				foreach($sqlText['parameters'] as $property)
 					$map->addProperty($property);
 			}
-			$sqlStatement = $sqlText['sql'];
+			$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);
 	}
@@ -313,19 +313,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);
-		$dynamics = $simpleDynamic->parse($sqlStatement);
+		$simpleDynamic=new TSimpleDynamicParser;
+		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
+		$dynamics=$simpleDynamic->parse($sqlStatement);
 		if(count($dynamics['parameters']) > 0)
 		{
-			$sql = new TSimpleDynamicSql($dynamics['parameters']);
-			$sqlStatement = $dynamics['sql'];
+			$sql=new TSimpleDynamicSql($dynamics['parameters']);
+			$sqlStatement=$dynamics['sql'];
 		}
 		else
-			$sql = new TStaticSql();
-		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
+			$sql=new TStaticSql();
+		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
 	}
@@ -336,12 +336,12 @@ 
 	 */
 	protected function loadSelectTag($node)
 	{
-		$select = new TSqlMapSelect;
-		$this->setObjectPropFromNode($select,$node);
-		$this->processSqlStatement($select,$node);
-		$mappedStatement = new TMappedStatement($this->_manager, $select);
+		$select=new TSqlMapSelect;
+		$this->setObjectPropFromNode($select, $node);
+		$this->processSqlStatement($select, $node);
+		$mappedStatement=new TMappedStatement($this->_manager, $select);
 		if(strlen($select->getCacheModel()) > 0)
-			$mappedStatement = new TCachingStatement($mappedStatement);
+			$mappedStatement=new TCachingStatement($mappedStatement);
 
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
@@ -352,9 +352,9 @@ 
 	 */
 	protected function loadInsertTag($node)
 	{
-		$insert = $this->createInsertStatement($node);
+		$insert=$this->createInsertStatement($node);
 		$this->processSqlStatement($insert, $node);
-		$mappedStatement = new TInsertMappedStatement($this->_manager, $insert);
+		$mappedStatement=new TInsertMappedStatement($this->_manager, $insert);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -365,10 +365,10 @@ 
 	 */
 	protected function createInsertStatement($node)
 	{
-		$insert = new TSqlMapInsert;
-		$this->setObjectPropFromNode($insert,$node);
+		$insert=new TSqlMapInsert;
+		$this->setObjectPropFromNode($insert, $node);
 		if(isset($node->selectKey))
-			$this->loadSelectKeyTag($insert,$node->selectKey);
+			$this->loadSelectKeyTag($insert, $node->selectKey);
 		return $insert;
 	}
 
@@ -378,13 +378,13 @@ 
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
-		$selectKey = new TSqlMapSelectKey;
-		$this->setObjectPropFromNode($selectKey,$node);
+		$selectKey=new TSqlMapSelectKey;
+		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
 		$selectKey->setID($insert->getID().'.SelectKey');
-		$this->processSqlStatement($selectKey,$node);
+		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
-		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
+		$mappedStatement=new TMappedStatement($this->_manager, $selectKey);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -394,10 +394,10 @@ 
 	 */
 	protected function loadUpdateTag($node)
 	{
-		$update = new TSqlMapUpdate;
-		$this->setObjectPropFromNode($update,$node);
+		$update=new TSqlMapUpdate;
+		$this->setObjectPropFromNode($update, $node);
 		$this->processSqlStatement($update, $node);
-		$mappedStatement = new TUpdateMappedStatement($this->_manager, $update);
+		$mappedStatement=new TUpdateMappedStatement($this->_manager, $update);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -407,10 +407,10 @@ 
 	 */
 	protected function loadDeleteTag($node)
 	{
-		$delete = new TSqlMapDelete;
-		$this->setObjectPropFromNode($delete,$node);
+		$delete=new TSqlMapDelete;
+		$this->setObjectPropFromNode($delete, $node);
 		$this->processSqlStatement($delete, $node);
-		$mappedStatement = new TDeleteMappedStatement($this->_manager, $delete);
+		$mappedStatement=new TDeleteMappedStatement($this->_manager, $delete);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -430,35 +430,35 @@ 
 	 */
 	protected function loadCacheModel($node)
 	{
-		$cacheModel = new TSqlMapCacheModel;
-		$properties = array('id','implementation');
+		$cacheModel=new TSqlMapCacheModel;
+		$properties=array('id', 'implementation');
 		foreach($node->attributes() as $name=>$value)
 		{
 			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set'.$name}((string)$value);
+				$cacheModel->{'set'.$name}((string) $value);
 		}
-		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
-		$this->setObjectPropFromNode($cache,$node,$properties);
+		$cache=Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
+		$this->setObjectPropFromNode($cache, $node, $properties);
 
 		foreach($node->xpath('property') as $propertyNode)
 		{
-			$name = $propertyNode->attributes()->name;
+			$name=$propertyNode->attributes()->name;
 			if($name===null || $name==='') continue;
 
-			$value = $propertyNode->attributes()->value;
+			$value=$propertyNode->attributes()->value;
 			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);
+			$this->loadFlushOnCache($cacheModel, $node, $flush);
 	}
 
 	/**
@@ -468,27 +468,27 @@ 
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
-		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
-		$duration = 0;
+		$flushInterval=$node->xpath('flushInterval');
+		if($flushInterval===null || count($flushInterval)===0) return;
+		$duration=0;
 		foreach($flushInterval[0]->attributes() as $name=>$value)
 		{
 			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
 			}
 		}
@@ -501,15 +501,15 @@ 
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
 	 */
-	protected function loadFlushOnCache($cacheModel,$parent,$node)
+	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
-		$id = $cacheModel->getID();
+		$id=$cacheModel->getID();
 		if(!isset($this->_FlushOnExecuteStatements[$id]))
-			$this->_FlushOnExecuteStatements[$id] = array();
+			$this->_FlushOnExecuteStatements[$id]=array();
 		foreach($node->attributes() as $name=>$value)
 		{
 			if(strtolower($name)==='statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+				$this->_FlushOnExecuteStatements[$id][]=(string) $value;
 		}
 	}
 
@@ -520,10 +520,10 @@ 
 	{
 		foreach($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
 		{
-			$cacheModel = $this->_manager->getCacheModel($cacheID);
+			$cacheModel=$this->_manager->getCacheModel($cacheID);
 			foreach($statementIDs as $statementID)
 			{
-				$statement = $this->_manager->getMappedStatement($statementID);
+				$statement=$this->_manager->getMappedStatement($statementID);
 				$cacheModel->registerTriggerStatement($statement);
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -322,8 +322,7 @@
 		{
 			$sql = new TSimpleDynamicSql($dynamics['parameters']);
 			$sqlStatement = $dynamics['sql'];
-		}
-		else
+		} else
 			$sql = new TStaticSql();
 		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);

framework/Data/SqlMap/DataMapper/TObjectProxy.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 +3 added lines, -3 removed lines

@@ -30,8 +30,8 @@ 
 	 */
 	public function __construct($handler, $object)
 	{
-		$this->_handler = $handler;
-		$this->_object = $object;
+		$this->_handler=$handler;
+		$this->_object=$object;
 	}
 
 	/**
@@ -41,7 +41,7 @@ 
 	 * @param array method arguments
 	 * @return mixed method return value.
 	 */
-	public function __call($method,$params)
+	public function __call($method, $params)
 	{
 		if($this->_handler->hasMethod($method))
 			return $this->_handler->intercept($method, $params);

framework/Data/SqlMap/DataMapper/TSqlMapApplicationCache.php

Doc Comments +3 added lines

@@ -205,6 +205,9 @@
 		return $keyList;
 	}
 
+	/**
+	 * @param TList $keyList
+	 */
 	protected function setKeyList($keyList)
 	{
 		$this->getCache()->set($this->getKeyListId(), $keyList);

Spacing +11 added lines, -11 removed lines

@@ -43,7 +43,7 @@ 
 	protected function getKeyListId()
 	{
 		$id='keyList';
-		if ($this->_cacheModel instanceof TSqlMapCacheModel)
+		if($this->_cacheModel instanceof TSqlMapCacheModel)
 				$id.='_'.$this->_cacheModel->getId();
 		return $id;
 	}
@@ -53,7 +53,7 @@ 
 	 */
 	protected function getKeyList()
 	{
-		if (($keyList=$this->getCache()->get($this->getKeyListId()))===false)
+		if(($keyList=$this->getCache()->get($this->getKeyListId()))===false)
 		{
 			$keyList=new TList();
 			$this->getCache()->set($this->getKeyListId(), $keyList);
@@ -84,7 +84,7 @@ 
 	{
 		$keyList=$this->getKeyList();
 		$cache=$this->getCache();
-		foreach ($keyList as $key)
+		foreach($keyList as $key)
 		{
 			$cache->delete($key);
 		}
@@ -97,18 +97,18 @@ 
 	 */
 	public function get($key)
 	{
-		$result = $this->getCache()->get($key);
-		if ($result === false)
+		$result=$this->getCache()->get($key);
+		if($result===false)
 		{
 			// if the key has not been found in cache (e.g expired), remove from keylist
 			$keyList=$this->getKeyList();
-			if ($keyList->contains($key))
+			if($keyList->contains($key))
 			{
 				$keyList->remove($key);
 				$this->setKeyList($keyList);
 			}
 		}
-		return $result === false ? null : $result;
+		return $result===false ? null : $result;
 	}
 
 	/**
@@ -116,11 +116,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->getCache()->set($key, $value, $expire,$dependency);
+		$this->getCache()->set($key, $value, $expire, $dependency);
 		$keyList=$this->getKeyList();
-		if (!$keyList->contains($key))
+		if(!$keyList->contains($key))
 		{
 			$keyList->add($key);
 			$this->setKeyList($keyList);
@@ -138,7 +138,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');
 	}

framework/Data/SqlMap/Statements/TMappedStatement.php

Doc Comments +6 added lines, -1 removed lines

@@ -96,7 +96,7 @@ 
 	}
 
 	/**
-	 * @return TSqlMapper The SqlMap used by this MappedStatement
+	 * @return TSqlMapManager The SqlMap used by this MappedStatement
 	 */
 	public function getManager()
 	{
@@ -481,6 +481,7 @@ 
 	 * @param IDbConnection database connection
 	 * @param mixed insert statement parameter
 	 * @param TSqlMapSelectKey select key statement
+	 * @param \Prado\Data\SqlMap\Configuration\TSqlMapSelectKey $selectKey
 	 * @return string last insert ID.
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
@@ -581,6 +582,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)
@@ -603,6 +605,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)
@@ -645,6 +648,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)
@@ -784,6 +788,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)

Spacing +137 added lines, -140 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * @var boolean true when data is mapped to a particular row.
 	 */
-	private $_IsRowDataFound = false;
+	private $_IsRowDataFound=false;
 
 	/**
 	 * @var TSQLMapObjectCollectionTree group by object collection tree
@@ -66,17 +66,17 @@ 
 	/**
 	 * @var Post select is to query for list.
 	 */
-	const QUERY_FOR_LIST = 0;
+	const QUERY_FOR_LIST=0;
 
 	/**
 	 * @var Post select is to query for list.
 	 */
-	const QUERY_FOR_ARRAY = 1;
+	const QUERY_FOR_ARRAY=1;
 
 	/**
 	 * @var Post select is to query for object.
 	 */
-	const QUERY_FOR_OBJECT = 2;
+	const QUERY_FOR_OBJECT=2;
 
 	/**
 	 * @return string Name used to identify the TMappedStatement amongst the others.
@@ -116,7 +116,7 @@ 
 	 */
 	protected function initialGroupByResults()
 	{
-		$this->_groupBy = new TSqlMapObjectCollectionTree();
+		$this->_groupBy=new TSqlMapObjectCollectionTree();
 	}
 
 	/**
@@ -126,9 +126,9 @@ 
 	 */
 	public function __construct(TSqlMapManager $sqlMap, TSqlMapStatement $statement)
 	{
-		$this->_manager = $sqlMap;
-		$this->_statement = $statement;
-		$this->_command = new TPreparedCommand();
+		$this->_manager=$sqlMap;
+		$this->_statement=$statement;
+		$this->_command=new TPreparedCommand();
 		$this->initialGroupByResults();
 	}
 
@@ -173,10 +173,10 @@ 
 	 */
 	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:'';
+			$maxStr=$max > 0 ? ' LIMIT '.$max : '';
+			$skipStr=$skip > 0 ? ' OFFSET '.$skip : '';
 			$command->setText($command->getText().$maxStr.$skipStr);
 		}
 		$connection->setActive(true);
@@ -213,7 +213,7 @@ 
 	 */
 	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);
 	}
 
@@ -236,17 +236,16 @@ 
 	public function runQueryForList($connection, $parameter, $sql, $result, $delegate=null)
 	{
 		$registry=$this->getManager()->getTypeHandlers();
-		$list = $result instanceof \ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$list=$result instanceof \ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
-		$reader = $sql->query();
+		$reader=$sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
 		if($delegate!==null)
 		{
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$param = new TResultSetListItemParameter($obj, $parameter, $list);
+				$obj=$this->applyResultMap($row);
+				$param=new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
 		}
@@ -256,13 +255,13 @@ 
 			foreach($reader as $row)
 			{
 //				var_dump($row);
-				$list[] = $this->applyResultMap($row);
+				$list[]=$this->applyResultMap($row);
 			}
 		}
 
 		if(!$this->_groupBy->isEmpty())
 		{
-			$list = $this->_groupBy->collect();
+			$list=$this->_groupBy->collect();
 			$this->initialGroupByResults();
 		}
 
@@ -284,9 +283,9 @@ 
 	 * @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);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForMap($connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 	}
 
@@ -310,20 +309,19 @@ 
 	 */
 	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty=null, $delegate=null)
 	{
-		$map = array();
+		$map=array();
 		//$recordSet = $this->executeSQLQuery($connection, $sql);
 		$connection->setActive(true);
-		$reader = $command->query();
+		$reader=$command->query();
 		if($delegate!==null)
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty===null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
-				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
+				$obj=$this->applyResultMap($row);
+				$key=TPropertyAccess::get($obj, $keyProperty);
+				$value=($valueProperty===null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
+				$param=new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
 		}
@@ -332,10 +330,9 @@ 
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
 			{
-				$obj = $this->applyResultMap($row);
-				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty===null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$obj=$this->applyResultMap($row);
+				$key=TPropertyAccess::get($obj, $keyProperty);
+				$map[$key]=($valueProperty===null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -352,22 +349,22 @@ 
 	{
 		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;
+			list($object, $method)=$handler;
 			if(is_string($object))	// static method call
-				call_user_func($handler,$this,$param);
+				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
@@ -384,7 +381,7 @@ 
 	 */
 	public function executeQueryForObject($connection, $parameter, $result=null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
+		$sql=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 		return $this->runQueryForObject($connection, $sql, $result);
 	}
 
@@ -403,16 +400,16 @@ 
 	 */
 	public function runQueryForObject($connection, $command, &$result)
 	{
-		$object = null;
+		$object=null;
 		$connection->setActive(true);
 		foreach($command->query() as $row)
-			$object = $this->applyResultMap($row, $result);
+			$object=$this->applyResultMap($row, $result);
 
 		if(!$this->_groupBy->isEmpty())
 		{
-			$list = $this->_groupBy->collect();
+			$list=$this->_groupBy->collect();
 			$this->initialGroupByResults();
-			$object = $list[0];
+			$object=$list[0];
 		}
 
 		$this->executePostSelect($connection);
@@ -430,14 +427,14 @@ 
 	 */
 	public function executeInsert($connection, $parameter)
 	{
-		$generatedKey = $this->getPreGeneratedSelectKey($connection, $parameter);
+		$generatedKey=$this->getPreGeneratedSelectKey($connection, $parameter);
 
-		$command = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
+		$command=$this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 //		var_dump($command,$parameter);
-		$result = $command->execute();
+		$result=$command->execute();
 
 		if($generatedKey===null)
-			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
+			$generatedKey=$this->getPostGeneratedSelectKey($connection, $parameter);
 
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($command);
@@ -454,7 +451,7 @@ 
 	{
 		if($this->_statement instanceof TSqlMapInsert)
 		{
-			$selectKey = $this->_statement->getSelectKey();
+			$selectKey=$this->_statement->getSelectKey();
 			if(($selectKey!==null) && !$selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
@@ -470,7 +467,7 @@ 
 	{
 		if($this->_statement instanceof TSqlMapInsert)
 		{
-			$selectKey = $this->_statement->getSelectKey();
+			$selectKey=$this->_statement->getSelectKey();
 			if(($selectKey!==null) && $selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
@@ -485,10 +482,10 @@ 
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
 	{
-		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
-		$generatedKey = $mappedStatement->executeQueryForObject(
+		$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;
 	}
@@ -502,8 +499,8 @@ 
 	 */
 	public function executeUpdate($connection, $parameter)
 	{
-		$sql = $this->_command->create($this->getManager(),$connection, $this->_statement, $parameter);
-		$affectedRows = $sql->execute();
+		$sql=$this->_command->create($this->getManager(), $connection, $this->_statement, $parameter);
+		$affectedRows=$sql->execute();
 		//$this->executeSQLQuery($connection, $sql);
 		$this->executePostSelect($connection);
 		$this->onExecuteQuery($sql);
@@ -518,24 +515,24 @@ 
 	{
 		while(count($this->_selectQueue))
 		{
-			$postSelect = array_shift($this->_selectQueue);
-			$method = $postSelect->getMethod();
-			$statement = $postSelect->getStatement();
-			$property = $postSelect->getResultProperty()->getProperty();
-			$keys = $postSelect->getKeys();
-			$resultObject = $postSelect->getResultObject();
-
-			if($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
+			$postSelect=array_shift($this->_selectQueue);
+			$method=$postSelect->getMethod();
+			$statement=$postSelect->getStatement();
+			$property=$postSelect->getResultProperty()->getProperty();
+			$keys=$postSelect->getKeys();
+			$resultObject=$postSelect->getResultObject();
+
+			if($method==self::QUERY_FOR_LIST || $method==self::QUERY_FOR_ARRAY)
 			{
-				$values = $statement->executeQueryForList($connection, $keys, null);
+				$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);
+				$value=$statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
 			}
 		}
@@ -558,21 +555,21 @@ 
 	 */
 	protected function applyResultMap($row, &$resultObject=null)
 	{
-		if($row === false) return null;
+		if($row===false) return null;
 
-		$resultMapName = $this->_statement->getResultMap();
-		$resultClass = $this->_statement->getResultClass();
+		$resultMapName=$this->_statement->getResultMap();
+		$resultClass=$this->_statement->getResultClass();
 
 		$obj=null;
 		if($this->getManager()->getResultMaps()->contains($resultMapName))
-			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
+			$obj=$this->fillResultMap($resultMapName, $row, null, $resultObject);
 		else if(strlen($resultClass) > 0)
-			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
+			$obj=$this->fillResultClass($resultClass, $row, $resultObject);
 		else
-			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord)
+			$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);
+			$obj=TActiveRecord::createRecord(get_class($obj), $obj);
 		return $obj;
 	}
 
@@ -587,8 +584,8 @@ 
 	{
 		if($resultObject===null)
 		{
-			$registry = $this->getManager()->getTypeHandlers();
-			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);
+			$registry=$this->getManager()->getTypeHandlers();
+			$resultObject=$this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
 		if($resultObject instanceOf \ArrayAccess)
@@ -609,10 +606,10 @@ 
 	{
 		if($resultObject instanceof TList)
 			foreach($row as $v)
-				$resultObject[] = $v;
+				$resultObject[]=$v;
 		else
 			foreach($row as $k => $v)
-				$resultObject[$k] = $v;
+				$resultObject[$k]=$v;
 		return $resultObject;
 	}
 
@@ -624,18 +621,18 @@ 
 	 */
 	protected function fillResultObjectProperty($row, $resultObject)
 	{
-		$index = 0;
+		$index=0;
 		$registry=$this->getManager()->getTypeHandlers();
 		foreach($row as $k=>$v)
 		{
-			$property = new TResultProperty;
+			$property=new TResultProperty;
 			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;
 	}
@@ -649,12 +646,12 @@ 
 	 */
 	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
 	{
-		$resultMap = $this->getManager()->getResultMap($resultMapName);
-		$registry = $this->getManager()->getTypeHandlers();
-		$resultMap = $resultMap->resolveSubMap($registry,$row);
+		$resultMap=$this->getManager()->getResultMap($resultMapName);
+		$registry=$this->getManager()->getTypeHandlers();
+		$resultMap=$resultMap->resolveSubMap($registry, $row);
 
 		if($resultObject===null)
-			$resultObject = $resultMap->createInstanceOfResult($registry);
+			$resultObject=$resultMap->createInstanceOfResult($registry);
 
 		if(is_object($resultObject))
 		{
@@ -666,7 +663,7 @@ 
 		}
 		else
 		{
-			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
+			$resultObject=$this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
 		return $resultObject;
 	}
@@ -681,11 +678,11 @@ 
 	 */
 	protected function addResultMapGroupBy($resultMap, $row, $parent, &$resultObject)
 	{
-		$group = $this->getResultMapGroupKey($resultMap, $row);
+		$group=$this->getResultMapGroupKey($resultMap, $row);
 
 		if(empty($parent))
 		{
-			$rootObject = array('object'=>$resultObject, 'property' => null);
+			$rootObject=array('object'=>$resultObject, 'property' => null);
 			$this->_groupBy->add(null, $group, $rootObject);
 		}
 
@@ -693,23 +690,23 @@ 
 		{
 			//set properties.
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-			$nested = $property->getResultMapping();
+			$nested=$property->getResultMapping();
 
 			//nested property
 			if($this->getManager()->getResultMaps()->contains($nested))
 			{
-				$nestedMap = $this->getManager()->getResultMap($nested);
-				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
+				$nestedMap=$this->getManager()->getResultMap($nested);
+				$groupKey=$this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
 				if(empty($parent))
 					$this->_groupBy->add($group, $groupKey, '');
 
 				//get the nested result mapping value
-				$value = $this->fillResultMap($nested, $row, $groupKey);
+				$value=$this->fillResultMap($nested, $row, $groupKey);
 
 				//add it to the object tree graph
-				$groupObject = array('object'=>$value, 'property' => $property->getProperty());
+				$groupObject=array('object'=>$value, 'property' => $property->getProperty());
 				if(empty($parent))
 					$this->_groupBy->add($group, $groupKey, $groupObject);
 				else
@@ -727,7 +724,7 @@ 
 	 */
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
-		$groupBy = $resultMap->getGroupBy();
+		$groupBy=$resultMap->getGroupBy();
 		if(isset($row[$groupBy]))
 			return $resultMap->getID().$row[$groupBy];
 		else
@@ -748,12 +745,12 @@ 
 			$resultObject='';
 
 		if($resultMap!==null)
-			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
+			$result=$this->fillArrayResultMap($resultMap, $row, $resultObject);
 		else
-			$result = $row;
+			$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;
@@ -768,14 +765,14 @@ 
 	 */
 	protected function fillArrayResultMap($resultMap, $row, $resultObject)
 	{
-		$result = array();
+		$result=array();
 		$registry=$this->getManager()->getTypeHandlers();
 		foreach($resultMap->getColumns() as $column)
 		{
 			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;
 	}
@@ -788,7 +785,7 @@ 
 	 */
 	protected function getScalarResult($result, $type)
 	{
-		$scalar = array_shift($result);
+		$scalar=array_shift($result);
 		settype($scalar, $type);
 		return $scalar;
 	}
@@ -802,23 +799,23 @@ 
 	 */
 	protected function setObjectProperty($resultMap, $property, $row, &$resultObject)
 	{
-		$select = $property->getSelect();
-		$key = $property->getProperty();
-		$nested = $property->getNestedResultMap();
+		$select=$property->getSelect();
+		$key=$property->getProperty();
+		$nested=$property->getNestedResultMap();
 		$registry=$this->getManager()->getTypeHandlers();
-		if($key === '')
+		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);
+			$this->_IsRowDataFound=$this->_IsRowDataFound || ($value!=null);
 			if(is_array($resultObject) || is_object($resultObject))
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
-				$resultObject = $value;
+				$resultObject=$value;
 		}
 		else if($nested!==null)
 		{
@@ -831,9 +828,9 @@ 
 			}
 			else
 			{
-				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
-					$obj = null;
+				$obj=$nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
+				if($this->fillPropertyWithResultMap($nested, $row, $obj)==false)
+					$obj=null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
 		}
@@ -853,9 +850,9 @@ 
 	 */
 	protected function enquequePostSelect($select, $resultMap, $property, $row, $resultObject)
 	{
-		$statement = $this->getManager()->getMappedStatement($select);
-		$key = $this->getPostSelectKeys($resultMap, $property, $row);
-		$postSelect = new TPostSelectBinding;
+		$statement=$this->getManager()->getMappedStatement($select);
+		$key=$this->getPostSelectKeys($resultMap, $property, $row);
+		$postSelect=new TPostSelectBinding;
 		$postSelect->setStatement($statement);
 		$postSelect->setResultObject($resultObject);
 		$postSelect->setResultProperty($property);
@@ -863,10 +860,10 @@ 
 
 		if($property->instanceOfListType($resultObject))
 		{
-			$values = null;
+			$values=null;
 			if($property->getLazyLoad())
 			{
-				$values = TLazyLoadList::newInstance($statement, $key,
+				$values=TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
 			}
@@ -879,7 +876,7 @@ 
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
 		if(!$property->getLazyLoad())
-			$this->_selectQueue[] = $postSelect;
+			$this->_selectQueue[]=$postSelect;
 	}
 
 	/**
@@ -889,23 +886,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)))
+		$value=$property->getColumn();
+		if(is_int(strpos($value.',', 0)) || is_int(strpos($value, '=', 0)))
 		{
-			$keys = array();
+			$keys=array();
 			foreach(explode(',', $value) as $entry)
 			{
-				$pair =explode('=',$entry);
-				$keys[trim($pair[0])] = $row[trim($pair[1])];
+				$pair=explode('=', $entry);
+				$keys[trim($pair[0])]=$row[trim($pair[1])];
 			}
 			return $keys;
 		}
 		else
 		{
 			$registry=$this->getManager()->getTypeHandlers();
-			return $property->getPropertyValue($registry,$row);
+			return $property->getPropertyValue($registry, $row);
 		}
 	}
 
@@ -918,28 +915,28 @@ 
 	 */
 	protected function fillPropertyWithResultMap($resultMap, $row, &$resultObject)
 	{
-		$dataFound = false;
+		$dataFound=false;
 		foreach($resultMap->getColumns() as $property)
 		{
-			$this->_IsRowDataFound = false;
+			$this->_IsRowDataFound=false;
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-			$dataFound = $dataFound || $this->_IsRowDataFound;
+			$dataFound=$dataFound || $this->_IsRowDataFound;
 		}
-		$this->_IsRowDataFound = $dataFound;
+		$this->_IsRowDataFound=$dataFound;
 		return $dataFound;
 	}
 
 	public function __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";
-		return array_diff(parent::__sleep(),$exprops);
+		$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";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

Braces +13 added lines, -26 removed lines

@@ -249,8 +249,7 @@ 
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//var_dump($sql,$parameter);
 			foreach($reader as $row)
@@ -326,8 +325,7 @@ 
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
@@ -353,8 +351,7 @@ 
 		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;
@@ -369,8 +366,7 @@ 
 				}
 				$object->$method($this,$param);
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
@@ -532,8 +528,7 @@ 
 				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);
@@ -663,8 +658,7 @@ 
 			else
 				foreach($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -809,8 +803,7 @@ 
 		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);
 
@@ -819,8 +812,7 @@ 
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
-		}
-		else if($nested!==null)
+		} else if($nested!==null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
@@ -828,16 +820,14 @@ 
 					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;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
-		}
-		else //'select' ResultProperty
+		} else //'select' ResultProperty
 		{
 			$this->enquequePostSelect($select, $resultMap, $property, $row, $resultObject);
 		}
@@ -869,11 +859,9 @@ 
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
-			}
-			else
+			} 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);
@@ -901,8 +889,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry=$this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry,$row);

framework/Data/SqlMap/Statements/TPostSelectBinding.php

Doc Comments +4 added lines

@@ -39,5 +39,9 @@
 	public function setKeys($value){ $this->_keys = $value; }
 
 	public function getMethod(){ return $this->_method; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setMethod($value){ $this->_method = $value; }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -26,18 +26,18 @@
 	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; }
 }
\ No newline at end of file

framework/Data/SqlMap/Statements/TResultSetListItemParameter.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 	private $_parameterObject;
 	private $_list;
 
+	/**
+	 * @param \ArrayAccess $list
+	 */
 	public function __construct($result, $parameter, &$list)
 	{
 		$this->_resultObject = $result;

Spacing +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@
 
 	public function __construct($result, $parameter, &$list)
 	{
-		$this->_resultObject = $result;
-		$this->_parameterObject = $parameter;
-		$this->_list = &$list;
+		$this->_resultObject=$result;
+		$this->_parameterObject=$parameter;
+		$this->_list=&$list;
 	}
 
 	public function getResult()

framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php

Doc Comments +1 added lines

@@ -53,6 +53,7 @@
 	 * @param string parent node id
 	 * @param string new node id
 	 * @param mixed node value
+	 * @param string $node
 	 */
 	public function add($parent, $node, $object='')
 	{

Spacing +36 added lines, -36 removed lines

@@ -30,22 +30,22 @@ 
 	/**
 	 * @var array object graph as tree
 	 */
-	private $_tree = array();
+	private $_tree=array();
 	/**
 	 * @var array tree node values
 	 */
-	private $_entries = array();
+	private $_entries=array();
 	/**
 	 * @var array resulting object collection
 	 */
-	private $_list = array();
+	private $_list=array();
 
 	/**
 	 * @return boolean true if the graph is empty
 	 */
 	public function isEmpty()
 	{
-		return count($this->_entries) == 0;
+		return count($this->_entries)==0;
 	}
 
 	/**
@@ -59,22 +59,22 @@ 
 		if(isset($this->_entries[$parent]) && ($this->_entries[$parent]!==null)
 			&& isset($this->_entries[$node]) && ($this->_entries[$node]!==null))
 		{
-			$this->_entries[$node] = $object;
+			$this->_entries[$node]=$object;
 			return;
 		}
-		$this->_entries[$node] = $object;
+		$this->_entries[$node]=$object;
 		if(empty($parent))
 		{
 			if(isset($this->_entries[$node]))
 				return;
-			$this->_tree[$node] = array();
+			$this->_tree[$node]=array();
 		}
-		$found = $this->addNode($this->_tree, $parent, $node);
+		$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;
+			$this->_tree[$parent]=array();
+			if(!isset($this->_entries[$parent]) || $object!=='')
+				$this->_entries[$parent]=$object;
 			$this->addNode($this->_tree, $parent, $node);
 		}
 	}
@@ -88,20 +88,20 @@ 
 	 */
 	protected function addNode(&$childs, $parent, $node)
 	{
-		$found = false;
+		$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);
+			$key=key($childs);
 			next($childs);
-			if($key == $parent)
+			if($key==$parent)
 			{
-				$found = true;
-				$childs[$key][$node] = array();
+				$found=true;
+				$childs[$key][$node]=array();
 			}
 			else
 			{
-				$found = $found || $this->addNode($childs[$key], $parent, $node);
+				$found=$found || $this->addNode($childs[$key], $parent, $node);
 			}
 		}
 		return $found;
@@ -123,9 +123,9 @@ 
 	 */
 	protected function hasChildren(&$nodes)
 	{
-		$hasChildren = false;
+		$hasChildren=false;
 		foreach($nodes as $node)
-			if(count($node) != 0)
+			if(count($node)!=0)
 				return true;
 		return $hasChildren;
 	}
@@ -137,14 +137,14 @@ 
 	 */
 	protected function collectChildren($parent, &$nodes)
 	{
-		$noChildren = !$this->hasChildren($nodes);
-		$childs = array();
-		for(reset($nodes); $key = key($nodes);)
+		$noChildren=!$this->hasChildren($nodes);
+		$childs=array();
+		for(reset($nodes); $key=key($nodes);)
 		{
 			next($nodes);
 			if($noChildren)
 			{
-				$childs[] = $key;
+				$childs[]=$key;
 				unset($nodes[$key]);
 			}
 			else
@@ -164,17 +164,17 @@ 
 		if(empty($parent) || empty($this->_entries[$parent]))
 			return;
 
-		$parentObject = $this->_entries[$parent]['object'];
-		$property = $this->_entries[$nodes[0]]['property'];
+		$parentObject=$this->_entries[$parent]['object'];
+		$property=$this->_entries[$nodes[0]]['property'];
 
-		$list = TPropertyAccess::get($parentObject, $property);
+		$list=TPropertyAccess::get($parentObject, $property);
 
 		foreach($nodes as $node)
 		{
 			if($list instanceof TList)
-				$parentObject->{$property}[] = $this->_entries[$node]['object'];
+				$parentObject->{$property}[]=$this->_entries[$node]['object'];
 			else if(is_array($list))
-				$list[] = $this->_entries[$node]['object'];
+				$list[]=$this->_entries[$node]['object'];
 			else
 				throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
@@ -183,8 +183,8 @@ 
 		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;
 	}
 
 	/**
@@ -197,10 +197,10 @@ 
 
 	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";
-		return array_diff(parent::__sleep(),$exprops);
+		$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";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

Braces +5 added lines, -6 removed lines

@@ -98,8 +98,7 @@ 
 			{
 				$found = true;
 				$childs[$key][$node] = array();
-			}
-			else
+			} else
 			{
 				$found = $found || $this->addNode($childs[$key], $parent, $node);
 			}
@@ -112,8 +111,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();
 	}
 
@@ -146,8 +146,7 @@ 
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
-			}
-			else
+			} else
 				$this->collectChildren($key, $nodes[$key]);
 		}
 		if(count($childs) > 0)

framework/Exceptions/THttpException.php

Doc Comments +2 added lines

@@ -393,6 +393,8 @@
 	 * in the message file. If so, the message in the preferred language
 	 * will be used as the error message. Any rest parameters will be used
 	 * to replace placeholders ({0}, {1}, {2}, etc.) in the message.
+	 * @param integer $statusCode
+	 * @param string $errorMessage
 	 */
 	public function __construct($statusCode,$errorMessage)
 	{

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * will be used as the error message. Any rest parameters will be used
 	 * to replace placeholders ({0}, {1}, {2}, etc.) in the message.
 	 */
-	public function __construct($statusCode,$errorMessage)
+	public function __construct($statusCode, $errorMessage)
 	{
 		$this->_statusCode=$statusCode;
 		$this->setErrorCode($errorMessage);
@@ -45,9 +45,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**