pradosoft / prado

framework/Data/SqlMap/Statements/TMappedStatement.php

Doc Comments +14 added lines, -1 removed lines

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

Spacing +147 added lines, -150 removed lines

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

Braces +173 added lines, -134 removed lines

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

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

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

Braces +16 added lines, -9 removed lines

@@ -29,8 +29,9 @@ 
 		$connection->setActive(true);
 		$sql = $prepared->getPreparedSql();
 
-		if($sqlText instanceof TSimpleDynamicSql)
-			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
+		if($sqlText instanceof TSimpleDynamicSql) {
+					$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
+		}
 
 		if($max!==null || $skip!==null)
 		{
@@ -48,18 +49,24 @@ 
 		$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();
-			if($dbType=='') //relies on PHP lax comparison
+			if($dbType=='') {
+				//relies on PHP lax comparison
 				$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
-			else
-				$command->bindValue($i+1,$value);
+			} else if(strpos($dbType, 'PDO::')===0) {
+							$command->bindValue($i+1,$value, constant($property->getDbType()));
+			}
+			//assumes PDO types, e.g. PDO::PARAM_INT
+			else {
+							$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)

Spacing +20 added lines, -20 removed lines

@@ -24,19 +24,19 @@ 
 {
 	private $_configFile;
 	private $_sqlmap;
-	private $_enableCache=false;
+	private $_enableCache = false;
 
 	/**
 	 * File extension of external configuration file
 	 */
-	const CONFIG_FILE_EXT='.xml';
+	const CONFIG_FILE_EXT = '.xml';
 
 	/**
 	 * @return string module ID + configuration file path.
 	 */
 	private function getCacheKey()
 	{
-		return $this->getID().$this->getConfigFile();
+		return $this->getID() . $this->getConfigFile();
 	}
 
 	/**
@@ -45,7 +45,7 @@ 
 	public function clearCache()
 	{
 		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		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());
-			if(strlen($file=$this->getConfigFile()) > 0)
+			if (strlen($file = $this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif ($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -81,12 +81,12 @@ 
 	 */
 	protected function cacheSqlMapManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
+			if ($cache !== null) {
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					$dependencies = $manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -100,13 +100,13 @@ 
 	 */
 	protected function loadCachedSqlMapManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TSqlMapManager)
+				if ($manager instanceof TSqlMapManager)
 					return $manager;
 			}
 		}
@@ -128,13 +128,13 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(is_file($value))
-			$this->_configFile=$value;
+		if (is_file($value))
+			$this->_configFile = $value;
 		else
 		{
-			$file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid',$value);
+			$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;
 		}
@@ -171,8 +171,8 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap===null )
-			$this->_sqlmap=$this->createSqlMapGateway();
+		if ($this->_sqlmap === null)
+			$this->_sqlmap = $this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}
 }

Braces +18 added lines, -15 removed lines

@@ -68,8 +68,7 @@ 
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -86,8 +85,9 @@ 
 			$cache = $this->getApplication()->getCache();
 			if($cache !== null) {
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									$dependencies = $manager->getCacheDependencies();
+				}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -106,8 +106,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TSqlMapManager)
-					return $manager;
+				if($manager instanceof TSqlMapManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -128,15 +129,16 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(is_file($value))
-			$this->_configFile=$value;
-		else
+		if(is_file($value)) {
+					$this->_configFile=$value;
+		} else
 		{
 			$file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid',$value);
-			else
-				$this->_configFile = $file;
+			if($file === null || !is_file($file)) {
+							throw new TConfigurationException('sqlmap_configfile_invalid',$value);
+			} else {
+							$this->_configFile = $file;
+			}
 		}
 	}
 
@@ -171,8 +173,9 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap===null )
-			$this->_sqlmap=$this->createSqlMapGateway();
+		if($this->_sqlmap===null ) {
+					$this->_sqlmap=$this->createSqlMapGateway();
+		}
 		return $this->_sqlmap;
 	}
 }

framework/Data/SqlMap/TSqlMapGateway.php

Doc Comments +16 added lines

@@ -32,6 +32,9 @@ 
 	 */
 	private $_manager;
 
