pradosoft / prado

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 +16 added lines, -16 removed lines

@@ -22,7 +22,7 @@ 
 
 	public function __construct(TMappedStatement $statement)
 	{
-		$this->_mappedStatement = $statement;
+		$this->_mappedStatement=$statement;
 	}
 
 	public function getID()
@@ -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));
-		$map = $this->getStatement()->getCache()->get($key);
+		$sql=$this->createCommand($connection, $parameter, $skip, $max);
+		$key=$this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty, $skip, $max));
+		$map=$this->getStatement()->getCache()->get($key);
 		if($map===null)
 		{
-			$map = $this->_mappedStatement->runQueryForMap(
-				$connection, $parameter, $sql, $keyProperty, $valueProperty,  $delegate);
+			$map=$this->_mappedStatement->runQueryForMap(
+				$connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
 			$this->getStatement()->getCache()->set($key, $map);
 		}
 		return $map;
@@ -66,12 +66,12 @@ 
 
 	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);
+		$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)
 		{
-			$list = $this->_mappedStatement->runQueryForList(
+			$list=$this->_mappedStatement->runQueryForList(
 				$connection, $parameter, $sql, $result, $delegate);
 			$this->getStatement()->getCache()->set($key, $list);
 		}
@@ -80,12 +80,12 @@ 
 
 	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);
+		$sql=$this->createCommand($connection, $parameter);
+		$key=$this->getCacheKey(array(clone($sql), $parameter));
+		$object=$this->getStatement()->getCache()->get($key);
 		if($object===null)
 		{
-			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);
+			$object=$this->_mappedStatement->runQueryForObject($connection, $sql, $result);
 			$this->getStatement()->getCache()->set($key, $object);
 		}
 		return $object;
@@ -93,7 +93,7 @@ 
 
 	protected function getCacheKey($object)
 	{
-		$cacheKey = new TSqlMapCacheKey($object);
+		$cacheKey=new TSqlMapCacheKey($object);
 		return $cacheKey->getHash();
 	}
 

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 +190 added lines, -193 removed lines

@@ -44,7 +44,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
@@ -54,17 +54,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.
@@ -104,7 +104,7 @@ 
 	 */
 	protected function initialGroupByResults()
 	{
-		$this->_groupBy = new TSqlMapObjectCollectionTree();
+		$this->_groupBy=new TSqlMapObjectCollectionTree();
 	}
 
 	/**
@@ -114,9 +114,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();
 	}
 
@@ -161,10 +161,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);
@@ -201,7 +201,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);
 	}
 
@@ -224,17 +224,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);
 			}
 		}
@@ -244,13 +243,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();
 		}
 
@@ -272,9 +271,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);
 	}
 
@@ -298,20 +297,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);
 			}
 		}
@@ -320,10 +318,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);
@@ -340,22 +337,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
@@ -372,7 +369,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);
 	}
 
@@ -391,16 +388,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);
@@ -418,14 +415,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);
@@ -442,7 +439,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);
 		}
@@ -458,7 +455,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);
 		}
@@ -473,10 +470,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;
 	}
@@ -490,8 +487,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);
@@ -506,24 +503,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);
 			}
 		}
@@ -546,21 +543,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;
 	}
 
@@ -575,8 +572,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)
@@ -597,10 +594,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;
 	}
 
@@ -612,18 +609,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;
 	}
@@ -637,12 +634,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))
 		{
@@ -654,7 +651,7 @@ 
 		}
 		else
 		{
-			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
+			$resultObject=$this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
 		return $resultObject;
 	}
@@ -669,11 +666,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);
 		}
 
@@ -681,23 +678,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
@@ -715,7 +712,7 @@ 
 	 */
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
-		$groupBy = $resultMap->getGroupBy();
+		$groupBy=$resultMap->getGroupBy();
 		if(isset($row[$groupBy]))
 			return $resultMap->getID().$row[$groupBy];
 		else
@@ -736,12 +733,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;
@@ -756,14 +753,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;
 	}
@@ -776,7 +773,7 @@ 
 	 */
 	protected function getScalarResult($result, $type)
 	{
-		$scalar = array_shift($result);
+		$scalar=array_shift($result);
 		settype($scalar, $type);
 		return $scalar;
 	}
@@ -790,23 +787,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)
 		{
@@ -819,9 +816,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);
 			}
 		}
@@ -841,9 +838,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);
@@ -851,10 +848,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);
 			}
@@ -867,7 +864,7 @@ 
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
 		if(!$property->getLazyLoad())
