pradosoft / prado

framework/Data/DataGateway/TDataGatewayCommand.php

Doc Comments +8 added lines, -2 removed lines

@@ -89,6 +89,7 @@ 
 	 * Updates the table with new data.
 	 * @param array date for update.
 	 * @param TSqlCriteria update conditions and parameters.
+	 * @param TSqlCriteria $criteria
 	 * @return integer number of records affected.
 	 */
 	public function update($data, $criteria)
@@ -207,6 +208,9 @@ 
 		return $this->onExecuteCommand($command,$command->execute());
 	}
 
+	/**
+	 * @param TDbTableInfo $table
+	 */
 	public function getIndexKeyCondition($table,$fields,$values)
 	{
 		if (!count($values))
@@ -351,7 +355,7 @@ 
 	 * Inserts a new record into the table. Each array key must
 	 * correspond to a column name in the table unless a null value is permitted.
 	 * @param array new record data.
-	 * @return mixed last insert id if one column contains a serial or sequence,
+	 * @return string|boolean last insert id if one column contains a serial or sequence,
 	 * otherwise true if command executes successfully and affected 1 or more rows.
 	 */
 	public function insert($data)
@@ -370,7 +374,7 @@ 
 	/**
 	 * Iterate through all the columns and returns the last insert id of the
 	 * first column that has a sequence or serial.
-	 * @return mixed last insert id, null if none is found.
+	 * @return string|null last insert id, null if none is found.
 	 */
 	public function getLastInsertID()
 	{
@@ -381,6 +385,7 @@ 
 	 * @param string __call method name
 	 * @param string criteria conditions
 	 * @param array method arguments
+	 * @param string $condition
 	 * @return TActiveRecordCriteria criteria created from the method name and its arguments.
 	 */
 	public function createCriteriaFromString($method, $condition, $args)
@@ -434,6 +439,7 @@ 
 	 * inspected to obtain the sql query to be executed.
 	 * @param TDataGatewayCommand originator $sender
 	 * @param TDataGatewayEventParameter
+	 * @param TDbCommand $command
 	 */
 	public function onCreateCommand($command, $criteria)
 	{

Spacing +97 added lines, -97 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function __construct($builder)
 	{
-		$this->_builder = $builder;
+		$this->_builder=$builder;
 	}
 
 	/**
@@ -77,10 +77,10 @@ 
 	 */
 	public function delete($criteria)
 	{
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createDeleteCommand($where, $parameters);
-		$this->onCreateCommand($command,$criteria);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$command=$this->getBuilder()->createDeleteCommand($where, $parameters);
+		$this->onCreateCommand($command, $criteria);
 		$command->prepare();
 		return $command->execute();
 	}
@@ -93,10 +93,10 @@ 
 	 */
 	public function update($data, $criteria)
 	{
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createUpdateCommand($data,$where, $parameters);
-		$this->onCreateCommand($command,$criteria);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$command=$this->getBuilder()->createUpdateCommand($data, $where, $parameters);
+		$this->onCreateCommand($command, $criteria);
 		$command->prepare();
 		return $this->onExecuteCommand($command, $command->execute());
 	}
@@ -108,7 +108,7 @@ 
 	 */
 	public function updateByPk($data, $keys)
 	{
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
+		list($where, $parameters)=$this->getPrimaryKeyCondition((array) $keys);
 		return $this->update($data, new TSqlCriteria($where, $parameters));
 	}
 
@@ -119,7 +119,7 @@ 
 	 */
 	public function find($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 
@@ -130,7 +130,7 @@ 
 	 */
 	public function findAll($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 
@@ -143,13 +143,13 @@ 
 	{
 		if($criteria===null)
 			return $this->getBuilder()->createFindCommand();
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
-		$select = $criteria->getSelect();
-		$command = $this->getBuilder()->createFindCommand($where,$parameters,$ordering,$limit,$offset,$select);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
+		$select=$criteria->getSelect();
+		$command=$this->getBuilder()->createFindCommand($where, $parameters, $ordering, $limit, $offset, $select);
 		$this->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -162,9 +162,9 @@ 
 	{
 		if($keys===null)
 			return null;
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createFindCommand($where, $parameters);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$parameters));
+		list($where, $parameters)=$this->getPrimaryKeyCondition((array) $keys);
+		$command=$this->getBuilder()->createFindCommand($where, $parameters);
+		$this->onCreateCommand($command, new TSqlCriteria($where, $parameters));
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 
@@ -174,22 +174,22 @@ 
 	 */
 	public function findAllByPk($keys)
 	{
-		$where = $this->getCompositeKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createFindCommand($where);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
-		return $this->onExecuteCommand($command,$command->query());
+		$where=$this->getCompositeKeyCondition((array) $keys);
+		$command=$this->getBuilder()->createFindCommand($where);
+		$this->onCreateCommand($command, new TSqlCriteria($where, $keys));
+		return $this->onExecuteCommand($command, $command->query());
 	}
 
-	public function findAllByIndex($criteria,$fields,$values)
+	public function findAllByIndex($criteria, $fields, $values)
 	{
-		$index = $this->getIndexKeyCondition($this->getTableInfo(),$fields,$values);
-		if(strlen($where = $criteria->getCondition())>0)
+		$index=$this->getIndexKeyCondition($this->getTableInfo(), $fields, $values);
+		if(strlen($where=$criteria->getCondition()) > 0)
 			$criteria->setCondition("({$index}) AND ({$where})");
 		else
 			$criteria->setCondition($index);
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command,$command->query());
+		return $this->onExecuteCommand($command, $command->query());
 	}
 
 	/**
@@ -200,22 +200,22 @@ 
 	{
 		if(count($keys)==0)
 			return 0;
-		$where = $this->getCompositeKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createDeleteCommand($where);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
+		$where=$this->getCompositeKeyCondition((array) $keys);
+		$command=$this->getBuilder()->createDeleteCommand($where);
+		$this->onCreateCommand($command, new TSqlCriteria($where, $keys));
 		$command->prepare();
-		return $this->onExecuteCommand($command,$command->execute());
+		return $this->onExecuteCommand($command, $command->execute());
 	}
 
-	public function getIndexKeyCondition($table,$fields,$values)
+	public function getIndexKeyCondition($table, $fields, $values)
 	{
-		if (!count($values))
+		if(!count($values))
 			return 'FALSE';
-		$columns = array();
-		$tableName = $table->getTableFullName();
+		$columns=array();
+		$tableName=$table->getTableFullName();
 		foreach($fields as $field)
-			$columns[] = $tableName.'.'.$table->getColumn($field)->getColumnName();
-		return '('.implode(', ',$columns).') IN '.$this->quoteTuple($values);
+			$columns[]=$tableName.'.'.$table->getColumn($field)->getColumnName();
+		return '('.implode(', ', $columns).') IN '.$this->quoteTuple($values);
 	}
 
 	/**
@@ -225,26 +225,26 @@ 
 	 */
 	protected function getCompositeKeyCondition($values)
 	{
-		$primary = $this->getTableInfo()->getPrimaryKeys();
-		$count = count($primary);
+		$primary=$this->getTableInfo()->getPrimaryKeys();
+		$count=count($primary);
 		if($count===0)
 		{
 			throw new TDbException('dbtablegateway_no_primary_key_found',
 				$this->getTableInfo()->getTableFullName());
 		}
-		if(!is_array($values) || count($values) === 0)
+		if(!is_array($values) || count($values)===0)
 		{
 			throw new TDbException('dbtablegateway_missing_pk_values',
 				$this->getTableInfo()->getTableFullName());
 		}
-		if($count>1 && (!isset($values[0]) || !is_array($values[0])))
-			$values = array($values);
-		if($count > 1 && count($values[0]) !== $count)
+		if($count > 1 && (!isset($values[0]) || !is_array($values[0])))
+			$values=array($values);
+		if($count > 1 && count($values[0])!==$count)
 		{
 			throw new TDbException('dbtablegateway_pk_value_count_mismatch',
 				$this->getTableInfo()->getTableFullName());
 		}
-		return $this->getIndexKeyCondition($this->getTableInfo(),$primary, $values);
+		return $this->getIndexKeyCondition($this->getTableInfo(), $primary, $values);
 	}
 
 	/**
@@ -254,10 +254,10 @@ 
 	 */
 	protected function quoteTuple($array)
 	{
-		$conn = $this->getDbConnection();
-		$data = array();
+		$conn=$this->getDbConnection();
+		$data=array();
 		foreach($array as $k=>$v)
-			$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
+			$data[]=is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
 		return '('.implode(', ', $data).')';
 	}
 
@@ -268,7 +268,7 @@ 
 	 */
 	protected function getPrimaryKeyCondition($values)
 	{
-		$primary = $this->getTableInfo()->getPrimaryKeys();
+		$primary=$this->getTableInfo()->getPrimaryKeys();
 		if(count($primary)===0)
 		{
 			throw new TDbException('dbtablegateway_no_primary_key_found',
@@ -276,12 +276,12 @@ 
 		}
 		$criteria=array();
 		$bindings=array();
-		$i = 0;
+		$i=0;
 		foreach($primary as $key)
 		{
-			$column = $this->getTableInfo()->getColumn($key)->getColumnName();
-			$criteria[] = $column.' = :'.$key;
-			$bindings[$key] = isset($values[$key])?$values[$key]:$values[$i++];
+			$column=$this->getTableInfo()->getColumn($key)->getColumnName();
+			$criteria[]=$column.' = :'.$key;
+			$bindings[$key]=isset($values[$key]) ? $values[$key] : $values[$i++];
 		}
 		return array(implode(' AND ', $criteria), $bindings);
 	}
@@ -293,7 +293,7 @@ 
 	 */
 	public function findBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 
@@ -304,7 +304,7 @@ 
 	 */
 	public function findAllBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 
@@ -315,15 +315,15 @@ 
 	 */
 	protected function getSqlCommand($criteria)
 	{
-		$sql = $criteria->getCondition();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
+		$sql=$criteria->getCondition();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
 		if(count($ordering) > 0)
-			$sql = $this->getBuilder()->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
-			$sql = $this->getBuilder()->applyLimitOffset($sql, $limit, $offset);
-		$command = $this->getBuilder()->createCommand($sql);
+			$sql=$this->getBuilder()->applyOrdering($sql, $ordering);
+		if($limit >= 0 || $offset >= 0)
+			$sql=$this->getBuilder()->applyLimitOffset($sql, $limit, $offset);
+		$command=$this->getBuilder()->createCommand($sql);
 		$this->getBuilder()->bindArrayValues($command, $criteria->getParameters()->toArray());
 		$this->onCreateCommand($command, $criteria);
 		return $command;
@@ -336,15 +336,15 @@ 
 	public function count($criteria)
 	{
 		if($criteria===null)
-			return (int)$this->getBuilder()->createCountCommand()->queryScalar();
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
-		$command = $this->getBuilder()->createCountCommand($where,$parameters,$ordering,$limit,$offset);
+			return (int) $this->getBuilder()->createCountCommand()->queryScalar();
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
+		$command=$this->getBuilder()->createCountCommand($where, $parameters, $ordering, $limit, $offset);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command, (int)$command->queryScalar());
+		return $this->onExecuteCommand($command, (int) $command->queryScalar());
 	}
 
 	/**
@@ -357,12 +357,12 @@ 
 	public function insert($data)
 	{
 		$command=$this->getBuilder()->createInsertCommand($data);
-		$this->onCreateCommand($command, new TSqlCriteria(null,$data));
+		$this->onCreateCommand($command, new TSqlCriteria(null, $data));
 		$command->prepare();
 		if($this->onExecuteCommand($command, $command->execute()) > 0)
 		{
-			$value = $this->getLastInsertId();
-			return $value !== null ? $value : true;
+			$value=$this->getLastInsertId();
+			return $value!==null ? $value : true;
 		}
 		return false;
 	}
@@ -385,14 +385,14 @@ 
 	 */
 	public function createCriteriaFromString($method, $condition, $args)
 	{
-		$fields = $this->extractMatchingConditions($method, $condition);
-		$args=count($args) === 1 && is_array($args[0]) ? $args[0] : $args;
-		if(count($fields)>count($args))
+		$fields=$this->extractMatchingConditions($method, $condition);
+		$args=count($args)===1 && is_array($args[0]) ? $args[0] : $args;
+		if(count($fields) > count($args))
 		{
 			throw new TDbException('dbtablegateway_mismatch_args_exception',
-				$method,count($fields),count($args));
+				$method, count($fields), count($args));
 		}
-		return new TSqlCriteria(implode(' ',$fields), $args);
+		return new TSqlCriteria(implode(' ', $fields), $args);
 	}
 
 	/**
@@ -404,25 +404,25 @@ 
 	 */
 	protected function extractMatchingConditions($method, $condition)
 	{
-		$table = $this->getTableInfo();
-		$columns = $table->getLowerCaseColumnNames();
-		$regexp = '/('.implode('|', array_keys($columns)).')(and|_and_|or|_or_)?/i';
-		$matches = array();
-		if(!preg_match_all($regexp, strtolower($condition), $matches,PREG_SET_ORDER))
+		$table=$this->getTableInfo();
+		$columns=$table->getLowerCaseColumnNames();
+		$regexp='/('.implode('|', array_keys($columns)).')(and|_and_|or|_or_)?/i';
+		$matches=array();
+		if(!preg_match_all($regexp, strtolower($condition), $matches, PREG_SET_ORDER))
 		{
 			throw new TDbException('dbtablegateway_mismatch_column_name',
 				$method, implode(', ', $columns), $table->getTableFullName());
 		}
 
-		$fields = array();
+		$fields=array();
 		foreach($matches as $match)
 		{
-			$key = $columns[$match[1]];
-			$column = $table->getColumn($key)->getColumnName();
-			$sql = $column . ' = ? ';
+			$key=$columns[$match[1]];
+			$column=$table->getColumn($key)->getColumnName();
+			$sql=$column.' = ? ';
 			if(count($match) > 2)
-				$sql .= strtoupper(str_replace('_', '', $match[2]));
-			$fields[] = $sql;
+				$sql.=strtoupper(str_replace('_', '', $match[2]));
+			$fields[]=$sql;
 		}
 		return $fields;
 	}
@@ -437,7 +437,7 @@ 
 	 */
 	public function onCreateCommand($command, $criteria)
 	{
-		$this->raiseEvent('OnCreateCommand', $this, new TDataGatewayEventParameter($command,$criteria));
+		$this->raiseEvent('OnCreateCommand', $this, new TDataGatewayEventParameter($command, $criteria));
 	}
 
 	/**
@@ -451,7 +451,7 @@ 
 	 */
 	public function onExecuteCommand($command, $result)
 	{
-		$parameter = new TDataGatewayResultEventParameter($command, $result);
+		$parameter=new TDataGatewayResultEventParameter($command, $result);
 		$this->raiseEvent('OnExecuteCommand', $this, $parameter);
 		return $parameter->getResult();
 	}
@@ -471,7 +471,7 @@ 
 	private $_command;
 	private $_criteria;
 
-	public function __construct($command,$criteria)
+	public function __construct($command, $criteria)
 	{
 		$this->_command=$command;
 		$this->_criteria=$criteria;
@@ -511,7 +511,7 @@ 
 	private $_command;
 	private $_result;
 
-	public function __construct($command,$result)
+	public function __construct($command, $result)
 	{
 		$this->_command=$command;
 		$this->_result=$result;

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * TDataGatewayCommand, TDataGatewayEventParameter and TDataGatewayResultEventParameter class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @version $Id$
- * @package System.Data.DataGateway
- */
+	 * TDataGatewayCommand, TDataGatewayEventParameter and TDataGatewayResultEventParameter class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @version $Id$
+	 * @package System.Data.DataGateway
+	 */
 
 /**
  * TDataGatewayCommand is command builder and executor class for

framework/Data/DataGateway/TSqlCriteria.php

Doc Comments +3 added lines, -1 removed lines

@@ -188,7 +188,7 @@ 
 	}
 
 	/**
-	 * @return boolean true if the parameter index are string base, false otherwise.
+	 * @return boolean|null true if the parameter index are string base, false otherwise.
 	 */
 	public function getIsNamedParameters()
 	{
@@ -206,6 +206,7 @@ 
 
 	/**
 	 * @param mixed ordering clause.
+	 * @param string $value
 	 */
 	public function setOrdersBy($value)
 	{
@@ -250,6 +251,7 @@ 
 
 	/**
 	 * @param int record offset.
+	 * @param double $value
 	 */
 	public function setOffset($value)
 	{

Spacing +30 added lines, -30 removed lines

@@ -48,10 +48,10 @@ 
 	public function __construct($condition=null, $parameters=array())
 	{
 		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(),1);
+			$parameters=array_slice(func_get_args(), 1);
 		$this->_parameters=new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy=new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	{
 		if(empty($value)) {
 			// reset the condition
-			$this->_condition = null;
+			$this->_condition=null;
 			return;
 		}
 
@@ -140,7 +140,7 @@ 
 
 		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
 			// condition contains ORDER BY
-			$value = str_replace($matches[0], '', $value);
+			$value=str_replace($matches[0], '', $value);
 			if(strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
 			} else if(strlen($matches[2]) > 0) {
@@ -150,23 +150,23 @@ 
 
 		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
-			$value = str_replace($matches[0], '', $value); // remove limit from query
+			$value=str_replace($matches[0], '', $value); // remove limit from query
 			if(strpos($matches[1], ',')) { // both offset and limit given
-				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				list($offset, $limit)=explode(',', $matches[1]);
+				$this->_limit=(int) $limit;
+				$this->_offset=(int) $offset;
 			} else { // only limit given
-				$this->_limit = (int)$matches[1];
+				$this->_limit=(int) $matches[1];
 			}
 		}
 
 		if(preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
 			// condition contains offset
-			$value = str_replace($matches[0], '', $value); // remove offset from query
-			$this->_offset = (int)$matches[1]; // set offset in criteria
+			$value=str_replace($matches[0], '', $value); // remove offset from query
+			$this->_offset=(int) $matches[1]; // set offset in criteria
 		}
 
-		$this->_condition = trim($value);
+		$this->_condition=trim($value);
 	}
 
 	/**
@@ -213,12 +213,12 @@ 
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value=trim(preg_replace('/\s+/',' ',(string)$value));
+			$value=trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys=array();
-			foreach(explode(',',$value) as $orderBy)
+			foreach(explode(',', $value) as $orderBy)
 			{
-				$vs=explode(' ',trim($orderBy));
-				$orderBys[$vs[0]]=isset($vs[1])?$vs[1]:'asc';
+				$vs=explode(' ', trim($orderBy));
+				$orderBys[$vs[0]]=isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -261,23 +261,23 @@ 
 	 */
 	public function __toString()
 	{
-		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"'.(string)$this->getCondition().'"';
-		$params = array();
+		$str='';
+		if(strlen((string) $this->getCondition()) > 0)
+			$str.='"'.(string) $this->getCondition().'"';
+		$params=array();
 		foreach($this->getParameters() as $k=>$v)
-			$params[] = "{$k} => ${v}";
+			$params[]="{$k} => ${v}";
 		if(count($params) > 0)
-			$str .= ', "'.implode(', ',$params).'"';
-		$orders = array();
+			$str.=', "'.implode(', ', $params).'"';
+		$orders=array();
 		foreach($this->getOrdersBy() as $k=>$v)
-			$orders[] = "{$k} => ${v}";
+			$orders[]="{$k} => ${v}";
 		if(count($orders) > 0)
-			$str .= ', "'.implode(', ',$orders).'"';
-		if($this->_limit !==null)
-			$str .= ', '.$this->_limit;
-		if($this->_offset !== null)
-			$str .= ', '.$this->_offset;
+			$str.=', "'.implode(', ', $orders).'"';
+		if($this->_limit!==null)
+			$str.=', '.$this->_limit;
+		if($this->_offset!==null)
+			$str.=', '.$this->_offset;
 		return $str;
 	}
 }

framework/Data/SqlMap/Configuration/TDiscriminator.php

Doc Comments +3 added lines

@@ -132,6 +132,7 @@ 
 
 	/**
 	 * @param TSubMap add new sub mapping.
+	 * @param TSubMap $subMap
 	 */
 	public function addSubMap($subMap)
 	{
@@ -140,6 +141,7 @@ 
 
 	/**
 	 * @param string database value
+	 * @param string $value
 	 * @return TResultMap result mapping.
 	 */
 	public function getSubMap($value)
@@ -151,6 +153,7 @@ 
 	/**
 	 * Copies the discriminator properties to a new TResultProperty.
 	 * @param TResultMap result map holding the discriminator.
+	 * @param TResultMap $resultMap
 	 */
 	public function initMapping($resultMap)
 	{

Spacing +10 added lines, -10 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_column = $value;
+		$this->_column=$value;
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = $value;
+		$this->_type=$value;
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function setColumnIndex($value)
 	{
-		$this->_columnIndex = TPropertyValue::ensureInteger($value);
+		$this->_columnIndex=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function addSubMap($subMap)
 	{
-		$this->_subMaps[] = $subMap;
+		$this->_subMaps[]=$subMap;
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function initMapping($resultMap)
 	{
-		$this->_mapping = new TResultProperty($resultMap);
+		$this->_mapping=new TResultProperty($resultMap);
 		$this->_mapping->setColumn($this->getColumn());
 		$this->_mapping->setColumnIndex($this->getColumnIndex());
 		$this->_mapping->setType($this->getType());
@@ -170,7 +170,7 @@ 
 	{
 		foreach($this->_subMaps as $subMap)
 		{
-			$this->_resultMaps[$subMap->getValue()] =
+			$this->_resultMaps[$subMap->getValue()]=
 				$manager->getResultMap($subMap->getResultMapping());
 		}
 	}
@@ -206,7 +206,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = $value;
+		$this->_value=$value;
 	}
 
 	/**
@@ -223,7 +223,7 @@ 
 	 */
 	public function setResultMapping($value)
 	{
-		$this->_resultMapping = $value;
+		$this->_resultMapping=$value;
 	}
 }
 

framework/Data/SqlMap/Configuration/TParameterMap.php

Doc Comments +3 added lines, -1 removed lines

@@ -55,6 +55,7 @@ 
 
 	/**
 	 * @param string a unique identifier for the <parameterMap>.
+	 * @param string $value
 	 */
 	public function setID($value)
 	{
@@ -62,7 +63,7 @@ 
 	}
 
 	/**
-	 * @return TParameterProperty[] list of properties for the parameter map.
+	 * @return TList list of properties for the parameter map.
 	 */
 	public function getProperties()
 	{
@@ -112,6 +113,7 @@ 
 	/**
 	 * @param int parameter property index
 	 * @param TParameterProperty new parameter property.
+	 * @param integer $index
 	 */
 	public function insertProperty($index, TParameterProperty $property)
 	{

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
-		}
-		catch (TInvalidPropertyException $e)
+		} catch (TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',

Spacing +15 added lines, -15 removed lines

@@ -41,8 +41,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_properties = new TList;
-		$this->_propertyMap = new TMap;
+		$this->_properties=new TList;
+		$this->_propertyMap=new TMap;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extend = $value;
+		$this->_extend=$value;
 	}
 
 	/**
@@ -136,15 +136,15 @@ 
 	 */
 	public function getPropertyValue($registry, $property, $parameterValue)
 	{
-		$value = $this->getObjectValue($parameterValue,$property);
+		$value=$this->getObjectValue($parameterValue, $property);
 
 		if(($handler=$this->createTypeHandler($property, $registry))!==null)
-			$value = $handler->getParameter($value);
+			$value=$handler->getParameter($value);
 
-		$value = $this->nullifyDefaultValue($property,$value);
+		$value=$this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType())!==null)
-			$value = $registry->convertToType($type, $value);
+		if(($type=$property->getType())!==null)
+			$value=$registry->convertToType($type, $value);
 
 		return $value;
 	}
@@ -161,7 +161,7 @@ 
 		$type=$property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler=$registry->getTypeHandler($type);
 		if($handler===null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -172,13 +172,13 @@ 
 	 * @return mixed property value.
 	 * @throws TSqlMapException if property access is invalid.
 	 */
-	protected function getObjectValue($object,$property)
+	protected function getObjectValue($object, $property)
 	{
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
 		}
-		catch (TInvalidPropertyException $e)
+		catch(TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -196,12 +196,12 @@ 
 	 * @param mixed current property value
 	 * @return mixed null if NullValue matches currrent value.
 	 */
-	protected function nullifyDefaultValue($property,$value)
+	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue())!==null)
+		if(($nullValue=$property->getNullValue())!==null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue===$value)
+				$value=null;
 		}
 		return $value;
 	}

framework/Data/SqlMap/Configuration/TResultProperty.php

Doc Comments +3 added lines

@@ -103,6 +103,7 @@ 
 	/**
 	 * @param string name of the column in the result set from which the value
 	 * will be used to populate the property.
+	 * @param string $value
 	 */
 	public function setColumn($value)
 	{
@@ -121,6 +122,7 @@ 
 	/**
 	 * @param int index of the column in the ResultSet from which the value will
 	 * be used to populate the object property
+	 * @param integer $value
 	 */
 	public function setColumnIndex($value)
 	{
@@ -185,6 +187,7 @@ 
 
 	/**
 	 * @param string custom type handler class name (may use namespace).
+	 * @param string $value
 	 */
 	public function setTypeHandler($value)
 	{

Spacing +42 added lines, -42 removed lines

@@ -46,8 +46,8 @@ 
 
 	private $_hostResultMapID='inplicit internal mapping';
 
-	const LIST_TYPE = 0;
-	const ARRAY_TYPE = 1;
+	const LIST_TYPE=0;
+	const ARRAY_TYPE=1;
 
 	/**
 	 * Gets the containing result map ID.
@@ -56,7 +56,7 @@ 
 	public function __construct($resultMap=null)
 	{
 		if($resultMap instanceof TResultMap)
-			$this->_hostResultMapID = $resultMap->getID();
+			$this->_hostResultMapID=$resultMap->getID();
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_propertyName = $value;
+		$this->_propertyName=$value;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_columnName = $value;
+		$this->_columnName=$value;
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function setColumnIndex($value)
 	{
-		$this->_columnIndex = TPropertyValue::ensureInteger($value);
+		$this->_columnIndex=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 */
 	public function setResultMapping($value)
 	{
-		$this->_nestedResultMapName = $value;
+		$this->_nestedResultMapName=$value;
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function setNestedResultMap($value)
 	{
-		$this->_nestedResultMap = $value;
+		$this->_nestedResultMap=$value;
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_valueType = $value;
+		$this->_valueType=$value;
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setLazyLoad($value)
 	{
-		$this->_isLazyLoad = TPropertyValue::ensureBoolean($value,false);
+		$this->_isLazyLoad=TPropertyValue::ensureBoolean($value, false);
 	}
 
 	/**
@@ -231,17 +231,17 @@ 
 	 * @param array result row
 	 * @return mixed property value.
 	 */
-	public function getPropertyValue($registry,$row)
+	public function getPropertyValue($registry, $row)
 	{
-		$value = null;
-		$index = $this->getColumnIndex();
-		$name = $this->getColumn();
+		$value=null;
+		$index=$this->getColumnIndex();
+		$name=$this->getColumn();
 		if($index > 0 && isset($row[$index]))
-			$value = $this->getTypedValue($registry,$row[$index]);
+			$value=$this->getTypedValue($registry, $row[$index]);
 		else if(isset($row[$name]))
-			$value = $this->getTypedValue($registry,$row[$name]);
+			$value=$this->getTypedValue($registry, $row[$name]);
 		if(($value===null) && ($this->getNullValue()!==null))
-			$value = $this->getTypedValue($registry,$this->getNullValue());
+			$value=$this->getTypedValue($registry, $this->getNullValue());
 		return $value;
 	}
 
@@ -250,9 +250,9 @@ 
 	 * @param mixed raw property value
 	 * @return mixed property value casted to specific type.
 	 */
-	protected function getTypedValue($registry,$value)
+	protected function getTypedValue($registry, $value)
 	{
-		if(($handler = $this->createTypeHandler($registry))!==null)
+		if(($handler=$this->createTypeHandler($registry))!==null)
 			return $handler->getResult($value);
 		else
 			return $registry->convertToType($this->getType(), $value);
@@ -268,7 +268,7 @@ 
 		$type=$this->getTypeHandler() ? $this->getTypeHandler() : $this->getType();
 		$handler=$registry->getTypeHandler($type);
 		if($handler===null && $this->getTypeHandler())
-			$handler = Prado::createComponent($type);
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -278,17 +278,17 @@ 
 	 */
 	protected function getPropertyValueType()
 	{
-		if(class_exists($type = $this->getType(), false)) //NO force autoloading
+		if(class_exists($type=$this->getType(), false)) //NO force autoloading
 		{
 			if($type==='TList')
 				return self::LIST_TYPE;
-			$class = new ReflectionClass($type);
+			$class=new ReflectionClass($type);
 			if($class->isSubclassOf('TList'))
 				return self::LIST_TYPE;
 			if($class->implementsInterface('ArrayAccess'))
 				return self::ARRAY_TYPE;
 		}
-		if(strtolower($type) == 'array')
+		if(strtolower($type)=='array')
 			return self::ARRAY_TYPE;
 	}
 
@@ -301,8 +301,8 @@ 
 	public function instanceOfListType($target)
 	{
 		if($this->getType()===null)
-			return  TPropertyAccess::get($target,$this->getProperty()) instanceof TList;
-		return $this->getPropertyValueType() == self::LIST_TYPE;
+			return  TPropertyAccess::get($target, $this->getProperty()) instanceof TList;
+		return $this->getPropertyValueType()==self::LIST_TYPE;
 	}
 
 	/**
@@ -315,28 +315,28 @@ 
 	{
 		if($this->getType()===null)
 		{
-			$prop = TPropertyAccess::get($target,$this->getProperty());
+			$prop=TPropertyAccess::get($target, $this->getProperty());
 			if(is_object($prop))
 				return $prop instanceof ArrayAccess;
 			return is_array($prop);
 		}
-		return $this->getPropertyValueType() == self::ARRAY_TYPE;
+		return $this->getPropertyValueType()==self::ARRAY_TYPE;
 	}
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = 'TResultProperty';
-		if ($this->_nullValue===null) $exprops[] = "\0$cn\0_nullValue";
-		if ($this->_propertyName===null) $exprops[] = "\0$cn\0_propertyNama";
-		if ($this->_columnName===null) $exprops[] = "\0$cn\0_columnName";
-		if ($this->_columnIndex==-1) $exprops[] = "\0$cn\0_columnIndex";
-		if ($this->_nestedResultMapName===null) $exprops[] = "\0$cn\0_nestedResultMapName";
-		if ($this->_nestedResultMap===null) $exprops[] = "\0$cn\0_nestedResultMap";
-		if ($this->_valueType===null) $exprops[] = "\0$cn\0_valueType";
-		if ($this->_typeHandler===null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_isLazyLoad===false) $exprops[] = "\0$cn\0_isLazyLoad";
-		if ($this->_select===null) $exprops[] = "\0$cn\0_select";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn='TResultProperty';
+		if($this->_nullValue===null) $exprops[]="\0$cn\0_nullValue";
+		if($this->_propertyName===null) $exprops[]="\0$cn\0_propertyNama";
+		if($this->_columnName===null) $exprops[]="\0$cn\0_columnName";
+		if($this->_columnIndex==-1) $exprops[]="\0$cn\0_columnIndex";
+		if($this->_nestedResultMapName===null) $exprops[]="\0$cn\0_nestedResultMapName";
+		if($this->_nestedResultMap===null) $exprops[]="\0$cn\0_nestedResultMap";
+		if($this->_valueType===null) $exprops[]="\0$cn\0_valueType";
+		if($this->_typeHandler===null) $exprops[]="\0$cn\0_typeHandler";
+		if($this->_isLazyLoad===false) $exprops[]="\0$cn\0_isLazyLoad";
+		if($this->_select===null) $exprops[]="\0$cn\0_select";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

framework/Data/SqlMap/Configuration/TSqlMapStatement.php

Doc Comments +1 added lines

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

Spacing +41 added lines, -41 removed lines

@@ -73,7 +73,7 @@ 
 	 */
 	public function setParameterMap($value)
 	{
-		$this->_parameterMapName = $value;
+		$this->_parameterMapName=$value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function setParameterClass($value)
 	{
-		$this->_parameterClassName = $value;
+		$this->_parameterClassName=$value;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function setResultMap($value)
 	{
-		$this->_resultMapName = $value;
+		$this->_resultMapName=$value;
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function setResultClass($value)
 	{
-		$this->_resultClassName = $value;
+		$this->_resultClassName=$value;
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setCacheModel($value)
 	{
-		$this->_cacheModelName = $value;
+		$this->_cacheModelName=$value;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function setCache($value)
 	{
-		$this->_cache = $value;
+		$this->_cache=$value;
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 */
 	public function setSqlText($value)
 	{
-		$this->_SQL = $value;
+		$this->_SQL=$value;
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 */
 	public function setListClass($value)
 	{
-		$this->_listClass = $value;
+		$this->_listClass=$value;
 	}
 
 	/**
@@ -212,7 +212,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extendStatement = $value;
+		$this->_extendStatement=$value;
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setInlineParameterMap($map)
 	{
-		$this->_parameterMap = $map;
+		$this->_parameterMap=$map;
 	}
 
 	/**
@@ -247,9 +247,9 @@ 
 	public function initialize($manager)
 	{
 		if(strlen($this->_resultMapName) > 0)
-			$this->_resultMap = $manager->getResultMap($this->_resultMapName);
+			$this->_resultMap=$manager->getResultMap($this->_resultMapName);
 		if(strlen($this->_parameterMapName) > 0)
-			$this->_parameterMap = $manager->getParameterMap($this->_parameterMapName);
+			$this->_parameterMap=$manager->getParameterMap($this->_parameterMapName);
 	}
 
 	/**
@@ -258,8 +258,8 @@ 
 	 */
 	public function createInstanceOfListClass($registry)
 	{
-		if(strlen($type = $this->getListClass()) > 0)
-			return $this->createInstanceOf($registry,$type);
+		if(strlen($type=$this->getListClass()) > 0)
+			return $this->createInstanceOf($registry, $type);
 		return array();
 	}
 
@@ -270,9 +270,9 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	protected function createInstanceOf($registry,$type,$row=null)
+	protected function createInstanceOf($registry, $type, $row=null)
 	{
-		$handler = $registry->getTypeHandler($type);
+		$handler=$registry->getTypeHandler($type);
 		if($handler!==null)
 			return $handler->createNewInstance($row);
 		else
@@ -285,30 +285,30 @@ 
 	 * @param array result data.
 	 * @return mixed result object.
 	 */
-	public function createInstanceOfResultClass($registry,$row)
+	public function createInstanceOfResultClass($registry, $row)
 	{
-		if(strlen($type= $this->getResultClass()) > 0)
-			return $this->createInstanceOf($registry,$type,$row);
+		if(strlen($type=$this->getResultClass()) > 0)
+			return $this->createInstanceOf($registry, $type, $row);
 	}
 
 	public function __sleep()
 	{
-		$cn = __CLASS__;
-		$exprops = array("\0$cn\0_resultMap");
-		if (!$this->_parameterMapName) $exprops[] = "\0$cn\0_parameterMapName";
-		if (!$this->_parameterMap) $exprops[] = "\0$cn\0_parameterMap";
-		if (!$this->_parameterClassName) $exprops[] = "\0$cn\0_parameterClassName";
-		if (!$this->_resultMapName) $exprops[] = "\0$cn\0_resultMapName";
-		if (!$this->_resultMap) $exprops[] = "\0$cn\0_resultMap";
-		if (!$this->_resultClassName) $exprops[] = "\0$cn\0_resultClassName";
-		if (!$this->_cacheModelName) $exprops[] = "\0$cn\0_cacheModelName";
-		if (!$this->_SQL) $exprops[] = "\0$cn\0_SQL";
-		if (!$this->_listClass) $exprops[] = "\0$cn\0_listClass";
-		if (!$this->_typeHandler) $exprops[] = "\0$cn\0_typeHandler";
-		if (!$this->_extendStatement) $exprops[] = "\0$cn\0_extendStatement";
-		if (!$this->_cache) $exprops[] = "\0$cn\0_cache";
+		$cn=__CLASS__;
+		$exprops=array("\0$cn\0_resultMap");
+		if(!$this->_parameterMapName) $exprops[]="\0$cn\0_parameterMapName";
+		if(!$this->_parameterMap) $exprops[]="\0$cn\0_parameterMap";
+		if(!$this->_parameterClassName) $exprops[]="\0$cn\0_parameterClassName";
+		if(!$this->_resultMapName) $exprops[]="\0$cn\0_resultMapName";
+		if(!$this->_resultMap) $exprops[]="\0$cn\0_resultMap";
+		if(!$this->_resultClassName) $exprops[]="\0$cn\0_resultClassName";
+		if(!$this->_cacheModelName) $exprops[]="\0$cn\0_cacheModelName";
+		if(!$this->_SQL) $exprops[]="\0$cn\0_SQL";
+		if(!$this->_listClass) $exprops[]="\0$cn\0_listClass";
+		if(!$this->_typeHandler) $exprops[]="\0$cn\0_typeHandler";
+		if(!$this->_extendStatement) $exprops[]="\0$cn\0_extendStatement";
+		if(!$this->_cache) $exprops[]="\0$cn\0_cache";
 
-		return array_diff(parent::__sleep(),$exprops);
+		return array_diff(parent::__sleep(), $exprops);
 	}
 
 }
@@ -324,8 +324,8 @@ 
 {
 	private $_generate;
 
-	public function getGenerate(){ return $this->_generate; }
-	public function setGenerate($value){ $this->_generate = $value; }
+	public function getGenerate() { return $this->_generate; }
+	public function setGenerate($value) { $this->_generate=$value; }
 }
 
 /**
@@ -355,7 +355,7 @@ 
 	 */
 	public function setSelectKey($value)
 	{
-		$this->_selectKey = $value;
+		$this->_selectKey=$value;
 	}
 }
 
@@ -390,7 +390,7 @@ 
  */
 class TSqlMapSelectKey extends TSqlMapStatement
 {
-	private $_type = 'post';
+	private $_type='post';
 	private $_property;
 
 	/**
@@ -406,7 +406,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = strtolower($value) == 'post' ? 'post' : 'pre';
+		$this->_type=strtolower($value)=='post' ? 'post' : 'pre';
 	}
 
 	/**
@@ -422,7 +422,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_property = $value;
+		$this->_property=$value;
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	 */
 	public function getIsAfter()
 	{
-		return $this->_type == 'post';
+		return $this->_type=='post';
 	}
 }
 

framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php

Doc Comments +12 added lines, -2 removed lines

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

Braces +1 added lines, -2 removed lines

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

Spacing +125 added lines, -125 removed lines

@@ -29,8 +29,8 @@ 
 	{
 		if(isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
-			$this->setObjectPropFromNode($obj,$node,array('class'));
+			$obj=Prado::createComponent((string) $node['class']);
+			$this->setObjectPropFromNode($obj, $node, array('class'));
 			return $obj;
 		}
 		throw new TSqlMapConfigurationException(
@@ -45,14 +45,14 @@ 
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
 	 */
-	protected function setObjectPropFromNode($obj,$node,$except=array())
+	protected function setObjectPropFromNode($obj, $node, $except=array())
 	{
 		foreach($node->attributes() as $name=>$value)
 		{
-			if(!in_array($name,$except))
+			if(!in_array($name, $except))
 			{
 				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
+					$obj->{$name}=(string) $value;
 				else
 					throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
@@ -67,12 +67,12 @@ 
 	 * @param string relative filename
 	 * @return string absolute filename.
 	 */
-	protected function getAbsoluteFilePath($basefile,$resource)
+	protected function getAbsoluteFilePath($basefile, $resource)
 	{
-		$basedir = dirname($basefile);
-		$file = realpath($basedir.DIRECTORY_SEPARATOR.$resource);
+		$basedir=dirname($basefile);
+		$file=realpath($basedir.DIRECTORY_SEPARATOR.$resource);
 		if(!is_string($file) || !is_file($file))
-			$file = realpath($resource);
+			$file=realpath($resource);
 		if(is_string($file) && is_file($file))
 			return $file;
 		else
@@ -85,10 +85,10 @@ 
 	 * @param string filename.
 	 * @return SimpleXmlElement xml document.
 	 */
-	protected function loadXmlDocument($filename,TSqlMapXmlConfiguration $config)
+	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if( strpos($filename, '${') !== false)
-			$filename = $config->replaceProperties($filename);
+		if(strpos($filename, '${')!==false)
+			$filename=$config->replaceProperties($filename);
 
 		if(!is_file($filename))
 			throw new TSqlMapConfigurationException(
@@ -106,9 +106,9 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(array('id','ID','Id', 'iD') as $id)
+		foreach(array('id', 'ID', 'Id', 'iD') as $id)
 		{
-			$xpath = "//{$tag}[@{$id}='{$value}']";
+			$xpath="//{$tag}[@{$id}='{$value}']";
 			foreach($document->xpath($xpath) as $node)
 				return $node;
 		}
@@ -169,7 +169,7 @@ 
 	public function configure($filename=null)
 	{
 		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this);
+		$document=$this->loadXmlDocument($filename, $this);
 
 		foreach($document->xpath('//property') as $property)
 			$this->loadGlobalProperty($property);
@@ -181,7 +181,7 @@ 
 			$this->loadDatabaseConnection($conn);
 
 		//try to load configuration in the current config file.
-		$mapping = new TSqlMapXmlMappingConfiguration($this);
+		$mapping=new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
 		foreach($document->xpath('//sqlMap') as $sqlmap)
@@ -197,7 +197,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']]=(string) $node['value'];
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	protected function loadTypeHandler($node)
 	{
-		$handler = $this->createObjectFromNode($node);
+		$handler=$this->createObjectFromNode($node);
 		$this->_manager->getTypeHandlers()->registerTypeHandler($handler);
 	}
 
@@ -216,7 +216,7 @@ 
 	 */
 	protected function loadDatabaseConnection($node)
 	{
-		$conn = $this->createObjectFromNode($node);
+		$conn=$this->createObjectFromNode($node);
 		$this->_manager->setDbConnection($conn);
 	}
 
@@ -226,13 +226,13 @@ 
 	 */
 	protected function loadSqlMappingFiles($node)
 	{
-		if(strlen($resource = (string)$node['resource']) > 0)
+		if(strlen($resource=(string) $node['resource']) > 0)
 		{
-			if( strpos($resource, '${') !== false)
-				$resource = $this->replaceProperties($resource);
+			if(strpos($resource, '${')!==false)
+				$resource=$this->replaceProperties($resource);
 
-			$mapping = new TSqlMapXmlMappingConfiguration($this);
-			$filename = $this->getAbsoluteFilePath($this->_configFile, $resource);
+			$mapping=new TSqlMapXmlMappingConfiguration($this);
+			$filename=$this->getAbsoluteFilePath($this->_configFile, $resource);
 			$mapping->configure($filename);
 		}
 	}
@@ -242,12 +242,12 @@ 
 	 */
 	protected function resolveResultMapping()
 	{
-		$maps = $this->_manager->getResultMaps();
+		$maps=$this->_manager->getResultMaps();
 		foreach($maps as $entry)
 		{
 			foreach($entry->getColumns() as $item)
 			{
-				$resultMap = $item->getResultMapping();
+				$resultMap=$item->getResultMapping();
 				if(strlen($resultMap) > 0)
 				{
 					if($maps->contains($resultMap))
@@ -270,9 +270,9 @@ 
 	{
 		foreach($this->_manager->getMappedStatements() as $mappedStatement)
 		{
-			if(strlen($model = $mappedStatement->getStatement()->getCacheModel()) > 0)
+			if(strlen($model=$mappedStatement->getStatement()->getCacheModel()) > 0)
 			{
-				$cache = $this->_manager->getCacheModel($model);
+				$cache=$this->_manager->getCacheModel($model);
 				$mappedStatement->getStatement()->setCache($cache);
 			}
 		}
@@ -287,7 +287,7 @@ 
 	public function replaceProperties($string)
 	{
 		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${'.$find.'}', $replace, $string);
+			$string=str_replace('${'.$find.'}', $replace, $string);
 		return $string;
 	}
 }
@@ -342,12 +342,12 @@ 
 	public function configure($filename)
 	{
 		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this->_xmlConfig);
+		$document=$this->loadXmlDocument($filename, $this->_xmlConfig);
 		$this->_document=$document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
-			$bCacheDependencies = true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		if($bCacheDependencies===null)
+			$bCacheDependencies=true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
 		if($bCacheDependencies)
 			$this->_manager->getCacheDependencies()
@@ -390,14 +390,14 @@ 
 	 */
 	protected function loadResultMap($node)
 	{
-		$resultMap = $this->createResultMap($node);
+		$resultMap=$this->createResultMap($node);
 
 		//find extended result map.
-		if(strlen($extendMap = $resultMap->getExtends()) > 0)
+		if(strlen($extendMap=$resultMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getResultMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'resultMap',$extendMap);
+				$extendNode=$this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
 				if($extendNode!==null)
 					$this->loadResultMap($extendNode);
 			}
@@ -406,7 +406,7 @@ 
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
 
-			$superMap = $this->_manager->getResultMap($extendMap);
+			$superMap=$this->_manager->getResultMap($extendMap);
 			$resultMap->getColumns()->mergeWith($superMap->getColumns());
 		}
 
@@ -423,22 +423,22 @@ 
 	 */
 	protected function createResultMap($node)
 	{
-		$resultMap = new TResultMap();
-		$this->setObjectPropFromNode($resultMap,$node);
+		$resultMap=new TResultMap();
+		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
 		foreach($node->result as $result)
 		{
-			$property = new TResultProperty($resultMap);
-			$this->setObjectPropFromNode($property,$result);
+			$property=new TResultProperty($resultMap);
+			$this->setObjectPropFromNode($property, $result);
 			$resultMap->addResultProperty($property);
 		}
 
 		//create the discriminator
-		$discriminator = null;
+		$discriminator=null;
 		if(isset($node->discriminator))
 		{
-			$discriminator = new TDiscriminator();
+			$discriminator=new TDiscriminator();
 			$this->setObjectPropFromNode($discriminator, $node->discriminator);
 			$discriminator->initMapping($resultMap);
 		}
@@ -447,9 +447,9 @@ 
 		{
 			if($discriminator===null)
 				throw new TSqlMapConfigurationException(
-					'sqlmap_undefined_discriminator', $node, $this->_configFile,$subMapNode);
-			$subMap = new TSubMap;
-			$this->setObjectPropFromNode($subMap,$subMapNode);
+					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
+			$subMap=new TSubMap;
+			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
@@ -466,24 +466,24 @@ 
 	 */
 	protected function loadParameterMap($node)
 	{
-		$parameterMap = $this->createParameterMap($node);
+		$parameterMap=$this->createParameterMap($node);
 
-		if(strlen($extendMap = $parameterMap->getExtends()) > 0)
+		if(strlen($extendMap=$parameterMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'parameterMap',$extendMap);
+				$extendNode=$this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
 				if($extendNode!==null)
 					$this->loadParameterMap($extendNode);
 			}
 
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
-					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile,$extendMap);
-			$superMap = $this->_manager->getParameterMap($extendMap);
-			$index = 0;
+					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile, $extendMap);
+			$superMap=$this->_manager->getParameterMap($extendMap);
+			$index=0;
 			foreach($superMap->getPropertyNames() as $propertyName)
-				$parameterMap->insertProperty($index++,$superMap->getProperty($propertyName));
+				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
 		}
 		$this->_manager->addParameterMap($parameterMap);
 	}
@@ -495,12 +495,12 @@ 
 	 */
 	protected function createParameterMap($node)
 	{
-		$parameterMap = new TParameterMap();
-		$this->setObjectPropFromNode($parameterMap,$node);
+		$parameterMap=new TParameterMap();
+		$this->setObjectPropFromNode($parameterMap, $node);
 		foreach($node->parameter as $parameter)
 		{
-			$property = new TParameterProperty();
-			$this->setObjectPropFromNode($property,$parameter);
+			$property=new TParameterProperty();
+			$this->setObjectPropFromNode($property, $parameter);
 			$parameterMap->addProperty($property);
 		}
 		return $parameterMap;
@@ -512,10 +512,10 @@ 
 	 */
 	protected function loadStatementTag($node)
 	{
-		$statement = new TSqlMapStatement();
-		$this->setObjectPropFromNode($statement,$node);
+		$statement=new TSqlMapStatement();
+		$this->setObjectPropFromNode($statement, $node);
 		$this->processSqlStatement($statement, $node);
-		$mappedStatement = new TMappedStatement($this->_manager, $statement);
+		$mappedStatement=new TMappedStatement($this->_manager, $statement);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -527,15 +527,15 @@ 
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
-		$commandText = (string)$node;
-		if(strlen($extend = $statement->getExtends()) > 0)
+		$commandText=(string) $node;
+		if(strlen($extend=$statement->getExtends()) > 0)
 		{
-			$superNode = $this->getElementByIdValue($this->_document,'*',$extend);
+			$superNode=$this->getElementByIdValue($this->_document, '*', $extend);
 			if($superNode!==null)
-				$commandText = (string)$superNode . $commandText;
+				$commandText=(string) $superNode.$commandText;
 			else
 				throw new TSqlMapConfigurationException(
-						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile,$node);
+						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
 		}
 		//$commandText = $this->_xmlConfig->replaceProperties($commandText);
 		$statement->initialize($this->_manager);
@@ -550,27 +550,27 @@ 
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
-		$scope['file'] = $this->_configFile;
-		$scope['node'] = $node;
+		$scope['file']=$this->_configFile;
+		$scope['node']=$node;
 
-		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP,self::INLINE_PLACEHOLDER,$sqlStatement);
-		if($statement->parameterMap() === null)
+		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
+		if($statement->parameterMap()===null)
 		{
 			// Build a Parametermap with the inline parameters.
 			// if they exist. Then delete inline infos from sqltext.
-			$parameterParser = new TInlineParameterMapParser;
-			$sqlText = $parameterParser->parse($sqlStatement, $scope);
+			$parameterParser=new TInlineParameterMapParser;
+			$sqlText=$parameterParser->parse($sqlStatement, $scope);
 			if(count($sqlText['parameters']) > 0)
 			{
-				$map = new TParameterMap();
+				$map=new TParameterMap();
 				$map->setID($statement->getID().'-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
 				foreach($sqlText['parameters'] as $property)
 					$map->addProperty($property);
 			}
-			$sqlStatement = $sqlText['sql'];
+			$sqlStatement=$sqlText['sql'];
 		}
-		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/',self::INLINE_SYMBOL,$sqlStatement);
+		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/', self::INLINE_SYMBOL, $sqlStatement);
 
 		$this->prepareSql($statement, $sqlStatement, $node);
 	}
@@ -582,19 +582,19 @@ 
 	 * @param SimpleXmlElement statement node.
 	 * @todo Extend to dynamic sql.
 	 */
-	protected function prepareSql($statement,$sqlStatement, $node)
+	protected function prepareSql($statement, $sqlStatement, $node)
 	{
-		$simpleDynamic = new TSimpleDynamicParser;
-		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP,self::SIMPLE_PLACEHOLDER,$sqlStatement);
-		$dynamics = $simpleDynamic->parse($sqlStatement);
+		$simpleDynamic=new TSimpleDynamicParser;
+		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
+		$dynamics=$simpleDynamic->parse($sqlStatement);
 		if(count($dynamics['parameters']) > 0)
 		{
-			$sql = new TSimpleDynamicSql($dynamics['parameters']);
-			$sqlStatement = $dynamics['sql'];
+			$sql=new TSimpleDynamicSql($dynamics['parameters']);
+			$sqlStatement=$dynamics['sql'];
 		}
 		else
-			$sql = new TStaticSql();
-		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
+			$sql=new TStaticSql();
+		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
 	}
@@ -605,12 +605,12 @@ 
 	 */
 	protected function loadSelectTag($node)
 	{
-		$select = new TSqlMapSelect;
-		$this->setObjectPropFromNode($select,$node);
-		$this->processSqlStatement($select,$node);
-		$mappedStatement = new TMappedStatement($this->_manager, $select);
+		$select=new TSqlMapSelect;
+		$this->setObjectPropFromNode($select, $node);
+		$this->processSqlStatement($select, $node);
+		$mappedStatement=new TMappedStatement($this->_manager, $select);
 		if(strlen($select->getCacheModel()) > 0)
-			$mappedStatement = new TCachingStatement($mappedStatement);
+			$mappedStatement=new TCachingStatement($mappedStatement);
 
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
@@ -621,9 +621,9 @@ 
 	 */
 	protected function loadInsertTag($node)
 	{
-		$insert = $this->createInsertStatement($node);
+		$insert=$this->createInsertStatement($node);
 		$this->processSqlStatement($insert, $node);
-		$mappedStatement = new TInsertMappedStatement($this->_manager, $insert);
+		$mappedStatement=new TInsertMappedStatement($this->_manager, $insert);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -634,10 +634,10 @@ 
 	 */
 	protected function createInsertStatement($node)
 	{
-		$insert = new TSqlMapInsert;
-		$this->setObjectPropFromNode($insert,$node);
+		$insert=new TSqlMapInsert;
+		$this->setObjectPropFromNode($insert, $node);
 		if(isset($node->selectKey))
-			$this->loadSelectKeyTag($insert,$node->selectKey);
+			$this->loadSelectKeyTag($insert, $node->selectKey);
 		return $insert;
 	}
 
@@ -647,13 +647,13 @@ 
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
-		$selectKey = new TSqlMapSelectKey;
-		$this->setObjectPropFromNode($selectKey,$node);
+		$selectKey=new TSqlMapSelectKey;
+		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
 		$selectKey->setID($insert->getID().'.SelectKey');
-		$this->processSqlStatement($selectKey,$node);
+		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
-		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
+		$mappedStatement=new TMappedStatement($this->_manager, $selectKey);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -663,10 +663,10 @@ 
 	 */
 	protected function loadUpdateTag($node)
 	{
-		$update = new TSqlMapUpdate;
-		$this->setObjectPropFromNode($update,$node);
+		$update=new TSqlMapUpdate;
+		$this->setObjectPropFromNode($update, $node);
 		$this->processSqlStatement($update, $node);
-		$mappedStatement = new TUpdateMappedStatement($this->_manager, $update);
+		$mappedStatement=new TUpdateMappedStatement($this->_manager, $update);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -676,10 +676,10 @@ 
 	 */
 	protected function loadDeleteTag($node)
 	{
-		$delete = new TSqlMapDelete;
-		$this->setObjectPropFromNode($delete,$node);
+		$delete=new TSqlMapDelete;
+		$this->setObjectPropFromNode($delete, $node);
 		$this->processSqlStatement($delete, $node);
-		$mappedStatement = new TDeleteMappedStatement($this->_manager, $delete);
+		$mappedStatement=new TDeleteMappedStatement($this->_manager, $delete);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -699,35 +699,35 @@ 
 	 */
 	protected function loadCacheModel($node)
 	{
-		$cacheModel = new TSqlMapCacheModel;
-		$properties = array('id','implementation');
+		$cacheModel=new TSqlMapCacheModel;
+		$properties=array('id', 'implementation');
 		foreach($node->attributes() as $name=>$value)
 		{
 			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set'.$name}((string)$value);
+				$cacheModel->{'set'.$name}((string) $value);
 		}
-		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
-		$this->setObjectPropFromNode($cache,$node,$properties);
+		$cache=Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
+		$this->setObjectPropFromNode($cache, $node, $properties);
 
 		foreach($node->xpath('property') as $propertyNode)
 		{
-			$name = $propertyNode->attributes()->name;
+			$name=$propertyNode->attributes()->name;
 			if($name===null || $name==='') continue;
 
-			$value = $propertyNode->attributes()->value;
+			$value=$propertyNode->attributes()->value;
 			if($value===null || $value==='') continue;
 
-			if( !TPropertyAccess::has($cache, $name) ) continue;
+			if(!TPropertyAccess::has($cache, $name)) continue;
 
 			TPropertyAccess::set($cache, $name, $value);
 		}
 
-		$this->loadFlushInterval($cacheModel,$node);
+		$this->loadFlushInterval($cacheModel, $node);
 
 		$cacheModel->initialize($cache);
 		$this->_manager->addCacheModel($cacheModel);
 		foreach($node->xpath('flushOnExecute') as $flush)
-			$this->loadFlushOnCache($cacheModel,$node,$flush);
+			$this->loadFlushOnCache($cacheModel, $node, $flush);
 	}
 
 	/**
@@ -737,27 +737,27 @@ 
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
-		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
-		$duration = 0;
+		$flushInterval=$node->xpath('flushInterval');
+		if($flushInterval===null || count($flushInterval)===0) return;
+		$duration=0;
 		foreach($flushInterval[0]->attributes() as $name=>$value)
 		{
 			switch(strToLower($name))
 			{
 				case 'seconds':
-					$duration += (integer)$value;
+					$duration+=(integer) $value;
 				break;
 				case 'minutes':
-					$duration += 60 * (integer)$value;
+					$duration+=60 * (integer) $value;
 				break;
 				case 'hours':
-					$duration += 3600 * (integer)$value;
+					$duration+=3600 * (integer) $value;
 				break;
 				case 'days':
-					$duration += 86400 * (integer)$value;
+					$duration+=86400 * (integer) $value;
 				break;
 				case 'duration':
-					$duration = (integer)$value;
+					$duration=(integer) $value;
 				break 2; // switch, foreach
 			}
 		}
@@ -770,15 +770,15 @@ 
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
 	 */
-	protected function loadFlushOnCache($cacheModel,$parent,$node)
+	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
-		$id = $cacheModel->getID();
+		$id=$cacheModel->getID();
 		if(!isset($this->_FlushOnExecuteStatements[$id]))
-			$this->_FlushOnExecuteStatements[$id] = array();
+			$this->_FlushOnExecuteStatements[$id]=array();
 		foreach($node->attributes() as $name=>$value)
 		{
 			if(strtolower($name)==='statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+				$this->_FlushOnExecuteStatements[$id][]=(string) $value;
 		}
 	}
 
@@ -789,10 +789,10 @@ 
 	{
 		foreach($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
 		{
-			$cacheModel = $this->_manager->getCacheModel($cacheID);
+			$cacheModel=$this->_manager->getCacheModel($cacheID);
 			foreach($statementIDs as $statementID)
 			{
-				$statement = $this->_manager->getMappedStatement($statementID);
+				$statement=$this->_manager->getMappedStatement($statementID);
 				$cacheModel->registerTriggerStatement($statement);
 			}
 		}

framework/Data/SqlMap/DataMapper/TLazyLoadList.php

Doc Comments +1 added lines

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

Spacing +14 added lines, -14 removed lines

@@ -36,11 +36,11 @@ 
 	 */
 	protected function __construct($mappedStatement, $param, $target, $propertyName)
 	{
-		$this->_param = $param;
-		$this->_target = $target;
-		$this->_statement = $mappedStatement;
+		$this->_param=$param;
+		$this->_target=$target;
+		$this->_statement=$mappedStatement;
 		$this->_connection=$mappedStatement->getManager()->getDbConnection();
-		$this->_propertyName = $propertyName;
+		$this->_propertyName=$propertyName;
 	}
 
 	/**
@@ -53,12 +53,12 @@ 
 	 */
 	public static function newInstance($mappedStatement, $param, $target, $propertyName)
 	{
-		$handler = new self($mappedStatement, $param, $target, $propertyName);
-		$statement = $mappedStatement->getStatement();
+		$handler=new self($mappedStatement, $param, $target, $propertyName);
+		$statement=$mappedStatement->getStatement();
 		$registry=$mappedStatement->getManager()->getTypeHandlers();
-		$list = $statement->createInstanceOfListClass($registry);
+		$list=$statement->createInstanceOfListClass($registry);
 		if(!is_object($list))
-			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list',$statement->getID());
+			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
 		return new TObjectProxy($handler, $list);
 	}
 
@@ -77,10 +77,10 @@ 
 	 */
 	protected function fetchListData()
 	{
-		if($this->_loaded == false)
+		if($this->_loaded==false)
 		{
-			$this->_innerList = $this->_statement->executeQueryForList($this->_connection,$this->_param);
-			$this->_loaded = true;
+			$this->_innerList=$this->_statement->executeQueryForList($this->_connection, $this->_param);
+			$this->_loaded=true;
 			//replace the target property with real list
 			TPropertyAccess::set($this->_target, $this->_propertyName, $this->_innerList);
 		}
@@ -119,8 +119,8 @@ 
 	 */
 	public function __construct($handler, $object)
 	{
-		$this->_handler = $handler;
-		$this->_object = $object;
+		$this->_handler=$handler;
+		$this->_object=$object;
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 * @param array method arguments
 	 * @return mixed method return value.
 	 */
-	public function __call($method,$params)
+	public function __call($method, $params)
 	{
 		if($this->_handler->hasMethod($method))
 			return $this->_handler->intercept($method, $params);

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TLazyLoadList, TObjectProxy classes file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.SqlMap
- */
+	 * TLazyLoadList, TObjectProxy classes file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.SqlMap
+	 */
 
 /**
  * TLazyLoadList executes mapped statements when the proxy collection is first accessed.

framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php

Doc Comments +3 added lines

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

Braces +4 added lines, -8 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -41,11 +41,11 @@ 
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
 	 */
-	public function __construct(IMappedStatement $statement,$parameter, $pageSize, $delegate=null, $page=0)
+	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate=null, $page=0)
 	{
 		parent::__construct();
 		parent::setCustomPaging(true);
-		$this->initialize($statement,$parameter, $pageSize, $page);
+		$this->initialize($statement, $parameter, $pageSize, $page);
 		$this->_delegate=$delegate;
 	}
 
@@ -58,8 +58,8 @@ 
 	 */
 	protected function initialize($statement, $parameter, $pageSize, $page)
 	{
-		$this->_statement = $statement;
-		$this->_parameter = $parameter;
+		$this->_statement=$statement;
+		$this->_parameter=$parameter;
 		$this->setPageSize($pageSize);
 		$this->attachEventHandler('OnFetchData', array($this, 'fetchDataFromStatement'));
 		$this->gotoPage($page);
@@ -80,9 +80,9 @@ 
 	 */
 	protected function fetchDataFromStatement($sender, $param)
 	{
-		$limit = $this->getOffsetAndLimit($param);
-		$connection = $this->_statement->getManager()->getDbConnection();
-		$data = $this->_statement->executeQueryForList($connection,
+		$limit=$this->getOffsetAndLimit($param);
+		$connection=$this->_statement->getManager()->getDbConnection();
+		$data=$this->_statement->executeQueryForList($connection,
 						$this->_parameter, null, $limit[0], $limit[1], $this->_delegate);
 		$this->populateData($param, $data);
 	}
@@ -112,49 +112,49 @@ 
 	 */
 	protected function populateData($param, $data)
 	{
-		$total = $data instanceof TList ? $data->getCount() : count($data);
-		$pageSize = $this->getPageSize();
+		$total=$data instanceof TList ? $data->getCount() : count($data);
+		$pageSize=$this->getPageSize();
 		if($total < 1)
 		{
 			$param->setData($data);
-			$this->_prevPageList = null;
-			$this->_nextPageList = null;
+			$this->_prevPageList=null;
+			$this->_nextPageList=null;
 			return;
 		}
 
 		if($param->getNewPageIndex() < 1)
 		{
-			$this->_prevPageList = null;
+			$this->_prevPageList=null;
 			if($total <= $pageSize)
 			{
 				$param->setData($data);
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize-1,$total);
+				$this->_nextPageList=array_slice($data, $pageSize - 1, $total);
 			}
 		}
 		else
 		{
 			if($total <= $pageSize)
 			{
-				$this->_prevPageList = array_slice($data, 0, $total);
+				$this->_prevPageList=array_slice($data, 0, $total);
 				$param->setData(array());
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
-			else if($total <= $pageSize*2)
+			else if($total <= $pageSize * 2)
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize*2, $total-$pageSize*2);
+				$this->_nextPageList=array_slice($data, $pageSize * 2, $total - $pageSize * 2);
 			}
 		}
 	}
@@ -166,9 +166,9 @@ 
 	 */
 	protected function getOffsetAndLimit($param)
 	{
-		$index = $param->getNewPageIndex();
-		$pageSize = $this->getPageSize();
-		return $index < 1 ? array($index, $pageSize*2) : array(($index-1)*$pageSize, $pageSize*3);
+		$index=$param->getNewPageIndex();
+		$pageSize=$this->getPageSize();
+		return $index < 1 ? array($index, $pageSize * 2) : array(($index - 1) * $pageSize, $pageSize * 3);
 	}
 
 	/**