+	/**
+	 * @param TSqlMapManager|null $manager
+	 */
 	public function __construct($manager)
 	{
 		$this->_manager=$manager;
@@ -63,6 +66,8 @@ 
 	 * @param string The name of the sql statement to execute.
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param mixed An object of the type to be returned.
+	 * @param string $statementName
+	 * @param Account $result
 	 * @return object A single result object populated with the result set data.
 	 */
 	public function queryForObject($statementName, $parameter=null, $result=null)
@@ -84,6 +89,8 @@ 
 	 * pass in null if want to return a list instead.
 	 * @param int The number of rows to skip over.
 	 * @param int The maximum number of rows to return.
+	 * @param string $statementName
+	 * @param AccountCollection $result
 	 * @return TList A List of result objects.
 	 */
 	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
@@ -105,6 +112,7 @@ 
 	 * pass in null if want to return a list instead.
 	 * @param int The number of rows to skip over.
 	 * @param int The maximum number of rows to return.
+	 * @param string $statementName
 	 * @return TList A List of result objects.
 	 */
 	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
@@ -121,6 +129,7 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param integer The maximum number of objects to store in each page.
 	 * @param integer The number of the page to initially load into the list.
+	 * @param string $statementName
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
@@ -161,6 +170,9 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param string The property of the result object to be used as the key.
 	 * @param string The property of the result object to be used as the value.
+	 * @param string $statementName
+	 * @param string $keyProperty
+	 * @param string $valueProperty
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
 	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
@@ -180,6 +192,8 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param string The property of the result object to be used as the key.
 	 * @param string The property of the result object to be used as the value.
+	 * @param string $statementName
+	 * @param string $keyProperty
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
 	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
@@ -200,6 +214,7 @@ 
 	 *
 	 * @param string The name of the statement to execute.
 	 * @param string The parameter object.
+	 * @param string $statementName
 	 * @return mixed The primary key of the newly inserted row.
 	 * This might be automatically generated by the RDBMS,
 	 * or selected from a sequence table or other source.
@@ -233,6 +248,7 @@ 
 	 * Executes a Sql DELETE statement.  Delete returns the number of rows effected.
 	 * @param string The name of the statement to execute.
 	 * @param mixed The parameter object.
+	 * @param string $statementName
 	 * @return integer The number of rows effected.
 	 */
 	public function delete($statementName, $parameter=null)

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 
 	public function __construct($manager)
 	{
-		$this->_manager=$manager;
+		$this->_manager = $manager;
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 * @param mixed An object of the type to be returned.
 	 * @return object A single result object populated with the result set data.
 	 */
-	public function queryForObject($statementName, $parameter=null, $result=null)
+	public function queryForObject($statementName, $parameter = null, $result = null)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
@@ -86,10 +86,10 @@ 
 	 * @param int The maximum number of rows to return.
 	 * @return TList A List of result objects.
 	 */
-	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
+	public function queryForList($statementName, $parameter = null, $result = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return $statement->executeQueryForList($this->getDbConnection(),$parameter, $result, $skip, $max);
+		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 * @param int The maximum number of rows to return.
 	 * @return TList A List of result objects.
 	 */
-	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
+	public function queryWithRowDelegate($statementName, $delegate, $parameter = null, $result = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
@@ -123,7 +123,7 @@ 
 	 * @param integer The number of the page to initially load into the list.
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
-	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
+	public function queryForPagedList($statementName, $parameter = null, $pageSize = 10, $page = 0)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, null, $page);
@@ -144,10 +144,10 @@ 
 	 * @param integer The number of the page to initially load into the list.
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
-	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
+	public function queryForPagedListWithRowDelegate($statementName, $delegate, $parameter = null, $pageSize = 10, $page = 0)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate,$page);
+		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
 	}
 
 
@@ -163,7 +163,7 @@ 
 	 * @param string The property of the result object to be used as the value.
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
-	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
+	public function queryForMap($statementName, $parameter = null, $keyProperty = null, $valueProperty = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
@@ -182,7 +182,7 @@ 
 	 * @param string The property of the result object to be used as the value.
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
-	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
+	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter = null, $keyProperty = null, $valueProperty = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
@@ -204,7 +204,7 @@ 
 	 * This might be automatically generated by the RDBMS,
 	 * or selected from a sequence table or other source.
 	 */
-	public function insert($statementName, $parameter=null)
+	public function insert($statementName, $parameter = null)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
@@ -223,7 +223,7 @@ 
 	 * @param mixed The parameter object.
 	 * @return integer The number of rows effected.
 	 */
-	public function update($statementName, $parameter=null)
+	public function update($statementName, $parameter = null)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
@@ -235,7 +235,7 @@ 
 	 * @param mixed The parameter object.
 	 * @return integer The number of rows effected.
 	 */
-	public function delete($statementName, $parameter=null)
+	public function delete($statementName, $parameter = null)
 	{
 		return $this->update($statementName, $parameter);
 	}

Indentation +8 added lines, -8 removed lines

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

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

@@ -56,14 +56,14 @@ 
 	 * @param TDbConnection database connection
 	 * @param string configuration file.
 	 */
-	public function __construct($connection=null)
+	public function __construct($connection = null)
 	{
-		$this->_connection=$connection;
+		$this->_connection = $connection;
 
-		$this->_mappedStatements=new TMap;
-		$this->_resultMaps=new TMap;
-		$this->_parameterMaps=new TMap;
-		$this->_cacheModels=new TMap;
+		$this->_mappedStatements = new TMap;
+		$this->_resultMaps = new TMap;
+		$this->_parameterMaps = new TMap;
+		$this->_cacheModels = new TMap;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setDbConnection($conn)
 	{
-		$this->_connection=$conn;
+		$this->_connection = $conn;
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers===null)
-			$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+		if ($this->_typeHandlers === null)
+			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
 
@@ -97,8 +97,8 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway===null)
-			$this->_gateway=$this->createSqlMapGateway();
+		if ($this->_gateway === null)
+			$this->_gateway = $this->createSqlMapGateway();
 		return $this->_gateway;
 	}
 
@@ -118,8 +118,8 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies=new TChainedCacheDependency();
+		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];
 	}