-			$this->_selectQueue[] = $postSelect;
+			$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)))
+		$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);
 		}
 	}
 
@@ -906,30 +903,30 @@ 
 	 */
 	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()
 	{
 		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";
-		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);
 	}
 }
 
@@ -948,20 +945,20 @@ 
 	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; }
 }
 
 /**
@@ -980,22 +977,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;
 	}
 
 	/**
@@ -1009,22 +1006,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);
 		}
 	}
@@ -1038,20 +1035,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;
@@ -1073,9 +1070,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;
 	}
@@ -1087,14 +1084,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
@@ -1114,17 +1111,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');
@@ -1133,8 +1130,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;
 	}
 
 	/**
@@ -1147,11 +1144,11 @@ 
 
 	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);
 	}
 }
 
@@ -1170,9 +1167,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()
@@ -1207,10 +1204,10 @@ 
 
 	public function __construct($key, $value, $parameter, &$map)
 	{
-		$this->_key = $key;
-		$this->_value = $value;
-		$this->_parameterObject = $parameter;
-		$this->_map = &$map;
+		$this->_key=$key;
+		$this->_value=$value;
+		$this->_parameterObject=$parameter;
+		$this->_map=&$map;
 	}
 
 	public function getKey()

Braces +18 added lines, -32 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,8 +339,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;
@@ -357,8 +354,7 @@ 
 				}
 				$object->$method($this,$param);
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
@@ -520,8 +516,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);
@@ -651,8 +646,7 @@ 
 			else
 				foreach($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -797,8 +791,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);
 
@@ -807,8 +800,7 @@ 
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
-		}
-		else if($nested!==null)
+		} else if($nested!==null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
@@ -816,16 +808,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);
 		}
@@ -857,11 +847,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);
@@ -889,8 +877,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry=$this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry,$row);
@@ -1048,8 +1035,7 @@ 
 			{
 				$found = true;
 				$childs[$key][$node] = array();
-			}
-			else
+			} else
 			{
 				$found = $found || $this->addNode($childs[$key], $parent, $node);
 			}
@@ -1062,8 +1048,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();
 	}
 
@@ -1096,8 +1083,7 @@ 
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
-			}
-			else
+			} else
 				$this->collectChildren($key, $nodes[$key]);
 		}
 		if(count($childs) > 0)

framework/Data/SqlMap/Statements/TPreparedCommand.php

Doc Comments +6 added lines

@@ -21,6 +21,9 @@ 
  */
 class TPreparedCommand
 {
+	/**
+	 * @param TSqlMapStatement $statement
+	 */
 	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject,$skip=null,$max=null)
 	{
 		$sqlText = $statement->getSQLText();
@@ -43,6 +46,9 @@ 
 		return $command;
 	}
 
+	/**
+	 * @param TSqlMapManager $manager
+	 */
 	protected function applyParameterMap($manager,$command,$prepared, $statement, $parameterObject)
 	{
 		$properties = $prepared->getParameterNames(false);

Spacing +18 added lines, -18 removed lines

@@ -21,45 +21,45 @@
  */
 class TPreparedCommand
 {
-	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject,$skip=null,$max=null)
+	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject, $skip=null, $max=null)
 	{
-		$sqlText = $statement->getSQLText();
+		$sqlText=$statement->getSQLText();
 
-		$prepared = $sqlText->getPreparedStatement($parameterObject);
+		$prepared=$sqlText->getPreparedStatement($parameterObject);
 		$connection->setActive(true);
-		$sql = $prepared->getPreparedSql();
+		$sql=$prepared->getPreparedSql();
 
 		if($sqlText instanceof TSimpleDynamicSql)
-			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
+			$sql=$sqlText->replaceDynamicParameter($sql, $parameterObject);
 
 		if($max!==null || $skip!==null)
 		{
-			$builder = TDbMetaData::getInstance($connection)->createCommandBuilder();
-			$sql = $builder->applyLimitOffset($sql,$max,$skip);
+			$builder=TDbMetaData::getInstance($connection)->createCommandBuilder();
+			$sql=$builder->applyLimitOffset($sql, $max, $skip);
 		}
-		$command = $connection->createCommand($sql);
+		$command=$connection->createCommand($sql);
 		$this->applyParameterMap($manager, $command, $prepared, $statement, $parameterObject);
 
 		return $command;
 	}
 