@@ -164,7 +164,7 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		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];
 	}
@@ -197,7 +197,7 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		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];
 	}
@@ -229,7 +229,7 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		if ($this->_parameterMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}
@@ -241,7 +241,7 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
+		if ($this->_cacheModels->contains($cacheModel->getID()))
 			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
 		else
 			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
@@ -255,7 +255,7 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
+		if (!$this->_cacheModels->contains($name))
 			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
 		return $this->_cacheModels[$name];
 	}
@@ -265,7 +265,7 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
+		foreach ($this->_cacheModels as $cache)
 			$cache->flush();
 	}
 }

Braces +38 added lines, -26 removed lines

@@ -87,8 +87,9 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers===null)
-			$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+		if($this->_typeHandlers===null) {
+					$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+		}
 		return $this->_typeHandlers;
 	}
 
@@ -97,8 +98,9 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway===null)
-			$this->_gateway=$this->createSqlMapGateway();
+		if($this->_gateway===null) {
+					$this->_gateway=$this->createSqlMapGateway();
+		}
 		return $this->_gateway;
 	}
 
@@ -118,8 +120,9 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies=new TChainedCacheDependency();
+		if($this->_cacheDependencies === null) {
+					$this->_cacheDependencies=new TChainedCacheDependency();
+		}
 
 		return $this->_cacheDependencies;
 	}
@@ -150,8 +153,9 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		if($this->_mappedStatements->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		}
 		return $this->_mappedStatements[$name];
 	}
 
@@ -164,8 +168,9 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		if($this->_mappedStatements->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		}
 		$this->_mappedStatements->add($key, $statement);
 	}
 
@@ -185,8 +190,9 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		if($this->_resultMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		}
 		return $this->_resultMaps[$name];
 	}
 
@@ -197,8 +203,9 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		if($this->_resultMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		}
 		$this->_resultMaps->add($key, $result);
 	}
 
@@ -217,8 +224,9 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		if($this->_parameterMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		}
 		return $this->_parameterMaps[$name];
 	}
 
@@ -229,8 +237,9 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		if($this->_parameterMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		}
 		$this->_parameterMaps->add($key, $parameter);
 	}
 
@@ -241,10 +250,11 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
-			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
-		else
-			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		if($this->_cacheModels->contains($cacheModel->getID())) {
+					throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
+		} else {
+					$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		}
 	}
 
 	/**
@@ -255,8 +265,9 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
-			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		if(!$this->_cacheModels->contains($name)) {
+					throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		}
 		return $this->_cacheModels[$name];
 	}
 
@@ -265,8 +276,9 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
-			$cache->flush();
+		foreach($this->_cacheModels as $cache) {
+					$cache->flush();
+		}
 	}
 }
 

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

@@ -46,9 +46,9 @@ 
  */
 class TDataSourceConfig extends TModule
 {
-	private $_connID='';
+	private $_connID = '';
 	private $_conn;
-	private $_connClass='System.Data.TDbConnection';
+	private $_connClass = 'System.Data.TDbConnection';
 
 	/**
 	 * Initalize the database connection properties from attributes in <database> tag.
@@ -56,22 +56,22 @@ 
 	 */
 	public function init($xml)
 	{
-		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(isset($xml['database']) && is_array($xml['database']))
+			if (isset($xml['database']) && is_array($xml['database']))
 			{
-				$db=$this->getDbConnection();
-				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+				$db = $this->getDbConnection();
+				foreach ($xml['database'] as $name=>$value)
+					$db->setSubProperty($name, $value);
 			}
 		}
 		else
 		{
-			if($prop=$xml->getElementByTagName('database'))
+			if ($prop = $xml->getElementByTagName('database'))
 			{
-				$db=$this->getDbConnection();
-				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+				$db = $this->getDbConnection();
+				foreach ($prop->getAttributes() as $name=>$value)
+					$db->setSubproperty($name, $value);
 			}
 		}
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public function setConnectionID($value)
 	{
-		$this->_connID=$value;
+		$this->_connID = $value;
 	}
 
 	/**
@@ -103,9 +103,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn===null)
+		if ($this->_conn === null)
 		{
-			if($this->_connID!=='')
+			if ($this->_connID !== '')
 				$this->_conn = $this->findConnectionByID($this->getConnectionID());
 			else
 				$this->_conn = Prado::createComponent($this->getConnectionClass());
@@ -141,9 +141,9 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn!==null)
+		if ($this->_conn !== null)
 			throw new TConfigurationException('datasource_dbconnection_exists', $value);
-		$this->_connClass=$value;
+		$this->_connClass = $value;
 	}
 
 	/**
@@ -155,11 +155,11 @@ 
 	protected function findConnectionByID($id)
 	{
 		$conn = $this->getApplication()->getModule($id);
-		if($conn instanceof TDbConnection)
+		if ($conn instanceof TDbConnection)
 			return $conn;
-		else if($conn instanceof TDataSourceConfig)
+		else if ($conn instanceof TDataSourceConfig)
 			return $conn->getDbConnection();
 		else
-			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+			throw new TConfigurationException('datasource_dbconnection_invalid', $id);
 	}
 }

Braces +22 added lines, -18 removed lines

@@ -61,17 +61,18 @@ 
 			if(isset($xml['database']) && is_array($xml['database']))
 			{
 				$db=$this->getDbConnection();
-				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+				foreach($xml['database'] as $name=>$value) {
+									$db->setSubProperty($name,$value);
+				}
 			}
-		}
-		else
+		} else
 		{
 			if($prop=$xml->getElementByTagName('database'))
 			{
 				$db=$this->getDbConnection();
-				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+				foreach($prop->getAttributes() as $name=>$value) {
+									$db->setSubproperty($name,$value);
+				}
 			}
 		}
 	}
@@ -105,10 +106,11 @@ 
 	{
 		if($this->_conn===null)
 		{
-			if($this->_connID!=='')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
-			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+			if($this->_connID!=='') {
+							$this->_conn = $this->findConnectionByID($this->getConnectionID());
+			} else {
+							$this->_conn = Prado::createComponent($this->getConnectionClass());
+			}
 		}
 		return $this->_conn;
 	}
@@ -141,8 +143,9 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn!==null)
-			throw new TConfigurationException('datasource_dbconnection_exists', $value);
+		if($this->_conn!==null) {
+					throw new TConfigurationException('datasource_dbconnection_exists', $value);
+		}
 		$this->_connClass=$value;
 	}
 
@@ -155,11 +158,12 @@ 
 	protected function findConnectionByID($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);
+		if($conn instanceof TDbConnection) {
+					return $conn;
+		} else if($conn instanceof TDataSourceConfig) {
+					return $conn->getDbConnection();
+		} else {
+					throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+		}
 	}
 }

framework/Data/TDbCommand.php

Doc Comments +1 added lines

@@ -136,6 +136,7 @@
 	 * @param mixed Name of the PHP variable to bind to the SQL statement parameter
 	 * @param int SQL data type of the parameter
 	 * @param int length of the data type
+	 * @param string $name
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
 	 */
 	public function bindParameter($name, &$value, $dataType=null, $length=null)

Spacing +45 added lines, -45 removed lines

@@ -37,17 +37,17 @@ 
 class TDbCommand extends TComponent
 {
 	private $_connection;
-	private $_text='';
-	private $_statement=null;
+	private $_text = '';
+	private $_statement = null;
 
 	/**
 	 * Constructor.
 	 * @param TDbConnection the database connection
 	 * @param string the SQL statement to be executed
 	 */
-	public function __construct(TDbConnection $connection,$text)
+	public function __construct(TDbConnection $connection, $text)
 	{
-		$this->_connection=$connection;
+		$this->_connection = $connection;
 		$this->setText($text);
 	}
 
@@ -56,7 +56,7 @@ 
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0TDbCommand\0_statement"));
+		return array_diff(parent::__sleep(), array("\0TDbCommand\0_statement"));
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->_text=$value;
+		$this->_text = $value;
 		$this->cancel();
 	}
 
@@ -104,15 +104,15 @@ 
 	 */
 	public function prepare()
 	{
-		if($this->_statement==null)
+		if ($this->_statement == null)
 		{
 			try
 			{
-				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
+				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
+				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
 		}
 	}
@@ -122,7 +122,7 @@ 
 	 */
 	public function cancel()
 	{
-		$this->_statement=null;
+		$this->_statement = null;
 	}
 
 	/**
@@ -138,15 +138,15 @@ 
 	 * @param int length of the data type
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
 	 */
-	public function bindParameter($name, &$value, $dataType=null, $length=null)
+	public function bindParameter($name, &$value, $dataType = null, $length = null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
-		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
+		if ($dataType === null)
+			$this->_statement->bindParam($name, $value);
+		else if ($length === null)
+			$this->_statement->bindParam($name, $value, $dataType);
 		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+			$this->_statement->bindParam($name, $value, $dataType, $length);
 	}
 
 	/**
@@ -159,13 +159,13 @@ 
 	 * @param int SQL data type of the parameter
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
 	 */
-	public function bindValue($name, $value, $dataType=null)
+	public function bindValue($name, $value, $dataType = null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
+		if ($dataType === null)
+			$this->_statement->bindValue($name, $value);
 		else
-			$this->_statement->bindValue($name,$value,$dataType);
+			$this->_statement->bindValue($name, $value, $dataType);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 			// Do not trace because it will remain even in
 			// Performance mode or when pradolite.php is used
 			// Prado::trace('Execute Command: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
@@ -190,9 +190,9 @@ 
 			else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -201,7 +201,7 @@ 
 	 */
 	public function getDebugStatementText()
 	{
-		if(Prado::getApplication()->getMode() === TApplicationMode::Debug)
+		if (Prado::getApplication()->getMode() === TApplicationMode::Debug)
 			return $this->_statement instanceof PDOStatement ?
 				$this->_statement->queryString
 				: $this->getText();
@@ -218,15 +218,15 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -238,22 +238,22 @@ 
 	 * @return array the first row of the query result, false if no result.
 	 * @throws TDbException execution failed
 	 */
-	public function queryRow($fetchAssociative=true)
+	public function queryRow($fetchAssociative = true)
 	{
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
-			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
+				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			$result = $this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -269,20 +269,20 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
-			$result=$this->_statement->fetchColumn();
+				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			$result = $this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if(is_resource($result) && get_resource_type($result)==='stream')
+			if (is_resource($result) && get_resource_type($result) === 'stream')
 				return stream_get_contents($result);
 			else
 				return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -296,10 +296,10 @@ 
 	 */
 	public function queryColumn()
 	{
-		$rows=$this->query()->readAll();
-		$column=array();
-		foreach($rows as $row)
-			$column[]=current($row);
+		$rows = $this->query()->readAll();
+		$column = array();
+		foreach ($rows as $row)
+			$column[] = current($row);
 		return $column;
 	}
 }

Braces +45 added lines, -42 removed lines

@@ -109,8 +109,7 @@ 
 			try
 			{
 				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
 			}
@@ -141,12 +140,13 @@ 
 	public function bindParameter($name, &$value, $dataType=null, $length=null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
-		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
-		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+		if($dataType===null) {
+					$this->_statement->bindParam($name,$value);
+		} else if($length===null) {
+					$this->_statement->bindParam($name,$value,$dataType);
+		} else {
+					$this->_statement->bindParam($name,$value,$dataType,$length);
+		}
 	}
 
 	/**
@@ -162,10 +162,11 @@ 
 	public function bindValue($name, $value, $dataType=null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
-		else
-			$this->_statement->bindValue($name,$value,$dataType);
+		if($dataType===null) {
+					$this->_statement->bindValue($name,$value);
+		} else {
+					$this->_statement->bindValue($name,$value,$dataType);
+		}
 	}
 
 	/**
@@ -186,11 +187,10 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
+			} else {
+							return $this->getConnection()->getPdoInstance()->exec($this->getText());
 			}
-			else
-				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -201,10 +201,11 @@ 
 	 */
 	public function getDebugStatementText()
 	{
-		if(Prado::getApplication()->getMode() === TApplicationMode::Debug)
-			return $this->_statement instanceof PDOStatement ?
+		if(Prado::getApplication()->getMode() === TApplicationMode::Debug) {
+					return $this->_statement instanceof PDOStatement ?
 				$this->_statement->queryString
 				: $this->getText();
+		}
 	}
 
 	/**
@@ -218,13 +219,13 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -243,15 +244,15 @@ 
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -269,18 +270,19 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result=$this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if(is_resource($result) && get_resource_type($result)==='stream')
-				return stream_get_contents($result);
-			else
-				return $result;
-		}
-		catch(Exception $e)
+			if(is_resource($result) && get_resource_type($result)==='stream') {
+							return stream_get_contents($result);
+			} else {
+							return $result;
+			}
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -298,8 +300,9 @@ 
 	{
 		$rows=$this->query()->readAll();
 		$column=array();
-		foreach($rows as $row)
-			$column[]=current($row);
+		foreach($rows as $row) {
+					$column[]=current($row);
+		}
 		return $column;
 	}
 }

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)
 	{

Spacing +67 added lines, -67 removed lines

@@ -87,13 +87,13 @@ 
 	 */
 	const DEFAULT_TRANSACTION_CLASS = 'System.Data.TDbTransaction';
 
-	private $_dsn='';
-	private $_username='';
-	private $_password='';
-	private $_charset='';
-	private $_attributes=array();
-	private $_active=false;
-	private $_pdo=null;
+	private $_dsn = '';
+	private $_username = '';
+	private $_password = '';
+	private $_charset = '';
+	private $_attributes = array();
+	private $_active = false;
+	private $_pdo = null;
 	private $_transaction;
 
 	/**
@@ -105,7 +105,7 @@ 
 	 * @var string
 	 * @since 3.1.7
 	 */
-	private $_transactionClass=self::DEFAULT_TRANSACTION_CLASS;
+	private $_transactionClass = self::DEFAULT_TRANSACTION_CLASS;
 
 	/**
 	 * Constructor.
@@ -120,12 +120,12 @@ 
 	 * @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;
-		$this->_password=$password;
-		$this->_charset=$charset;
+		$this->_dsn = $dsn;
+		$this->_username = $username;
+		$this->_password = $password;
+		$this->_charset = $charset;
 	}
 
 	/**
@@ -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"));
 	}
 
 	/**
@@ -161,10 +161,10 @@ 
 	 */
 	public function setActive($value)
 	{
-		$value=TPropertyValue::ensureBoolean($value);
-		if($value!==$this->_active)
+		$value = TPropertyValue::ensureBoolean($value);
+		if ($value !== $this->_active)
 		{
-			if($value)
+			if ($value)
 				$this->open();
 			else
 				$this->close();
@@ -177,22 +177,22 @@ 
 	 */
 	protected function open()
 	{
-		if($this->_pdo===null)
+		if ($this->_pdo === null)
 		{
 			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);
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-				$this->_active=true;
+				$this->_active = true;
 				$this->setConnectionCharset();
 			}
-			catch(PDOException $e)
+			catch (PDOException $e)
 			{
-				throw new TDbException('dbconnection_open_failed',$e->getMessage());
+				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
 		}
 	}
@@ -203,8 +203,8 @@ 
 	 */
 	protected function close()
 	{
-		$this->_pdo=null;
-		$this->_active=false;
+		$this->_pdo = null;
+		$this->_active = false;
 	}
 
 	/*
@@ -245,7 +245,7 @@ 
 	 */
 	public function setConnectionString($value)
 	{
-		$this->_dsn=$value;
+		$this->_dsn = $value;
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	 */
 	public function setUsername($value)
 	{
-		$this->_username=$value;
+		$this->_username = $value;
 	}
 
 	/**
@@ -277,13 +277,13 @@ 
 	 */
 	public function setPassword($value)
 	{
-		$this->_password=$value;
+		$this->_password = $value;
 	}
 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -291,9 +291,9 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
-		$this->_charset=$value;
+		$this->_charset = $value;
 		$this->setConnectionCharset();
 	}
 
@@ -313,8 +313,8 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
-			return new TDbCommand($this,$sql);
+		if ($this->getActive())
+			return new TDbCommand($this, $sql);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
@@ -324,9 +324,9 @@ 
 	 */
 	public function getCurrentTransaction()
 	{
-		if($this->_transaction!==null)
+		if ($this->_transaction !== null)
 		{
-			if($this->_transaction->getActive())
+			if ($this->_transaction->getActive())
 				return $this->_transaction;
 		}
 		return null;
@@ -339,10 +339,10 @@ 
 	 */
 	public function beginTransaction()
 	{
-		if($this->getActive())
+		if ($this->getActive())
 		{
 			$this->_pdo->beginTransaction();
-			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
+			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
 		}
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -364,7 +364,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**
@@ -373,9 +373,9 @@ 
 	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
 	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
 	 */
-	public function getLastInsertID($sequenceName='')
+	public function getLastInsertID($sequenceName = '')
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->lastInsertId($sequenceName);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -389,7 +389,7 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->quote($str);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -430,7 +430,7 @@ 
 	 */
 	public function getDbMetaData()
 	{
-		if($this->_dbMeta===null)
+		if ($this->_dbMeta === null)
 		{
 			Prado::using('System.Data.Common.TDbMetaData');
 			$this->_dbMeta = TDbMetaData::getInstance($this);
@@ -443,7 +443,7 @@ 
 	 */
 	public function getColumnCase()
 	{
-		switch($this->getAttribute(PDO::ATTR_CASE))
+		switch ($this->getAttribute(PDO::ATTR_CASE))
 		{
 			case PDO::CASE_NATURAL:
 				return TDbColumnCaseMode::Preserved;
@@ -459,19 +459,19 @@ 
 	 */
 	public function setColumnCase($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbColumnCaseMode'))
+		switch (TPropertyValue::ensureEnum($value, 'TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
-				$value=PDO::CASE_NATURAL;
+				$value = PDO::CASE_NATURAL;
 				break;
 			case TDbColumnCaseMode::LowerCase:
-				$value=PDO::CASE_LOWER;
+				$value = PDO::CASE_LOWER;
 				break;
 			case TDbColumnCaseMode::UpperCase:
-				$value=PDO::CASE_UPPER;
+				$value = PDO::CASE_UPPER;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_CASE,$value);
+		$this->setAttribute(PDO::ATTR_CASE, $value);
 	}
 
 	/**
@@ -479,7 +479,7 @@ 
 	 */
 	public function getNullConversion()
 	{
-		switch($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
+		switch ($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
 		{
 			case PDO::NULL_NATURAL:
 				return TDbNullConversionMode::Preserved;
@@ -495,19 +495,19 @@ 
 	 */
 	public function setNullConversion($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbNullConversionMode'))
+		switch (TPropertyValue::ensureEnum($value, 'TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
-				$value=PDO::NULL_NATURAL;
+				$value = PDO::NULL_NATURAL;
 				break;
 			case TDbNullConversionMode::EmptyStringToNull:
-				$value=PDO::NULL_EMPTY_STRING;
+				$value = PDO::NULL_EMPTY_STRING;
 				break;
 			case TDbNullConversionMode::NullToEmptyString:
-				$value=PDO::NULL_TO_STRING;
+				$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));
 	}
 
 	/**
@@ -611,7 +611,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->getAttribute($name);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -623,12 +623,12 @@ 
 	 * @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);
+		if ($this->_pdo instanceof PDO)
+			$this->_pdo->setAttribute($name, $value);
 		else
-			$this->_attributes[$name]=$value;
+			$this->_attributes[$name] = $value;
 	}
 }
 
@@ -644,15 +644,15 @@ 
 	/**
 	 * Column name cases are kept as is from the database
 	 */
-	const Preserved='Preserved';
+	const Preserved = 'Preserved';
 	/**
 	 * Column names are converted to lower case
 	 */
-	const LowerCase='LowerCase';
+	const LowerCase = 'LowerCase';
 	/**
 	 * Column names are converted to upper case
 	 */
-	const UpperCase='UpperCase';
+	const UpperCase = 'UpperCase';
 }
 
 /**
@@ -667,14 +667,14 @@ 
 	/**
 	 * No conversion is performed for null and empty values.
 	 */
-	const Preserved='Preserved';
+	const Preserved = 'Preserved';
 	/**
 	 * NULL is converted to empty string
 	 */
-	const NullToEmptyString='NullToEmptyString';
+	const NullToEmptyString = 'NullToEmptyString';
 	/**
 	 * Empty string is converted to NULL
 	 */
-	const EmptyStringToNull='EmptyStringToNull';
+	const EmptyStringToNull = 'EmptyStringToNull';
 }
 

Braces +39 added lines, -32 removed lines

@@ -164,10 +164,11 @@ 
 		$value=TPropertyValue::ensureBoolean($value);
 		if($value!==$this->_active)
 		{
-			if($value)
-				$this->open();
-			else
-				$this->close();
+			if($value) {
+							$this->open();
+			} else {
+							$this->close();
+			}
 		}
 	}
 
@@ -189,8 +190,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());
 			}
@@ -214,8 +214,9 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
-			return;
+		if ($this->_charset === '' || $this->_active === false) {
+					return;
+		}
 		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
@@ -313,10 +314,11 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
-			return new TDbCommand($this,$sql);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return new TDbCommand($this,$sql);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -326,8 +328,9 @@ 
 	{
 		if($this->_transaction!==null)
 		{
-			if($this->_transaction->getActive())
-				return $this->_transaction;
+			if($this->_transaction->getActive()) {
+							return $this->_transaction;
+			}
 		}
 		return null;
 	}
@@ -343,9 +346,9 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
 		}
-		else
-			throw new TDbException('dbconnection_connection_inactive');
 	}
 
 	/**
@@ -375,10 +378,11 @@ 
 	 */
 	public function getLastInsertID($sequenceName='')
 	{
-		if($this->getActive())
-			return $this->_pdo->lastInsertId($sequenceName);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->lastInsertId($sequenceName);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -389,10 +393,11 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
-			return $this->_pdo->quote($str);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->quote($str);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -611,10 +616,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
-			return $this->_pdo->getAttribute($name);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->getAttribute($name);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -625,10 +631,11 @@ 
 	 */
 	public function setAttribute($name,$value)
 	{
-		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name,$value);
-		else
-			$this->_attributes[$name]=$value;
+		if($this->_pdo instanceof PDO) {
+					$this->_pdo->setAttribute($name,$value);
+		} else {
+					$this->_attributes[$name]=$value;
+		}
 	}
 }
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TDbConnection class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data
- */
+	 * TDbConnection class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data
+	 */
 
 Prado::using('System.Data.TDbTransaction');
 Prado::using('System.Data.TDbCommand');

framework/Data/TDbDataReader.php

Doc Comments +4 added lines

@@ -58,6 +58,7 @@ 
 	 * should match the case of the column, as returned by the driver.
 	 * @param mixed Name of the PHP variable to which the column will be bound.
 	 * @param int Data type of the parameter
+	 * @param integer $column
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
 	 */
 	public function bindColumn($column, &$value, $dataType=null)
@@ -89,6 +90,7 @@ 
 	/**
 	 * Returns a single column from the next row of a result set.
 	 * @param int zero-based column index
+	 * @param integer $columnIndex
 	 * @return mixed|false the column of the current row, false if no more row available
 	 */
 	public function readColumn($columnIndex)
@@ -100,6 +102,8 @@ 
 	 * Returns a single column from the next row of a result set.
 	 * @param string class name of the object to be created and populated
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
+	 * @param string $className
+	 * @param string[] $fields
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
 	public function readObject($className,$fields)

Spacing +17 added lines, -17 removed lines

@@ -35,9 +35,9 @@ 
 class TDbDataReader extends TComponent implements Iterator
 {
 	private $_statement;
-	private $_closed=false;
+	private $_closed = false;
 	private $_row;
-	private $_index=-1;
+	private $_index = -1;
 
 	/**
 	 * Constructor.
@@ -45,7 +45,7 @@ 
 	 */
 	public function __construct(TDbCommand $command)
 	{
-		$this->_statement=$command->getPdoStatement();
+		$this->_statement = $command->getPdoStatement();
 		$this->_statement->setFetchMode(PDO::FETCH_ASSOC);
 	}
 
@@ -60,12 +60,12 @@ 
 	 * @param int Data type of the parameter
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
 	 */
-	public function bindColumn($column, &$value, $dataType=null)
+	public function bindColumn($column, &$value, $dataType = null)
 	{
-		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+		if ($dataType === null)
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -73,8 +73,8 @@ 
 	 */
 	public function setFetchMode($mode)
 	{
-		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		$params = func_get_args();
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
-	public function readObject($className,$fields)
+	public function readObject($className, $fields)
 	{
-		return $this->_statement->fetchObject($className,$fields);
+		return $this->_statement->fetchObject($className, $fields);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	public function close()
 	{
 		$this->_statement->closeCursor();
-		$this->_closed=true;
+		$this->_closed = true;
 	}
 
 	/**
@@ -171,10 +171,10 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if ($this->_index < 0)
 		{
-			$this->_row=$this->_statement->fetch();
-			$this->_index=0;
+			$this->_row = $this->_statement->fetch();
+			$this->_index = 0;
 		}
 		else
 			throw new TDbException('dbdatareader_rewind_invalid');
@@ -206,7 +206,7 @@ 
 	 */
 	public function next()
 	{
-		$this->_row=$this->_statement->fetch();
+		$this->_row = $this->_statement->fetch();
 		$this->_index++;
 	}
 
@@ -217,7 +217,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_row!==false;
+		return $this->_row !== false;
 	}
 }
 

Braces +7 added lines, -6 removed lines

@@ -62,10 +62,11 @@ 
 	 */
 	public function bindColumn($column, &$value, $dataType=null)
 	{
-		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
-		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+		if($dataType===null) {
+					$this->_statement->bindColumn($column,$value);
+		} else {
+					$this->_statement->bindColumn($column,$value,$dataType);
+		}
 	}
 
 	/**
@@ -175,9 +176,9 @@ 
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;
+		} else {
+					throw new TDbException('dbdatareader_rewind_invalid');
 		}
-		else
-			throw new TDbException('dbdatareader_rewind_invalid');
 	}
 
 	/**