-	protected function applyParameterMap($manager,$command,$prepared, $statement, $parameterObject)
+	protected function applyParameterMap($manager, $command, $prepared, $statement, $parameterObject)
 	{
-		$properties = $prepared->getParameterNames(false);
+		$properties=$prepared->getParameterNames(false);
 		//$parameters = $prepared->getParameterValues();
 		$registry=$manager->getTypeHandlers();
-		if ($properties)
-		for($i = 0, $k=$properties->getCount(); $i<$k; $i++)
+		if($properties)
+		for($i=0, $k=$properties->getCount(); $i < $k; $i++)
 		{
-			$property = $statement->parameterMap()->getProperty($i);
-			$value = $statement->parameterMap()->getPropertyValue($registry,$property, $parameterObject);
-			$dbType = $property->getDbType();
+			$property=$statement->parameterMap()->getProperty($i);
+			$value=$statement->parameterMap()->getPropertyValue($registry, $property, $parameterObject);
+			$dbType=$property->getDbType();
 			if($dbType=='') //relies on PHP lax comparison
-				$command->bindValue($i+1,$value, TDbCommandBuilder::getPdoType($value));
+				$command->bindValue($i + 1, $value, TDbCommandBuilder::getPdoType($value));
 			else if(strpos($dbType, 'PDO::')===0)
-				$command->bindValue($i+1,$value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
+				$command->bindValue($i + 1, $value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
 			else
-				$command->bindValue($i+1,$value);
+				$command->bindValue($i + 1, $value);
 		}
 	}
 }

framework/Data/SqlMap/TSqlMapConfig.php

Doc Comments +1 added lines

@@ -77,6 +77,7 @@
 
 	/**
 	 * Saves the current SqlMap manager to cache.
+	 * @param TSqlMapManager $manager
 	 * @return boolean true if SqlMap manager was cached, false otherwise.
 	 */
 	protected function cacheSqlMapManager($manager)

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;

Spacing +19 added lines, -19 removed lines

@@ -44,8 +44,8 @@ 
 	 */
 	public function clearCache()
 	{
-		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		$cache=$this->getApplication()->getCache();
+		if($cache!==null) {
 			$cache->delete($this->getCacheKey());
 		}
 	}
@@ -60,16 +60,16 @@ 
 	 */
 	public function getSqlMapManager() {
 		Prado::using('System.Data.SqlMap.TSqlMapManager');
-		if(($manager = $this->loadCachedSqlMapManager())===null)
+		if(($manager=$this->loadCachedSqlMapManager())===null)
 		{
-			$manager = new TSqlMapManager($this->getDbConnection());
+			$manager=new TSqlMapManager($this->getDbConnection());
 			if(strlen($file=$this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif($this->getConnectionID()!=='') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -83,11 +83,11 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null) {
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					$dependencies=$manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -102,10 +102,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TSqlMapManager)
 					return $manager;
 			}
@@ -132,11 +132,11 @@ 
 			$this->_configFile=$value;
 		else
 		{
-			$file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid',$value);
+			$file=Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
+			if($file===null || !is_file($file))
+				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
 			else
-				$this->_configFile = $file;
+				$this->_configFile=$file;
 		}
 	}
 
@@ -146,7 +146,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap===null )
+		if($this->_sqlmap===null)
 			$this->_sqlmap=$this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}

Indentation +8 added lines, -8 removed lines

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

framework/Data/SqlMap/TSqlMapManager.php

Doc Comments +5 added lines

@@ -55,6 +55,7 @@ 
 	 * Constructor, create a new SqlMap manager.
 	 * @param TDbConnection database connection
 	 * @param string configuration file.
+	 * @param TDbConnection $connection
 	 */
 	public function __construct($connection=null)
 	{
@@ -68,6 +69,7 @@ 
 
 	/**
 	 * @param TDbConnection default database connection
+	 * @param TComponent $conn
 	 */
 	public function setDbConnection($conn)
 	{
@@ -105,6 +107,7 @@ 
 	/**
 	 * Loads and parses the SqlMap configuration file.
 	 * @param string xml configuration file.
+	 * @param string $file
 	 */
 	public function configureXml($file)
 	{
@@ -180,6 +183,7 @@ 
 	/**
 	 * Gets a named result map
 	 * @param string result name.
+	 * @param string $name
 	 * @return TResultMap the result map.
 	 * @throws TSqlMapUndefinedException
 	 */
@@ -212,6 +216,7 @@ 
 
 	/**
 	 * @param string parameter map ID name.
+	 * @param string $name
 	 * @return TParameterMap the parameter with given ID.
 	 * @throws TSqlMapUndefinedException
 	 */

Spacing +12 added lines, -12 removed lines

@@ -88,7 +88,7 @@ 
 	public function getTypeHandlers()
 	{
 		if($this->_typeHandlers===null)
-			$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+			$this->_typeHandlers=new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function configureXml($file)
 	{
-		$config = new TSqlMapXmlConfiguration($this);
+		$config=new TSqlMapXmlConfiguration($this);
 		$config->configure($file);
 	}
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
+		if($this->_cacheDependencies===null)
 			$this->_cacheDependencies=new TChainedCacheDependency();
 
 		return $this->_cacheDependencies;
@@ -150,7 +150,7 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
+		if($this->_mappedStatements->contains($name)==false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
 		return $this->_mappedStatements[$name];
 	}
@@ -163,8 +163,8 @@ 
 	 */
 	public function addMappedStatement(IMappedStatement $statement)
 	{
-		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		$key=$statement->getID();
+		if($this->_mappedStatements->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
 		$this->_mappedStatements->add($key, $statement);
 	}
@@ -185,7 +185,7 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
+		if($this->_resultMaps->contains($name)==false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
 		return $this->_resultMaps[$name];
 	}
@@ -196,8 +196,8 @@ 
 	 */
 	public function addResultMap(TResultMap $result)
 	{
-		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		$key=$result->getID();
+		if($this->_resultMaps->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
 		$this->_resultMaps->add($key, $result);
 	}
@@ -217,7 +217,7 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
+		if($this->_parameterMaps->contains($name)==false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
 		return $this->_parameterMaps[$name];
 	}
@@ -228,8 +228,8 @@ 
 	 */
 	public function addParameterMap(TParameterMap $parameter)
 	{
-		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		$key=$parameter->getID();
+		if($this->_parameterMaps->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}

Indentation +8 added lines, -8 removed lines

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

framework/Data/TDataSourceConfig.php

Doc Comments +1 added lines

@@ -149,6 +149,7 @@
 	/**
 	 * Finds the database connection instance from the Application modules.
 	 * @param string Database connection module ID.
+	 * @param string $id
 	 * @return TDbConnection database connection.
 	 * @throws TConfigurationException when module is not of TDbConnection or TDataSourceConfig.
 	 */

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 			{
 				$db=$this->getDbConnection();
 				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+					$db->setSubProperty($name, $value);
 			}
 		}
 		else
@@ -71,7 +71,7 @@ 
 			{
 				$db=$this->getDbConnection();
 				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+					$db->setSubproperty($name, $value);
 			}
 		}
 	}
@@ -106,9 +106,9 @@ 
 		if($this->_conn===null)
 		{
 			if($this->_connID!=='')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
+				$this->_conn=$this->findConnectionByID($this->getConnectionID());
 			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+				$this->_conn=Prado::createComponent($this->getConnectionClass());
 		}
 		return $this->_conn;
 	}
@@ -154,12 +154,12 @@ 
 	 */
 	protected function findConnectionByID($id)
 	{
-		$conn = $this->getApplication()->getModule($id);
+		$conn=$this->getApplication()->getModule($id);
 		if($conn instanceof TDbConnection)
 			return $conn;
 		else if($conn instanceof TDataSourceConfig)
 			return $conn->getDbConnection();
 		else
-			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+			throw new TConfigurationException('datasource_dbconnection_invalid', $id);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

framework/Data/TDbConnection.php

Doc Comments +4 added lines

@@ -157,6 +157,7 @@ 
 	/**
 	 * Open or close the DB connection.
 	 * @param boolean whether to open or close DB connection
+	 * @param boolean $value
 	 * @throws TDbException if connection fails
 	 */
 	public function setActive($value)
@@ -241,6 +242,7 @@ 
 
 	/**
 	 * @param string The Data Source Name, or DSN, contains the information required to connect to the database.
+	 * @param string $value
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
 	public function setConnectionString($value)
@@ -258,6 +260,7 @@ 
 
 	/**
 	 * @param string the username for establishing DB connection
+	 * @param string $value
 	 */
 	public function setUsername($value)
 	{
@@ -274,6 +277,7 @@ 
 
 	/**
 	 * @param string the password for establishing DB connection
+	 * @param string $value
 	 */
 	public function setPassword($value)
 	{

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active=true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed',$e->getMessage());
 			}
@@ -343,8 +342,7 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
-		}
-		else
+		} else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
 

Spacing +24 added lines, -24 removed lines

@@ -85,7 +85,7 @@ 
 	 *
 	 * @since 3.1.7
 	 */
-	const DEFAULT_TRANSACTION_CLASS = 'System.Data.TDbTransaction';
+	const DEFAULT_TRANSACTION_CLASS='System.Data.TDbTransaction';
 
 	private $_dsn='';
 	private $_username='';
@@ -99,7 +99,7 @@ 
 	/**
 	 * @var TDbMetaData
 	 */
-	private $_dbMeta = null;
+	private $_dbMeta=null;
 
 	/**
 	 * @var string
@@ -120,7 +120,7 @@ 
 	 * @param string Charset used for DB Connection (MySql & pgsql only). If not set, will use the default charset of your database server
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
-	public function __construct($dsn='',$username='',$password='', $charset='')
+	public function __construct($dsn='', $username='', $password='', $charset='')
 	{
 		$this->_dsn=$dsn;
 		$this->_username=$username;
@@ -134,7 +134,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(),array("\0TDbConnection\0_pdo","\0TDbConnection\0_active"));
+		return array_diff(parent::__sleep(), array("\0TDbConnection\0_pdo", "\0TDbConnection\0_active"));
 	}
 
 	/**
@@ -181,8 +181,8 @@ 
 		{
 			try
 			{
-				$this->_pdo=new PDO($this->getConnectionString(),$this->getUsername(),
-									$this->getPassword(),$this->_attributes);
+				$this->_pdo=new PDO($this->getConnectionString(), $this->getUsername(),
+									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
 				@$this->_pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
@@ -192,7 +192,7 @@ 
 			}
 			catch(PDOException $e)
 			{
-				throw new TDbException('dbconnection_open_failed',$e->getMessage());
+				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
 		}
 	}
@@ -214,16 +214,16 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
+		if($this->_charset==='' || $this->_active===false)
 			return;
-		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
+		switch($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
 			case 'sqlite':
-				$stmt = $this->_pdo->prepare('SET NAMES ?');
+				$stmt=$this->_pdo->prepare('SET NAMES ?');
 			break;
 			case 'pgsql':
-				$stmt = $this->_pdo->prepare('SET client_encoding TO ?');
+				$stmt=$this->_pdo->prepare('SET client_encoding TO ?');
 			break;
 			default:
 				throw new TDbException('dbconnection_unsupported_driver_charset', $driver);
@@ -283,7 +283,7 @@ 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -291,7 +291,7 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
 		$this->_charset=$value;
 		$this->setConnectionCharset();
@@ -314,7 +314,7 @@ 
 	public function createCommand($sql)
 	{
 		if($this->getActive())
-			return new TDbCommand($this,$sql);
+			return new TDbCommand($this, $sql);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
@@ -364,7 +364,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass=(string) $value;
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 		if($this->_dbMeta===null)
 		{
 			Prado::using('System.Data.Common.TDbMetaData');
-			$this->_dbMeta = TDbMetaData::getInstance($this);
+			$this->_dbMeta=TDbMetaData::getInstance($this);
 		}
 		return $this->_dbMeta;
 	}
@@ -459,7 +459,7 @@ 
 	 */
 	public function setColumnCase($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbColumnCaseMode'))
+		switch(TPropertyValue::ensureEnum($value, 'TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
 				$value=PDO::CASE_NATURAL;
@@ -471,7 +471,7 @@ 
 				$value=PDO::CASE_UPPER;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_CASE,$value);
+		$this->setAttribute(PDO::ATTR_CASE, $value);
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 	 */
 	public function setNullConversion($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbNullConversionMode'))
+		switch(TPropertyValue::ensureEnum($value, 'TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
 				$value=PDO::NULL_NATURAL;
@@ -507,7 +507,7 @@ 
 				$value=PDO::NULL_TO_STRING;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_ORACLE_NULLS,$value);
+		$this->setAttribute(PDO::ATTR_ORACLE_NULLS, $value);
 	}
 
 	/**
@@ -525,7 +525,7 @@ 
 	 */
 	public function setAutoCommit($value)
 	{
-		$this->setAttribute(PDO::ATTR_AUTOCOMMIT,TPropertyValue::ensureBoolean($value));
+		$this->setAttribute(PDO::ATTR_AUTOCOMMIT, TPropertyValue::ensureBoolean($value));
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	public function setPersistent($value)
 	{
-		return $this->setAttribute(PDO::ATTR_PERSISTENT,TPropertyValue::ensureBoolean($value));
+		return $this->setAttribute(PDO::ATTR_PERSISTENT, TPropertyValue::ensureBoolean($value));
 	}
 
 	/**
@@ -623,10 +623,10 @@ 
 	 * @param mixed the attribute value
 	 * @see http://www.php.net/manual/en/function.PDO-setAttribute.php
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
 		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name,$value);
+			$this->_pdo->setAttribute($name, $value);
 		else
 			$this->_attributes[$name]=$value;
 	}

framework/Data/TDbTransaction.php

Doc Comments +1 added lines

@@ -101,6 +101,7 @@
 
 	/**
 	 * @param boolean whether this transaction is active
+	 * @param boolean $value
 	 */
 	protected function setActive($value)
 	{

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/I18N/core/CultureInfo.php

Doc Comments +6 added lines

@@ -200,6 +200,7 @@ 
 
 	/**
 	* Gets the CultureInfo that for this culture string
+	* @param string $culture
 	* @return CultureInfo invariant culture info is "en".
 	*/
 	public static function getInstance($culture)
@@ -228,6 +229,7 @@ 
 	 * Set the culture for the current instance. The culture indentifier
 	 * must be of the form "<language>_(country/region)".
 	 * @param string culture identifier, e.g. "fr_FR_EURO".
+	 * @param string $culture
 	 */
 	protected function setCulture($culture)
 	{
@@ -243,6 +245,7 @@ 
 	/**
 	 * Load the ICU culture data for the specific culture identifier.
 	 * @param string the culture identifier.
+	 * @param string $culture
 	 */
 	protected function loadCultureData($culture)
 	{
@@ -283,6 +286,7 @@ 
 	 * The data files are cached in a static variable inside
 	 * this function.
 	 * @param string the ICU data filename
+	 * @param string $filename
 	 * @return array ICU data
 	 */
 	protected function &getData($filename)
@@ -386,6 +390,7 @@ 
 	/**
 	 * Set the date time format information.
 	 * @param DateTimeFormatInfo the new date time format info.
+	 * @param DateTimeFormatInfo $dateTimeFormat
 	 */
 	function setDateTimeFormat($dateTimeFormat)
 	{
@@ -493,6 +498,7 @@ 
 	/**
 	 * Set the number format information.
 	 * @param NumberFormatInfo the new number format info.
+	 * @param NumberFormatInfo $numberFormat
 	 */
 	function setNumberFormat($numberFormat)
 	{

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();

Spacing +91 added lines, -91 removed lines

@@ -51,13 +51,13 @@ 
 	 * ICU data filename extension.
 	 * @var string
 	 */
-	private $dataFileExt = '.dat';
+	private $dataFileExt='.dat';
 
 	/**
 	 * The ICU data array.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * The current culture.
@@ -75,7 +75,7 @@ 
 	 * A list of ICU date files loaded.
 	 * @var array
 	 */
-	private $dataFiles = array();
+	private $dataFiles=array();
 
 	/**
 	 * The current date time format info.
@@ -93,28 +93,28 @@ 
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Culture type, all.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const ALL = 0;
+	const ALL=0;
 
 	/**
 	 * Culture type, neutral.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const NEUTRAL = 1;
+	const NEUTRAL=1;
 
 	/**
 	 * Culture type, specific.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const SPECIFIC = 2;
+	const SPECIFIC=2;
 
 	/**
 	 * Display the culture name.
@@ -134,7 +134,7 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -147,7 +147,7 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -165,13 +165,13 @@ 
 	 */
 	function __construct($culture='en')
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($culture))
-			$culture = 'en';
+			$culture='en';
 
-		$this->dataDir = $this->dataDir();
-		$this->dataFileExt = $this->fileExt();
+		$this->dataDir=$this->dataDir();
+		$this->dataFileExt=$this->fileExt();
 
 		$this->setCulture($culture);
 
@@ -204,9 +204,9 @@ 
 	*/
 	public static function getInstance($culture)
 	{
-		static $instances = array();
+		static $instances=array();
 		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+			$instances[$culture]=new CultureInfo($culture);
 		return $instances[$culture];
 	}
 
@@ -233,11 +233,11 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
-				throw new Exception('Invalid culture supplied: ' . $culture);
+			if(!preg_match('/^[_\\w]+$/', $culture))
+				throw new Exception('Invalid culture supplied: '.$culture);
 		}
 
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}
 
 	/**
@@ -246,30 +246,30 @@ 
 	 */
 	protected function loadCultureData($culture)
 	{
-		$file_parts = explode('_',$culture);
-		$current_part = $file_parts[0];
+		$file_parts=explode('_', $culture);
+		$current_part=$file_parts[0];
 
-		$files = array($current_part);
+		$files=array($current_part);
 
-		for($i = 1, $k = count($file_parts); $i < $k; ++$i)
+		for($i=1, $k=count($file_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$file_parts[$i];
-			$files[] = $current_part;
+			$current_part.='_'.$file_parts[$i];
+			$files[]=$current_part;
 		}
 
 		foreach($files as $file)
 		{
-			$filename = $this->dataDir.$file.$this->dataFileExt;
+			$filename=$this->dataDir.$file.$this->dataFileExt;
 
-			if(is_file($filename) == false)
+			if(is_file($filename)==false)
 				throw new Exception('Data file for "'.$file.'" was not found.');
 
-			if(in_array($filename, $this->dataFiles) === false)
+			if(in_array($filename, $this->dataFiles)===false)
 			{
 				array_unshift($this->dataFiles, $file);
 
-				$data = &$this->getData($filename);
-				$this->data[$file] = &$data;
+				$data=&$this->getData($filename);
+				$this->data[$file]=&$data;
 
 				if(isset($data['__ALIAS']))
 					$this->loadCultureData($data['__ALIAS'][0]);
@@ -287,13 +287,13 @@ 
 	 */
 	protected function &getData($filename)
 	{
-		static $data = array();
-		static $files = array();
+		static $data=array();
+		static $files=array();
 
 		if(!in_array($filename, $files))
 		{
-			$data[$filename] = unserialize(file_get_contents($filename));
-			$files[] = $filename;
+			$data[$filename]=unserialize(file_get_contents($filename));
+			$files[]=$filename;
 		}
 
 		return $data[$filename];
@@ -315,15 +315,15 @@ 
 	 */
 	protected function findInfo($path='/', $merge=false)
 	{
-		$result = array();
+		$result=array();
 		foreach($this->dataFiles as $section)
 		{
-			$info = $this->searchArray($this->data[$section], $path);
+			$info=$this->searchArray($this->data[$section], $path);
 
 			if($info)
 			{
 				if($merge)
-					$result = array_merge($info,$result);
+					$result=array_merge($info, $result);
 				else
 					return $info;
 			}
@@ -342,16 +342,16 @@ 
 	 */
 	private function searchArray($info, $path='/')
 	{
-		$index = explode('/',$path);
+		$index=explode('/', $path);
 
-		$array = $info;
+		$array=$info;
 
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for($i=0, $k=count($index); $i < $k; ++$i)
 		{
-			$value = $index[$i];
-			if($i < $k-1 && isset($array[$value]))
-				$array = $array[$value];
-			else if ($i == $k-1 && isset($array[$value]))
+			$value=$index[$i];
+			if($i < $k - 1 && isset($array[$value]))
+				$array=$array[$value];
+			else if($i==$k - 1 && isset($array[$value]))
 				return $array[$value];
 		}
 	}
@@ -373,10 +373,10 @@ 
 	 */
 	function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if($this->dateTimeFormat===null)
 		{
-			$calendar = $this->getCalendar();
-			$info = $this->findInfo("calendar/{$calendar}", true);
+			$calendar=$this->getCalendar();
+			$info=$this->findInfo("calendar/{$calendar}", true);
 			$this->setDateTimeFormat(new DateTimeFormatInfo($info));
 		}
 
@@ -389,7 +389,7 @@ 
 	 */
 	function setDateTimeFormat($dateTimeFormat)
 	{
-		$this->dateTimeFormat = $dateTimeFormat;
+		$this->dateTimeFormat=$dateTimeFormat;
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	function getCalendar()
 	{
-		$info = $this->findInfo('calendar/default');
+		$info=$this->findInfo('calendar/default');
 		return $info[0];
 	}
 
@@ -410,10 +410,10 @@ 
 	 */
 	function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$language = $this->findInfo("Languages/{$lang}");
-		$region = $this->findInfo("Countries/{$reg}");
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$language=$this->findInfo("Languages/{$lang}");
+		$region=$this->findInfo("Countries/{$reg}");
 		if($region)
 			return $language[0].' ('.$region[0].')';
 		else
@@ -428,15 +428,15 @@ 
 	 */
 	function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$culture = $this->getInvariantCulture();
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$culture=$this->getInvariantCulture();
 
-		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		$language=$culture->findInfo("Languages/{$lang}");
+		if(count($language)==0)
 			return $this->culture;
 
-		$region = $culture->findInfo("Countries/{$reg}");
+		$region=$culture->findInfo("Countries/{$reg}");
 		if($region)
 			return $language[0].' ('.$region[0].')';
 		else
@@ -453,8 +453,8 @@ 
 	static function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant===null)
+			$invariant=new CultureInfo();
 		return $invariant;
 	}
 
@@ -466,7 +466,7 @@ 
 	 */
 	function getIsNeutralCulture()
 	{
-		return strlen($this->culture) == 2;
+		return strlen($this->culture)==2;
 	}
 
 	/**
@@ -476,12 +476,12 @@ 
 	 */
 	function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if($this->numberFormat===null)
 		{
-			$elements = $this->findInfo('NumberElements');
-			$patterns = $this->findInfo('NumberPatterns');
-			$currencies = $this->getCurrencies();
-			$data = array(	'NumberElements'=>$elements,
+			$elements=$this->findInfo('NumberElements');
+			$patterns=$this->findInfo('NumberPatterns');
+			$currencies=$this->getCurrencies();
+			$data=array('NumberElements'=>$elements,
 							'NumberPatterns'=>$patterns,
 							'Currencies' => $currencies);
 
@@ -496,7 +496,7 @@ 
 	 */
 	function setNumberFormat($numberFormat)
 	{
-		$this->numberFormat = $numberFormat;
+		$this->numberFormat=$numberFormat;
 	}
 
 	/**
@@ -506,10 +506,10 @@ 
 	 */
 	function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if(strlen($this->culture)==2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture,0,2);
+		$lang=substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -524,24 +524,24 @@ 
 	 */
 	static function getCultures($type=CultureInfo::ALL)
 	{
-		$dataDir = CultureInfo::dataDir();
-		$dataExt = CultureInfo::fileExt();
-		$dir = dir($dataDir);
+		$dataDir=CultureInfo::dataDir();
+		$dataExt=CultureInfo::fileExt();
+		$dir=dir($dataDir);
 
-		$neutral = array();
-		$specific = array();
+		$neutral=array();
+		$specific=array();
 
-		while (false !== ($entry = $dir->read()))
+		while(false!==($entry=$dir->read()))
 		{
 			if(is_file($dataDir.$entry)
-				&& substr($entry,-4) == $dataExt
-				&& $entry != 'root'.$dataExt)
+				&& substr($entry, -4)==$dataExt
+				&& $entry!='root'.$dataExt)
 			{
-				$culture = substr($entry,0,-4);
-				if(strlen($culture) == 2)
-					$neutral[] = $culture;
+				$culture=substr($entry, 0, -4);
+				if(strlen($culture)==2)
+					$neutral[]=$culture;
 				else
-					$specific[] = $culture;
+					$specific[]=$culture;
 			}
 		}
 		$dir->close();
@@ -549,7 +549,7 @@ 
 		switch($type)
 		{
 			case CultureInfo::ALL :
-				$all = 	array_merge($neutral, $specific);
+				$all=array_merge($neutral, $specific);
 				sort($all);
 				return $all;
 				break;
@@ -571,12 +571,12 @@ 
 	 */
 	private function simplify($array)
 	{
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for($i=0, $k=count($array); $i < $k; ++$i)
 		{
-			$key = key($array);
+			$key=key($array);
 			if(is_array($array[$key])
-				&& count($array[$key]) == 1)
-				$array[$key] = $array[$key][0];
+				&& count($array[$key])==1)
+				$array[$key]=$array[$key][0];
 			next($array);
 		}
 		return $array;
@@ -588,7 +588,7 @@ 
 	 */
 	function getCountries()
 	{
-		return $this->simplify($this->findInfo('Countries',true));
+		return $this->simplify($this->findInfo('Countries', true));
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 */
 	function getCurrencies()
 	{
-		return $this->findInfo('Currencies',true);
+		return $this->findInfo('Currencies', true);
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	function getLanguages()
 	{
-		return $this->simplify($this->findInfo('Languages',true));
+		return $this->simplify($this->findInfo('Languages', true));
 	}
 
 	/**
@@ -615,7 +615,7 @@ 
 	 */
 	function getScripts()
 	{
-		return $this->simplify($this->findInfo('Scripts',true));
+		return $this->simplify($this->findInfo('Scripts', true));
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	function getTimeZones()
 	{
-		return $this->simplify($this->findInfo('zoneStrings',true));
+		return $this->simplify($this->findInfo('zoneStrings', true));
 	}
 }