pradosoft / prado

framework/Data/Common/TDbMetaData.php

Doc Comments -6 removed lines

@@ -127,8 +127,6 @@ 
 	/**
 	 * Quotes a table name for use in a query.
 	 * @param string $name table name
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted table name
 	 */
 	public function quoteTableName($name)
@@ -150,8 +148,6 @@ 
 	/**
 	 * Quotes a column name for use in a query.
 	 * @param string $name column name
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column name
 	 */
 	public function quoteColumnName($name)
@@ -166,8 +162,6 @@ 
 	/**
 	 * Quotes a column alias for use in a query.
 	 * @param string $name column alias
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column alias
 	 */
 	public function quoteColumnAlias($name)

Indentation +8 added lines, -8 removed lines

@@ -179,14 +179,14 @@
 		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * This method should be overridden by child classes in order to support this feature
-	 * because the default implementation simply throws an exception.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * This method should be overridden by child classes in order to support this feature
+		 * because the default implementation simply throws an exception.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	abstract public function findTableNames($schema='');
 }
 

Spacing +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
  */
 abstract class TDbMetaData extends TComponent
 {
-	private $_tableInfoCache=array();
+	private $_tableInfoCache = array();
 	private $_connection;
 
 	/**
@@ -34,7 +34,7 @@ 
 	 */
 	public function __construct($conn)
 	{
-		$this->_connection=$conn;
+		$this->_connection = $conn;
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	{
 		$conn->setActive(true); //must be connected before retrieving driver name
 		$driver = $conn->getDriverName();
-		switch(strtolower($driver))
+		switch (strtolower($driver))
 		{
 			case 'pgsql':
 				Prado::using('System.Data.Common.Pgsql.TPgsqlMetaData');
@@ -79,7 +79,7 @@ 
 //				Prado::using('System.Data.Common.IbmDb2.TIbmDb2MetaData');
 //				return new TIbmDb2MetaData($conn);
 			default:
-				throw new TDbException('ar_invalid_database_driver',$driver);
+				throw new TDbException('ar_invalid_database_driver', $driver);
 		}
 	}
 
@@ -88,13 +88,13 @@ 
 	 * @param string table or view name
 	 * @return TDbTableInfo table information.
 	 */
-	public function getTableInfo($tableName=null)
+	public function getTableInfo($tableName = null)
 	{
-		$key = $tableName===null?$this->getDbConnection()->getConnectionString():$tableName;
-		if(!isset($this->_tableInfoCache[$key]))
+		$key = $tableName === null ? $this->getDbConnection()->getConnectionString() : $tableName;
+		if (!isset($this->_tableInfoCache[$key]))
 		{
 			$class = $this->getTableInfoClass();
-			$tableInfo = $tableName===null ? new $class : $this->createTableInfo($tableName);
+			$tableInfo = $tableName === null ? new $class : $this->createTableInfo($tableName);
 			$this->_tableInfoCache[$key] = $tableInfo;
 		}
 		return $this->_tableInfoCache[$key];
@@ -105,7 +105,7 @@ 
 	 * @param string table name.
 	 * @return TDbCommandBuilder command builder instance for the given table.
 	 */
-	public function createCommandBuilder($tableName=null)
+	public function createCommandBuilder($tableName = null)
 	{
 		return $this->getTableInfo($tableName)->createCommandBuilder($this->getDbConnection());
 	}
@@ -139,10 +139,10 @@ 
 		$rgt = $lft = isset($args[1]) ? $args[1] : '';
 		$rgt = isset($args[2]) ? $args[2] : $rgt;
 
-		if(strpos($name, '.')===false)
+		if (strpos($name, '.') === false)
 			return $lft . $name . $rgt;
-		$names=explode('.', $name);
-		foreach($names as &$n)
+		$names = explode('.', $name);
+		foreach ($names as &$n)
 			$n = $lft . $n . $rgt;
 		return implode('.', $names);
 	}
@@ -187,6 +187,6 @@ 
 	 * If not empty, the returned table names will be prefixed with the schema name.
 	 * @return array all table names in the database.
 	 */
-	abstract public function findTableNames($schema='');
+	abstract public function findTableNames($schema = '');
 }
 

Braces +3 added lines, -2 removed lines

@@ -142,8 +142,9 @@
 		if(strpos($name, '.')===false)
 			return $lft . $name . $rgt;
 		$names=explode('.', $name);
-		foreach($names as &$n)
-			$n = $lft . $n . $rgt;
+		foreach($names as &$n) {
+					$n = $lft . $n . $rgt;
+		}
 		return implode('.', $names);
 	}
 

framework/Data/Common/TDbTableInfo.php

Doc Comments +3 added lines

@@ -47,6 +47,7 @@ 
 
 	/**
 	 * @param TDbConnection database connection.
+	 * @param TDbConnection $connection
 	 * @return TDbCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
@@ -58,6 +59,8 @@ 
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
+	 * @param boolean $default
 	 * @return mixed information array value.
 	 */
 	protected function getInfo($name,$default=null)

Spacing +18 added lines, -18 removed lines

@@ -18,7 +18,7 @@ 
  */
 class TDbTableInfo extends TComponent
 {
-	private $_info=array();
+	private $_info = array();
 
 	private $_primaryKeys;
 	private $_foreignKeys;
@@ -37,12 +37,12 @@ 
 	 * Sets the database table meta data information.
 	 * @param array table column information.
 	 */
-	public function __construct($tableInfo=array(),$primary=array(),$foreign=array())
+	public function __construct($tableInfo = array(), $primary = array(), $foreign = array())
 	{
-		$this->_info=$tableInfo;
-		$this->_primaryKeys=$primary;
-		$this->_foreignKeys=$foreign;
-		$this->_columns=new TMap;
+		$this->_info = $tableInfo;
+		$this->_primaryKeys = $primary;
+		$this->_foreignKeys = $foreign;
+		$this->_columns = new TMap;
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.TDbCommandBuilder');
-		return new TDbCommandBuilder($connection,$this);
+		return new TDbCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	protected function getInfo($name,$default=null)
+	protected function getInfo($name, $default = null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -69,9 +69,9 @@ 
 	 * @param string information array key name
 	 * @param mixed new information array value.
 	 */
-	protected function setInfo($name,$value)
+	protected function setInfo($name, $value)
 	{
-		$this->_info[$name]=$value;
+		$this->_info[$name] = $value;
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name))!==null)
+		if (($column = $this->_columns->itemAt($name)) !== null)
 			return $column;
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
@@ -123,10 +123,10 @@ 
 	 */
 	public function getColumnNames()
 	{
-		if($this->_names===null)
+		if ($this->_names === null)
 		{
-			$this->_names=array();
-			foreach($this->getColumns() as $column)
+			$this->_names = array();
+			foreach ($this->getColumns() as $column)
 				$this->_names[] = $column->getColumnName();
 		}
 		return $this->_names;
@@ -153,10 +153,10 @@ 
 	 */
 	public function getLowerCaseColumnNames()
 	{
-		if($this->_lowercase===null)
+		if ($this->_lowercase === null)
 		{
-			$this->_lowercase=array();
-			foreach($this->getColumns()->getKeys() as $key)
+			$this->_lowercase = array();
+			foreach ($this->getColumns()->getKeys() as $key)
 				$this->_lowercase[strtolower($key)] = $key;
 		}
 		return $this->_lowercase;

Braces +6 added lines, -4 removed lines

@@ -126,8 +126,9 @@ 
 		if($this->_names===null)
 		{
 			$this->_names=array();
-			foreach($this->getColumns() as $column)
-				$this->_names[] = $column->getColumnName();
+			foreach($this->getColumns() as $column) {
+							$this->_names[] = $column->getColumnName();
+			}
 		}
 		return $this->_names;
 	}
@@ -156,8 +157,9 @@ 
 		if($this->_lowercase===null)
 		{
 			$this->_lowercase=array();
-			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+			foreach($this->getColumns()->getKeys() as $key) {
+							$this->_lowercase[strtolower($key)] = $key;
+			}
 		}
 		return $this->_lowercase;
 	}

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

@@ -80,7 +80,7 @@ 
 		$where = $criteria->getCondition();
 		$parameters = $criteria->getParameters()->toArray();
 		$command = $this->getBuilder()->createDeleteCommand($where, $parameters);
-		$this->onCreateCommand($command,$criteria);
+		$this->onCreateCommand($command, $criteria);
 		$command->prepare();
 		return $command->execute();
 	}
@@ -95,8 +95,8 @@ 
 	{
 		$where = $criteria->getCondition();
 		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createUpdateCommand($data,$where, $parameters);
-		$this->onCreateCommand($command,$criteria);
+		$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));
 	}
 
@@ -141,7 +141,7 @@ 
 	 */
 	protected function getFindCommand($criteria)
 	{
-		if($criteria===null)
+		if ($criteria === null)
 			return $this->getBuilder()->createFindCommand();
 		$where = $criteria->getCondition();
 		$parameters = $criteria->getParameters()->toArray();
@@ -149,7 +149,7 @@ 
 		$limit = $criteria->getLimit();
 		$offset = $criteria->getOffset();
 		$select = $criteria->getSelect();
-		$command = $this->getBuilder()->createFindCommand($where,$parameters,$ordering,$limit,$offset,$select);
+		$command = $this->getBuilder()->createFindCommand($where, $parameters, $ordering, $limit, $offset, $select);
 		$this->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -160,11 +160,11 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys===null)
+		if ($keys === null)
 			return null;
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
+		list($where, $parameters) = $this->getPrimaryKeyCondition((array) $keys);
 		$command = $this->getBuilder()->createFindCommand($where, $parameters);
-		$this->onCreateCommand($command, new TSqlCriteria($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);
+		$where = $this->getCompositeKeyCondition((array) $keys);
 		$command = $this->getBuilder()->createFindCommand($where);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
-		return $this->onExecuteCommand($command,$command->query());
+		$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);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command,$command->query());
+		return $this->onExecuteCommand($command, $command->query());
 	}
 
 	/**
@@ -198,24 +198,24 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(count($keys)==0)
+		if (count($keys) == 0)
 			return 0;
-		$where = $this->getCompositeKeyCondition((array)$keys);
+		$where = $this->getCompositeKeyCondition((array) $keys);
 		$command = $this->getBuilder()->createDeleteCommand($where);
-		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
+		$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))
 			return 'FALSE';
 		$columns = array();
 		$tableName = $table->getTableFullName();
-		foreach($fields as $field)
-			$columns[] = $tableName.'.'.$table->getColumn($field)->getColumnName();
-		return '('.implode(', ',$columns).') IN '.$this->quoteTuple($values);
+		foreach ($fields as $field)
+			$columns[] = $tableName . '.' . $table->getColumn($field)->getColumnName();
+		return '(' . implode(', ', $columns) . ') IN ' . $this->quoteTuple($values);
 	}
 
 	/**
@@ -227,24 +227,24 @@ 
 	{
 		$primary = $this->getTableInfo()->getPrimaryKeys();
 		$count = count($primary);
-		if($count===0)
+		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])))
+		if ($count > 1 && (!isset($values[0]) || !is_array($values[0])))
 			$values = array($values);
-		if($count > 1 && count($values[0]) !== $count)
+		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);
 	}
 
 	/**
@@ -256,9 +256,9 @@ 
 	{
 		$conn = $this->getDbConnection();
 		$data = array();
-		foreach($array as $k=>$v)
+		foreach ($array as $k=>$v)
 			$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
-		return '('.implode(', ', $data).')';
+		return '(' . implode(', ', $data) . ')';
 	}
 
 	/**
@@ -269,19 +269,19 @@ 
 	protected function getPrimaryKeyCondition($values)
 	{
 		$primary = $this->getTableInfo()->getPrimaryKeys();
-		if(count($primary)===0)
+		if (count($primary) === 0)
 		{
 			throw new TDbException('dbtablegateway_no_primary_key_found',
 				$this->getTableInfo()->getTableFullName());
 		}
-		$criteria=array();
-		$bindings=array();
+		$criteria = array();
+		$bindings = array();
 		$i = 0;
-		foreach($primary as $key)
+		foreach ($primary as $key)
 		{
 			$column = $this->getTableInfo()->getColumn($key)->getColumnName();
-			$criteria[] = $column.' = :'.$key;
-			$bindings[$key] = isset($values[$key])?$values[$key]:$values[$i++];
+			$criteria[] = $column . ' = :' . $key;
+			$bindings[$key] = isset($values[$key]) ? $values[$key] : $values[$i++];
 		}
 		return array(implode(' AND ', $criteria), $bindings);
 	}
@@ -319,9 +319,9 @@ 
 		$ordering = $criteria->getOrdersBy();
 		$limit = $criteria->getLimit();
 		$offset = $criteria->getOffset();
-		if(count($ordering) > 0)
+		if (count($ordering) > 0)
 			$sql = $this->getBuilder()->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
+		if ($limit >= 0 || $offset >= 0)
 			$sql = $this->getBuilder()->applyLimitOffset($sql, $limit, $offset);
 		$command = $this->getBuilder()->createCommand($sql);
 		$this->getBuilder()->bindArrayValues($command, $criteria->getParameters()->toArray());
@@ -335,16 +335,16 @@ 
 	 */
 	public function count($criteria)
 	{
-		if($criteria===null)
-			return (int)$this->getBuilder()->createCountCommand()->queryScalar();
+		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);
+		$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());
 	}
 
 	/**
@@ -356,10 +356,10 @@ 
 	 */
 	public function insert($data)
 	{
-		$command=$this->getBuilder()->createInsertCommand($data);
-		$this->onCreateCommand($command, new TSqlCriteria(null,$data));
+		$command = $this->getBuilder()->createInsertCommand($data);
+		$this->onCreateCommand($command, new TSqlCriteria(null, $data));
 		$command->prepare();
-		if($this->onExecuteCommand($command, $command->execute()) > 0)
+		if ($this->onExecuteCommand($command, $command->execute()) > 0)
 		{
 			$value = $this->getLastInsertId();
 			return $value !== null ? $value : true;
@@ -386,13 +386,13 @@ 
 	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))
+		$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);
 	}
 
 	/**
@@ -406,21 +406,21 @@ 
 	{
 		$table = $this->getTableInfo();
 		$columns = $table->getLowerCaseColumnNames();
-		$regexp = '/('.implode('|', array_keys($columns)).')(and|_and_|or|_or_)?/i';
+		$regexp = '/(' . implode('|', array_keys($columns)) . ')(and|_and_|or|_or_)?/i';
 		$matches = array();
-		if(!preg_match_all($regexp, strtolower($condition), $matches,PREG_SET_ORDER))
+		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();
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$key = $columns[$match[1]];
 			$column = $table->getColumn($key)->getColumnName();
 			$sql = $column . ' = ? ';
-			if(count($match) > 2)
+			if (count($match) > 2)
 				$sql .= strtoupper(str_replace('_', '', $match[2]));
 			$fields[] = $sql;
 		}
@@ -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));
 	}
 
 	/**
@@ -471,10 +471,10 @@ 
 	private $_command;
 	private $_criteria;
 
-	public function __construct($command,$criteria)
+	public function __construct($command, $criteria)
 	{
-		$this->_command=$command;
-		$this->_criteria=$criteria;
+		$this->_command = $command;
+		$this->_criteria = $criteria;
 	}
 
 	/**
@@ -511,10 +511,10 @@ 
 	private $_command;
 	private $_result;
 
-	public function __construct($command,$result)
+	public function __construct($command, $result)
 	{
-		$this->_command=$command;
-		$this->_result=$result;
+		$this->_command = $command;
+		$this->_result = $result;
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function setResult($value)
 	{
-		$this->_result=$value;
+		$this->_result = $value;
 	}
 }
 

Braces +6 added lines, -4 removed lines

@@ -213,8 +213,9 @@ 
 			return 'FALSE';
 		$columns = array();
 		$tableName = $table->getTableFullName();
-		foreach($fields as $field)
-			$columns[] = $tableName.'.'.$table->getColumn($field)->getColumnName();
+		foreach($fields as $field) {
+					$columns[] = $tableName.'.'.$table->getColumn($field)->getColumnName();
+		}
 		return '('.implode(', ',$columns).') IN '.$this->quoteTuple($values);
 	}
 
@@ -256,8 +257,9 @@ 
 	{
 		$conn = $this->getDbConnection();
 		$data = array();
-		foreach($array as $k=>$v)
-			$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
+		foreach($array as $k=>$v) {
+					$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
+		}
 		return '('.implode(', ', $data).')';
 	}
 

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

@@ -33,7 +33,7 @@ 
 	 * @var mixed
 	 * @since 3.1.7
 	 */
-	private $_select='*';
+	private $_select = '*';
 	private $_condition;
 	private $_parameters;
 	private $_ordersBy;
@@ -45,14 +45,14 @@ 
 	 * @param string sql string after the WHERE stanza
 	 * @param mixed named or indexed parameters, accepts as multiple arguments.
 	 */
-	public function __construct($condition=null, $parameters=array())
+	public function __construct($condition = null, $parameters = array())
 	{
-		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(),1);
-		$this->_parameters=new TAttributeCollection;
+		if (!is_array($parameters) && func_num_args() > 1)
+			$parameters = array_slice(func_get_args(), 1);
+		$this->_parameters = new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
-		$this->_ordersBy=new TAttributeCollection;
+		$this->_parameters->copyFrom((array) $parameters);
+		$this->_ordersBy = new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
 		$this->setCondition($condition);
@@ -126,7 +126,7 @@ 
 	 */
 	public function setCondition($value)
 	{
-		if(empty($value)) {
+		if (empty($value)) {
 			// reset the condition
 			$this->_condition = null;
 			return;
@@ -138,32 +138,32 @@ 
 		//    [LIMIT {[offset,] row_count | row_count OFFSET offset}]
 		// See: http://dev.mysql.com/doc/refman/5.0/en/select.html
 
-		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
+		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);
-			if(strlen($matches[1]) > 0) {
+			if (strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
-			} else if(strlen($matches[2]) > 0) {
+			} else if (strlen($matches[2]) > 0) {
 				$this->setOrdersBy($matches[2]);
 			}
 		}
 
-		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
+		if (preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
 			$value = str_replace($matches[0], '', $value); // remove limit from query
-			if(strpos($matches[1], ',')) { // both offset and limit given
+			if (strpos($matches[1], ',')) { // both offset and limit given
 				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				$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) {
+		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
+			$this->_offset = (int) $matches[1]; // set offset in criteria
 		}
 
 		$this->_condition = trim($value);
@@ -182,7 +182,7 @@ 
 	 */
 	public function setParameters($value)
 	{
-		if(!(is_array($value) || $value instanceof ArrayAccess))
+		if (!(is_array($value) || $value instanceof ArrayAccess))
 			throw new TException('value must be array or ArrayAccess');
 		$this->_parameters->copyFrom($value);
 	}
@@ -192,7 +192,7 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k=>$v)
+		foreach ($this->getParameters() as $k=>$v)
 			return is_string($k);
 	}
 
@@ -209,16 +209,16 @@ 
 	 */
 	public function setOrdersBy($value)
 	{
-		if(is_array($value) || $value instanceof Traversable)
+		if (is_array($value) || $value instanceof Traversable)
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value=trim(preg_replace('/\s+/',' ',(string)$value));
-			$orderBys=array();
-			foreach(explode(',',$value) as $orderBy)
+			$value = trim(preg_replace('/\s+/', ' ', (string) $value));
+			$orderBys = array();
+			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);
 		}
@@ -237,7 +237,7 @@ 
 	 */
 	public function setLimit($value)
 	{
-		$this->_limit=$value;
+		$this->_limit = $value;
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function setOffset($value)
 	{
-		$this->_offset=$value;
+		$this->_offset = $value;
 	}
 
 	/**
@@ -262,22 +262,22 @@ 
 	public function __toString()
 	{
 		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"'.(string)$this->getCondition().'"';
+		if (strlen((string) $this->getCondition()) > 0)
+			$str .= '"' . (string) $this->getCondition() . '"';
 		$params = array();
-		foreach($this->getParameters() as $k=>$v)
+		foreach ($this->getParameters() as $k=>$v)
 			$params[] = "{$k} => ${v}";
-		if(count($params) > 0)
-			$str .= ', "'.implode(', ',$params).'"';
+		if (count($params) > 0)
+			$str .= ', "' . implode(', ', $params) . '"';
 		$orders = array();
-		foreach($this->getOrdersBy() as $k=>$v)
+		foreach ($this->getOrdersBy() as $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;
+		if (count($orders) > 0)
+			$str .= ', "' . implode(', ', $orders) . '"';
+		if ($this->_limit !== null)
+			$str .= ', ' . $this->_limit;
+		if ($this->_offset !== null)
+			$str .= ', ' . $this->_offset;
 		return $str;
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -192,8 +192,9 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k=>$v)
-			return is_string($k);
+		foreach($this->getParameters() as $k=>$v) {
+					return is_string($k);
+		}
 	}
 
 	/**
@@ -265,13 +266,15 @@ 
 		if(strlen((string)$this->getCondition()) > 0)
 			$str .= '"'.(string)$this->getCondition().'"';
 		$params = array();
-		foreach($this->getParameters() as $k=>$v)
-			$params[] = "{$k} => ${v}";
+		foreach($this->getParameters() as $k=>$v) {
+					$params[] = "{$k} => ${v}";
+		}
 		if(count($params) > 0)
 			$str .= ', "'.implode(', ',$params).'"';
 		$orders = array();
-		foreach($this->getOrdersBy() as $k=>$v)
-			$orders[] = "{$k} => ${v}";
+		foreach($this->getOrdersBy() as $k=>$v) {
+					$orders[] = "{$k} => ${v}";
+		}
 		if(count($orders) > 0)
 			$str .= ', "'.implode(', ',$orders).'"';
 		if($this->_limit !==null)

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

@@ -27,12 +27,12 @@ 
 {
 	private $_column;
 	private $_type;
-	private $_typeHandler=null;
+	private $_typeHandler = null;
 	private $_columnIndex;
 	private $_nullValue;
 	private $_mapping;
-	private $_resultMaps=array();
-	private $_subMaps=array();
+	private $_resultMaps = array();
+	private $_subMaps = array();
 
 	/**
 	 * @return string the name of the column in the result set from which the
@@ -144,7 +144,7 @@ 
 	 */
 	public function getSubMap($value)
 	{
-		if(isset($this->_resultMaps[$value]))
+		if (isset($this->_resultMaps[$value]))
 			return $this->_resultMaps[$value];
 	}
 
@@ -168,7 +168,7 @@ 
 	 */
 	public function initialize($manager)
 	{
-		foreach($this->_subMaps as $subMap)
+		foreach ($this->_subMaps as $subMap)
 		{
 			$this->_resultMaps[$subMap->getValue()] =
 				$manager->getResultMap($subMap->getResultMapping());

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

Spacing +14 added lines, -14 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_ID=$value;
+		$this->_ID = $value;
 	}
 
 	/**
@@ -92,9 +92,9 @@ 
 	 */
 	public function getProperty($index)
 	{
-		if(is_string($index))
+		if (is_string($index))
 			return $this->_propertyMap->itemAt($index);
-		else if(is_int($index))
+		else if (is_int($index))
 			return $this->_properties->itemAt($index);
 		else
 			throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
@@ -136,14 +136,14 @@ 
 	 */
 	public function getPropertyValue($registry, $property, $parameterValue)
 	{
-		$value = $this->getObjectValue($parameterValue,$property);
+		$value = $this->getObjectValue($parameterValue, $property);
 
-		if(($handler=$this->createTypeHandler($property, $registry))!==null)
+		if (($handler = $this->createTypeHandler($property, $registry)) !== null)
 			$value = $handler->getParameter($value);
 
-		$value = $this->nullifyDefaultValue($property,$value);
+		$value = $this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType())!==null)
+		if (($type = $property->getType()) !== null)
 			$value = $registry->convertToType($type, $value);
 
 		return $value;
@@ -158,9 +158,9 @@ 
 	 */
 	protected function createTypeHandler($property, $registry)
 	{
-		$type=$property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
-		$handler=$registry->getTypeHandler($type);
-		if($handler===null && $property->getTypeHandler())
+		$type = $property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
+		$handler = $registry->getTypeHandler($type);
+		if ($handler === null && $property->getTypeHandler())
 			$handler = Prado::createComponent($type);
 		return $handler;
 	}
@@ -172,7 +172,7 @@ 
 	 * @return mixed property value.
 	 * @throws TSqlMapException if property access is invalid.
 	 */
-	protected function getObjectValue($object,$property)
+	protected function getObjectValue($object, $property)
 	{
 		try
 		{
@@ -196,11 +196,11 @@ 
 	 * @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)
+			if ($nullValue === $value)
 				$value = null;
 		}
 		return $value;

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',

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

@@ -36,15 +36,15 @@ 
 	private $_nullValue;
 	private $_propertyName;
 	private $_columnName;
-	private $_columnIndex=-1;
+	private $_columnIndex = -1;
 	private $_nestedResultMapName;
 	private $_nestedResultMap;
 	private $_valueType;
 	private $_typeHandler;
-	private $_isLazyLoad=false;
+	private $_isLazyLoad = false;
 	private $_select;
 
-	private $_hostResultMapID='inplicit internal mapping';
+	private $_hostResultMapID = 'inplicit internal mapping';
 
 	const LIST_TYPE = 0;
 	const ARRAY_TYPE = 1;
@@ -53,9 +53,9 @@ 
 	 * Gets the containing result map ID.
 	 * @param TResultMap containing result map.
 	 */
-	public function __construct($resultMap=null)
+	public function __construct($resultMap = null)
 	{
-		if($resultMap instanceof TResultMap)
+		if ($resultMap instanceof TResultMap)
 			$this->_hostResultMapID = $resultMap->getID();
 	}
 
@@ -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();
-		if($index > 0 && isset($row[$index]))
-			$value = $this->getTypedValue($registry,$row[$index]);
-		else if(isset($row[$name]))
-			$value = $this->getTypedValue($registry,$row[$name]);
-		if(($value===null) && ($this->getNullValue()!==null))
-			$value = $this->getTypedValue($registry,$this->getNullValue());
+		if ($index > 0 && isset($row[$index]))
+			$value = $this->getTypedValue($registry, $row[$index]);
+		else if (isset($row[$name]))
+			$value = $this->getTypedValue($registry, $row[$name]);
+		if (($value === null) && ($this->getNullValue() !== null))
+			$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);
@@ -265,9 +265,9 @@ 
 	 */
 	protected function createTypeHandler($registry)
 	{
-		$type=$this->getTypeHandler() ? $this->getTypeHandler() : $this->getType();
-		$handler=$registry->getTypeHandler($type);
-		if($handler===null && $this->getTypeHandler())
+		$type = $this->getTypeHandler() ? $this->getTypeHandler() : $this->getType();
+		$handler = $registry->getTypeHandler($type);
+		if ($handler === null && $this->getTypeHandler())
 			$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')
+			if ($type === 'TList')
 				return self::LIST_TYPE;
 			$class = new ReflectionClass($type);
-			if($class->isSubclassOf('TList'))
+			if ($class->isSubclassOf('TList'))
 				return self::LIST_TYPE;
-			if($class->implementsInterface('ArrayAccess'))
+			if ($class->implementsInterface('ArrayAccess'))
 				return self::ARRAY_TYPE;
 		}
-		if(strtolower($type) == 'array')
+		if (strtolower($type) == 'array')
 			return self::ARRAY_TYPE;
 	}
 
@@ -300,8 +300,8 @@ 
 	 */
 	public function instanceOfListType($target)
 	{
-		if($this->getType()===null)
-			return  TPropertyAccess::get($target,$this->getProperty()) instanceof TList;
+		if ($this->getType() === null)
+			return  TPropertyAccess::get($target, $this->getProperty()) instanceof TList;
 		return $this->getPropertyValueType() == self::LIST_TYPE;
 	}
 
@@ -313,10 +313,10 @@ 
 	 */
 	public function instanceOfArrayType($target)
 	{
-		if($this->getType()===null)
+		if ($this->getType() === null)
 		{
-			$prop = TPropertyAccess::get($target,$this->getProperty());
-			if(is_object($prop))
+			$prop = TPropertyAccess::get($target, $this->getProperty());
+			if (is_object($prop))
 				return $prop instanceof ArrayAccess;
 			return is_array($prop);
 		}
@@ -326,17 +326,17 @@ 
 	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);
+		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 +14 added lines, -14 removed lines

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

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

Spacing +142 added lines, -142 removed lines

@@ -27,10 +27,10 @@ 
 	 */
 	protected function createObjectFromNode($node)
 	{
-		if(isset($node['class']))
+		if (isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
-			$this->setObjectPropFromNode($obj,$node,array('class'));
+			$obj = Prado::createComponent((string) $node['class']);
+			$this->setObjectPropFromNode($obj, $node, array('class'));
 			return $obj;
 		}
 		throw new TSqlMapConfigurationException(
@@ -45,14 +45,14 @@ 
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
 	 */
-	protected function setObjectPropFromNode($obj,$node,$except=array())
+	protected function setObjectPropFromNode($obj, $node, $except = array())
 	{
-		foreach($node->attributes() as $name=>$value)
+		foreach ($node->attributes() as $name=>$value)
 		{
-			if(!in_array($name,$except))
+			if (!in_array($name, $except))
 			{
-				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
+				if ($obj->canSetProperty($name))
+					$obj->{$name} = (string) $value;
 				else
 					throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
@@ -67,13 +67,13 @@ 
 	 * @param string relative filename
 	 * @return string absolute filename.
 	 */
-	protected function getAbsoluteFilePath($basefile,$resource)
+	protected function getAbsoluteFilePath($basefile, $resource)
 	{
 		$basedir = dirname($basefile);
-		$file = realpath($basedir.DIRECTORY_SEPARATOR.$resource);
-		if(!is_string($file) || !is_file($file))
+		$file = realpath($basedir . DIRECTORY_SEPARATOR . $resource);
+		if (!is_string($file) || !is_file($file))
 			$file = realpath($resource);
-		if(is_string($file) && is_file($file))
+		if (is_string($file) && is_file($file))
 			return $file;
 		else
 			throw new TSqlMapConfigurationException(
@@ -85,12 +85,12 @@ 
 	 * @param string filename.
 	 * @return SimpleXmlElement xml document.
 	 */
-	protected function loadXmlDocument($filename,TSqlMapXmlConfiguration $config)
+	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if( strpos($filename, '${') !== false)
+		if (strpos($filename, '${') !== false)
 			$filename = $config->replaceProperties($filename);
 
-		if(!is_file($filename))
+		if (!is_file($filename))
 			throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_config', $filename);
 		return simplexml_load_string($config->replaceProperties(file_get_contents($filename)));
@@ -106,10 +106,10 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(array('id','ID','Id', 'iD') as $id)
+		foreach (array('id', 'ID', 'Id', 'iD') as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
-			foreach($document->xpath($xpath) as $node)
+			foreach ($document->xpath($xpath) as $node)
 				return $node;
 		}
 	}
@@ -142,14 +142,14 @@ 
 	/**
 	 * @var array global properties.
 	 */
-	private $_properties=array();
+	private $_properties = array();
 
 	/**
 	 * @param TSqlMapManager manager instance.
 	 */
 	public function __construct($manager)
 	{
-		$this->_manager=$manager;
+		$this->_manager = $manager;
 	}
 
 	public function getManager()
@@ -166,25 +166,25 @@ 
 	 * Configure the TSqlMapManager using the given xml file.
 	 * @param string SqlMap configuration xml file.
 	 */
-	public function configure($filename=null)
+	public function configure($filename = null)
 	{
-		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this);
+		$this->_configFile = $filename;
+		$document = $this->loadXmlDocument($filename, $this);
 
-		foreach($document->xpath('//property') as $property)
+		foreach ($document->xpath('//property') as $property)
 			$this->loadGlobalProperty($property);
 
-		foreach($document->xpath('//typeHandler') as $handler)
+		foreach ($document->xpath('//typeHandler') as $handler)
 			$this->loadTypeHandler($handler);
 
-		foreach($document->xpath('//connection[last()]') as $conn)
+		foreach ($document->xpath('//connection[last()]') as $conn)
 			$this->loadDatabaseConnection($conn);
 
 		//try to load configuration in the current config file.
 		$mapping = new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
-		foreach($document->xpath('//sqlMap') as $sqlmap)
+		foreach ($document->xpath('//sqlMap') as $sqlmap)
 			$this->loadSqlMappingFiles($sqlmap);
 
 		$this->resolveResultMapping();
@@ -197,7 +197,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']] = (string) $node['value'];
 	}
 
 	/**
@@ -226,9 +226,9 @@ 
 	 */
 	protected function loadSqlMappingFiles($node)
 	{
-		if(strlen($resource = (string)$node['resource']) > 0)
+		if (strlen($resource = (string) $node['resource']) > 0)
 		{
-			if( strpos($resource, '${') !== false)
+			if (strpos($resource, '${') !== false)
 				$resource = $this->replaceProperties($resource);
 
 			$mapping = new TSqlMapXmlMappingConfiguration($this);
@@ -243,14 +243,14 @@ 
 	protected function resolveResultMapping()
 	{
 		$maps = $this->_manager->getResultMaps();
-		foreach($maps as $entry)
+		foreach ($maps as $entry)
 		{
-			foreach($entry->getColumns() as $item)
+			foreach ($entry->getColumns() as $item)
 			{
 				$resultMap = $item->getResultMapping();
-				if(strlen($resultMap) > 0)
+				if (strlen($resultMap) > 0)
 				{
-					if($maps->contains($resultMap))
+					if ($maps->contains($resultMap))
 						$item->setNestedResultMap($maps[$resultMap]);
 					else
 						throw new TSqlMapConfigurationException(
@@ -258,7 +258,7 @@ 
 								$resultMap, $this->_configFile, $entry->getID());
 				}
 			}
-			if($entry->getDiscriminator()!==null)
+			if ($entry->getDiscriminator() !== null)
 				$entry->getDiscriminator()->initialize($this->_manager);
 		}
 	}
@@ -268,9 +268,9 @@ 
 	 */
 	protected function attachCacheModels()
 	{
-		foreach($this->_manager->getMappedStatements() as $mappedStatement)
+		foreach ($this->_manager->getMappedStatements() as $mappedStatement)
 		{
-			if(strlen($model = $mappedStatement->getStatement()->getCacheModel()) > 0)
+			if (strlen($model = $mappedStatement->getStatement()->getCacheModel()) > 0)
 			{
 				$cache = $this->_manager->getCacheModel($model);
 				$mappedStatement->getStatement()->setCache($cache);
@@ -286,8 +286,8 @@ 
 	 */
 	public function replaceProperties($string)
 	{
-		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${'.$find.'}', $replace, $string);
+		foreach ($this->_properties as $find => $replace)
+			$string = str_replace('${' . $find . '}', $replace, $string);
 		return $string;
 	}
 }
@@ -309,25 +309,25 @@ 
 
 	private $_document;
 
-	private $_FlushOnExecuteStatements=array();
+	private $_FlushOnExecuteStatements = array();
 
 	/**
 	 * Regular expressions for escaping simple/inline parameter symbols
 	 */
-	const SIMPLE_MARK='$';
-	const INLINE_SYMBOL='#';
-	const ESCAPED_SIMPLE_MARK_REGEXP='/\$\$/';
-	const ESCAPED_INLINE_SYMBOL_REGEXP='/\#\#/';
-	const SIMPLE_PLACEHOLDER='`!!`';
-	const INLINE_PLACEHOLDER='`!!!`';
+	const SIMPLE_MARK = '$';
+	const INLINE_SYMBOL = '#';
+	const ESCAPED_SIMPLE_MARK_REGEXP = '/\$\$/';
+	const ESCAPED_INLINE_SYMBOL_REGEXP = '/\#\#/';
+	const SIMPLE_PLACEHOLDER = '`!!`';
+	const INLINE_PLACEHOLDER = '`!!!`';
 
 	/**
 	 * @param TSqlMapXmlConfiguration parent xml configuration.
 	 */
 	public function __construct(TSqlMapXmlConfiguration $xmlConfig)
 	{
-		$this->_xmlConfig=$xmlConfig;
-		$this->_manager=$xmlConfig->getManager();
+		$this->_xmlConfig = $xmlConfig;
+		$this->_manager = $xmlConfig->getManager();
 	}
 
 	protected function getConfigFile()
@@ -341,44 +341,44 @@ 
 	 */
 	public function configure($filename)
 	{
-		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this->_xmlConfig);
-		$this->_document=$document;
+		$this->_configFile = $filename;
+		$document = $this->loadXmlDocument($filename, $this->_xmlConfig);
+		$this->_document = $document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
+		if ($bCacheDependencies === null)
 			$bCacheDependencies = Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
-		if($bCacheDependencies)
+		if ($bCacheDependencies)
 			$this->_manager->getCacheDependencies()
 					->getDependencies()
 					->add(new TFileCacheDependency($filename));
 
-		foreach($document->xpath('//resultMap') as $node)
+		foreach ($document->xpath('//resultMap') as $node)
 			$this->loadResultMap($node);
 
-		foreach($document->xpath('//parameterMap') as $node)
+		foreach ($document->xpath('//parameterMap') as $node)
 			$this->loadParameterMap($node);
 
-		foreach($document->xpath('//statement') as $node)
+		foreach ($document->xpath('//statement') as $node)
 			$this->loadStatementTag($node);
 
-		foreach($document->xpath('//select') as $node)
+		foreach ($document->xpath('//select') as $node)
 			$this->loadSelectTag($node);
 
-		foreach($document->xpath('//insert') as $node)
+		foreach ($document->xpath('//insert') as $node)
 			$this->loadInsertTag($node);
 
-		foreach($document->xpath('//update') as $node)
+		foreach ($document->xpath('//update') as $node)
 			$this->loadUpdateTag($node);
 
-		foreach($document->xpath('//delete') as $node)
+		foreach ($document->xpath('//delete') as $node)
 			$this->loadDeleteTag($node);
 
-		foreach($document->xpath('//procedure') as $node)
+		foreach ($document->xpath('//procedure') as $node)
 			$this->loadProcedureTag($node);
 
-		foreach($document->xpath('//cacheModel') as $node)
+		foreach ($document->xpath('//cacheModel') as $node)
 				$this->loadCacheModel($node);
 
 		$this->registerCacheTriggers();
@@ -393,16 +393,16 @@ 
 		$resultMap = $this->createResultMap($node);
 
 		//find extended result map.
-		if(strlen($extendMap = $resultMap->getExtends()) > 0)
+		if (strlen($extendMap = $resultMap->getExtends()) > 0)
 		{
-			if(!$this->_manager->getResultMaps()->contains($extendMap))
+			if (!$this->_manager->getResultMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'resultMap',$extendMap);
-				if($extendNode!==null)
+				$extendNode = $this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
+				if ($extendNode !== null)
 					$this->loadResultMap($extendNode);
 			}
 
-			if(!$this->_manager->getResultMaps()->contains($extendMap))
+			if (!$this->_manager->getResultMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
 
@@ -411,7 +411,7 @@ 
 		}
 
 		//add the result map
-		if(!$this->_manager->getResultMaps()->contains($resultMap->getID()))
+		if (!$this->_manager->getResultMaps()->contains($resultMap->getID()))
 			$this->_manager->addResultMap($resultMap);
 	}
 
@@ -424,36 +424,36 @@ 
 	protected function createResultMap($node)
 	{
 		$resultMap = new TResultMap();
-		$this->setObjectPropFromNode($resultMap,$node);
+		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
-		foreach($node->result as $result)
+		foreach ($node->result as $result)
 		{
 			$property = new TResultProperty($resultMap);
-			$this->setObjectPropFromNode($property,$result);
+			$this->setObjectPropFromNode($property, $result);
 			$resultMap->addResultProperty($property);
 		}
 
 		//create the discriminator
 		$discriminator = null;
-		if(isset($node->discriminator))
+		if (isset($node->discriminator))
 		{
 			$discriminator = new TDiscriminator();
 			$this->setObjectPropFromNode($discriminator, $node->discriminator);
 			$discriminator->initMapping($resultMap);
 		}
 
-		foreach($node->xpath('subMap') as $subMapNode)
+		foreach ($node->xpath('subMap') as $subMapNode)
 		{
-			if($discriminator===null)
+			if ($discriminator === null)
 				throw new TSqlMapConfigurationException(
-					'sqlmap_undefined_discriminator', $node, $this->_configFile,$subMapNode);
+					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
 			$subMap = new TSubMap;
-			$this->setObjectPropFromNode($subMap,$subMapNode);
+			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
-		if($discriminator!==null)
+		if ($discriminator !== null)
 			$resultMap->setDiscriminator($discriminator);
 
 		return $resultMap;
@@ -468,22 +468,22 @@ 
 	{
 		$parameterMap = $this->createParameterMap($node);
 
-		if(strlen($extendMap = $parameterMap->getExtends()) > 0)
+		if (strlen($extendMap = $parameterMap->getExtends()) > 0)
 		{
-			if(!$this->_manager->getParameterMaps()->contains($extendMap))
+			if (!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'parameterMap',$extendMap);
-				if($extendNode!==null)
+				$extendNode = $this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
+				if ($extendNode !== null)
 					$this->loadParameterMap($extendNode);
 			}
 
-			if(!$this->_manager->getParameterMaps()->contains($extendMap))
+			if (!$this->_manager->getParameterMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
-					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile,$extendMap);
+					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile, $extendMap);
 			$superMap = $this->_manager->getParameterMap($extendMap);
 			$index = 0;
-			foreach($superMap->getPropertyNames() as $propertyName)
-				$parameterMap->insertProperty($index++,$superMap->getProperty($propertyName));
+			foreach ($superMap->getPropertyNames() as $propertyName)
+				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
 		}
 		$this->_manager->addParameterMap($parameterMap);
 	}
@@ -496,11 +496,11 @@ 
 	protected function createParameterMap($node)
 	{
 		$parameterMap = new TParameterMap();
-		$this->setObjectPropFromNode($parameterMap,$node);
-		foreach($node->parameter as $parameter)
+		$this->setObjectPropFromNode($parameterMap, $node);
+		foreach ($node->parameter as $parameter)
 		{
 			$property = new TParameterProperty();
-			$this->setObjectPropFromNode($property,$parameter);
+			$this->setObjectPropFromNode($property, $parameter);
 			$parameterMap->addProperty($property);
 		}
 		return $parameterMap;
@@ -513,7 +513,7 @@ 
 	protected function loadStatementTag($node)
 	{
 		$statement = new TSqlMapStatement();
-		$this->setObjectPropFromNode($statement,$node);
+		$this->setObjectPropFromNode($statement, $node);
 		$this->processSqlStatement($statement, $node);
 		$mappedStatement = new TMappedStatement($this->_manager, $statement);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -527,15 +527,15 @@ 
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
-		$commandText = (string)$node;
-		if(strlen($extend = $statement->getExtends()) > 0)
+		$commandText = (string) $node;
+		if (strlen($extend = $statement->getExtends()) > 0)
 		{
-			$superNode = $this->getElementByIdValue($this->_document,'*',$extend);
-			if($superNode!==null)
-				$commandText = (string)$superNode . $commandText;
+			$superNode = $this->getElementByIdValue($this->_document, '*', $extend);
+			if ($superNode !== null)
+				$commandText = (string) $superNode . $commandText;
 			else
 				throw new TSqlMapConfigurationException(
-						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile,$node);
+						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
 		}
 		//$commandText = $this->_xmlConfig->replaceProperties($commandText);
 		$statement->initialize($this->_manager);
@@ -553,24 +553,24 @@ 
 		$scope['file'] = $this->_configFile;
 		$scope['node'] = $node;
 
-		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP,self::INLINE_PLACEHOLDER,$sqlStatement);
-		if($statement->parameterMap() === null)
+		$sqlStatement = preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
+		if ($statement->parameterMap() === null)
 		{
 			// Build a Parametermap with the inline parameters.
 			// if they exist. Then delete inline infos from sqltext.
 			$parameterParser = new TInlineParameterMapParser;
 			$sqlText = $parameterParser->parse($sqlStatement, $scope);
-			if(count($sqlText['parameters']) > 0)
+			if (count($sqlText['parameters']) > 0)
 			{
 				$map = new TParameterMap();
-				$map->setID($statement->getID().'-InLineParameterMap');
+				$map->setID($statement->getID() . '-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
-				foreach($sqlText['parameters'] as $property)
+				foreach ($sqlText['parameters'] as $property)
 					$map->addProperty($property);
 			}
 			$sqlStatement = $sqlText['sql'];
 		}
-		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/',self::INLINE_SYMBOL,$sqlStatement);
+		$sqlStatement = preg_replace('/' . self::INLINE_PLACEHOLDER . '/', self::INLINE_SYMBOL, $sqlStatement);
 
 		$this->prepareSql($statement, $sqlStatement, $node);
 	}
@@ -582,19 +582,19 @@ 
 	 * @param SimpleXmlElement statement node.
 	 * @todo Extend to dynamic sql.
 	 */
-	protected function prepareSql($statement,$sqlStatement, $node)
+	protected function prepareSql($statement, $sqlStatement, $node)
 	{
 		$simpleDynamic = new TSimpleDynamicParser;
-		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP,self::SIMPLE_PLACEHOLDER,$sqlStatement);
+		$sqlStatement = preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
 		$dynamics = $simpleDynamic->parse($sqlStatement);
-		if(count($dynamics['parameters']) > 0)
+		if (count($dynamics['parameters']) > 0)
 		{
 			$sql = new TSimpleDynamicSql($dynamics['parameters']);
 			$sqlStatement = $dynamics['sql'];
 		}
 		else
 			$sql = new TStaticSql();
-		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
+		$sqlStatement = preg_replace('/' . self::SIMPLE_PLACEHOLDER . '/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
 	}
@@ -606,10 +606,10 @@ 
 	protected function loadSelectTag($node)
 	{
 		$select = new TSqlMapSelect;
-		$this->setObjectPropFromNode($select,$node);
-		$this->processSqlStatement($select,$node);
+		$this->setObjectPropFromNode($select, $node);
+		$this->processSqlStatement($select, $node);
 		$mappedStatement = new TMappedStatement($this->_manager, $select);
-		if(strlen($select->getCacheModel()) > 0)
+		if (strlen($select->getCacheModel()) > 0)
 			$mappedStatement = new TCachingStatement($mappedStatement);
 
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -635,9 +635,9 @@ 
 	protected function createInsertStatement($node)
 	{
 		$insert = new TSqlMapInsert;
-		$this->setObjectPropFromNode($insert,$node);
-		if(isset($node->selectKey))
-			$this->loadSelectKeyTag($insert,$node->selectKey);
+		$this->setObjectPropFromNode($insert, $node);
+		if (isset($node->selectKey))
+			$this->loadSelectKeyTag($insert, $node->selectKey);
 		return $insert;
 	}
 
@@ -648,10 +648,10 @@ 
 	protected function loadSelectKeyTag($insert, $node)
 	{
 		$selectKey = new TSqlMapSelectKey;
-		$this->setObjectPropFromNode($selectKey,$node);
+		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
-		$selectKey->setID($insert->getID().'.SelectKey');
-		$this->processSqlStatement($selectKey,$node);
+		$selectKey->setID($insert->getID() . '.SelectKey');
+		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
 		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -664,7 +664,7 @@ 
 	protected function loadUpdateTag($node)
 	{
 		$update = new TSqlMapUpdate;
-		$this->setObjectPropFromNode($update,$node);
+		$this->setObjectPropFromNode($update, $node);
 		$this->processSqlStatement($update, $node);
 		$mappedStatement = new TUpdateMappedStatement($this->_manager, $update);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -677,7 +677,7 @@ 
 	protected function loadDeleteTag($node)
 	{
 		$delete = new TSqlMapDelete;
-		$this->setObjectPropFromNode($delete,$node);
+		$this->setObjectPropFromNode($delete, $node);
 		$this->processSqlStatement($delete, $node);
 		$mappedStatement = new TDeleteMappedStatement($this->_manager, $delete);
 		$this->_manager->addMappedStatement($mappedStatement);
@@ -700,34 +700,34 @@ 
 	protected function loadCacheModel($node)
 	{
 		$cacheModel = new TSqlMapCacheModel;
-		$properties = array('id','implementation');
-		foreach($node->attributes() as $name=>$value)
+		$properties = array('id', 'implementation');
+		foreach ($node->attributes() as $name=>$value)
 		{
-			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set'.$name}((string)$value);
+			if (in_array(strtolower($name), $properties))
+				$cacheModel->{'set' . $name}((string) $value);
 		}
 		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
-		$this->setObjectPropFromNode($cache,$node,$properties);
+		$this->setObjectPropFromNode($cache, $node, $properties);
 
-		foreach($node->xpath('property') as $propertyNode)
+		foreach ($node->xpath('property') as $propertyNode)
 		{
 			$name = $propertyNode->attributes()->name;
-			if($name===null || $name==='') continue;
+			if ($name === null || $name === '') continue;
 
 			$value = $propertyNode->attributes()->value;
-			if($value===null || $value==='') continue;
+			if ($value === null || $value === '') continue;
 
-			if( !TPropertyAccess::has($cache, $name) ) continue;
+			if (!TPropertyAccess::has($cache, $name)) continue;
 
 			TPropertyAccess::set($cache, $name, $value);
 		}
 
-		$this->loadFlushInterval($cacheModel,$node);
+		$this->loadFlushInterval($cacheModel, $node);
 
 		$cacheModel->initialize($cache);
 		$this->_manager->addCacheModel($cacheModel);
-		foreach($node->xpath('flushOnExecute') as $flush)
-			$this->loadFlushOnCache($cacheModel,$node,$flush);
+		foreach ($node->xpath('flushOnExecute') as $flush)
+			$this->loadFlushOnCache($cacheModel, $node, $flush);
 	}
 
 	/**
@@ -738,26 +738,26 @@ 
 	protected function loadFlushInterval($cacheModel, $node)
 	{
 		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
+		if ($flushInterval === null || count($flushInterval) === 0) return;
 		$duration = 0;
-		foreach($flushInterval[0]->attributes() as $name=>$value)
+		foreach ($flushInterval[0]->attributes() as $name=>$value)
 		{
-			switch(strToLower($name))
+			switch (strToLower($name))
 			{
 				case 'seconds':
-					$duration += (integer)$value;
+					$duration += (integer) $value;
 				break;
 				case 'minutes':
-					$duration += 60 * (integer)$value;
+					$duration += 60 * (integer) $value;
 				break;
 				case 'hours':
-					$duration += 3600 * (integer)$value;
+					$duration += 3600 * (integer) $value;
 				break;
 				case 'days':
-					$duration += 86400 * (integer)$value;
+					$duration += 86400 * (integer) $value;
 				break;
 				case 'duration':
-					$duration = (integer)$value;
+					$duration = (integer) $value;
 				break 2; // switch, foreach
 			}
 		}
@@ -770,15 +770,15 @@ 
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
 	 */
-	protected function loadFlushOnCache($cacheModel,$parent,$node)
+	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
 		$id = $cacheModel->getID();
-		if(!isset($this->_FlushOnExecuteStatements[$id]))
+		if (!isset($this->_FlushOnExecuteStatements[$id]))
 			$this->_FlushOnExecuteStatements[$id] = array();
-		foreach($node->attributes() as $name=>$value)
+		foreach ($node->attributes() as $name=>$value)
 		{
-			if(strtolower($name)==='statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+			if (strtolower($name) === 'statement')
+				$this->_FlushOnExecuteStatements[$id][] = (string) $value;
 		}
 	}
 
@@ -787,10 +787,10 @@ 
 	 */
 	protected function registerCacheTriggers()
 	{
-		foreach($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
+		foreach ($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
 		{
 			$cacheModel = $this->_manager->getCacheModel($cacheID);
-			foreach($statementIDs as $statementID)
+			foreach ($statementIDs as $statementID)
 			{
 				$statement = $this->_manager->getMappedStatement($statementID);
 				$cacheModel->registerTriggerStatement($statement);

Braces +55 added lines, -38 removed lines

@@ -109,8 +109,9 @@ 
 		foreach(array('id','ID','Id', 'iD') as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
-			foreach($document->xpath($xpath) as $node)
-				return $node;
+			foreach($document->xpath($xpath) as $node) {
+							return $node;
+			}
 		}
 	}
 
@@ -171,21 +172,25 @@ 
 		$this->_configFile=$filename;
 		$document = $this->loadXmlDocument($filename,$this);
 
-		foreach($document->xpath('//property') as $property)
-			$this->loadGlobalProperty($property);
+		foreach($document->xpath('//property') as $property) {
+					$this->loadGlobalProperty($property);
+		}
 
-		foreach($document->xpath('//typeHandler') as $handler)
-			$this->loadTypeHandler($handler);
+		foreach($document->xpath('//typeHandler') as $handler) {
+					$this->loadTypeHandler($handler);
+		}
 
-		foreach($document->xpath('//connection[last()]') as $conn)
-			$this->loadDatabaseConnection($conn);
+		foreach($document->xpath('//connection[last()]') as $conn) {
+					$this->loadDatabaseConnection($conn);
+		}
 
 		//try to load configuration in the current config file.
 		$mapping = new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
-		foreach($document->xpath('//sqlMap') as $sqlmap)
-			$this->loadSqlMappingFiles($sqlmap);
+		foreach($document->xpath('//sqlMap') as $sqlmap) {
+					$this->loadSqlMappingFiles($sqlmap);
+		}
 
 		$this->resolveResultMapping();
 		$this->attachCacheModels();
@@ -286,8 +291,9 @@ 
 	 */
 	public function replaceProperties($string)
 	{
-		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${'.$find.'}', $replace, $string);
+		foreach($this->_properties as $find => $replace) {
+					$string = str_replace('${'.$find.'}', $replace, $string);
+		}
 		return $string;
 	}
 }
@@ -354,32 +360,41 @@ 
 					->getDependencies()
 					->add(new TFileCacheDependency($filename));
 
-		foreach($document->xpath('//resultMap') as $node)
-			$this->loadResultMap($node);
+		foreach($document->xpath('//resultMap') as $node) {
+					$this->loadResultMap($node);
+		}
 
-		foreach($document->xpath('//parameterMap') as $node)
-			$this->loadParameterMap($node);
+		foreach($document->xpath('//parameterMap') as $node) {
+					$this->loadParameterMap($node);
+		}
 
-		foreach($document->xpath('//statement') as $node)
-			$this->loadStatementTag($node);
+		foreach($document->xpath('//statement') as $node) {
+					$this->loadStatementTag($node);
+		}
 
-		foreach($document->xpath('//select') as $node)
-			$this->loadSelectTag($node);
+		foreach($document->xpath('//select') as $node) {
+					$this->loadSelectTag($node);
+		}
 
-		foreach($document->xpath('//insert') as $node)
-			$this->loadInsertTag($node);
+		foreach($document->xpath('//insert') as $node) {
+					$this->loadInsertTag($node);
+		}
 
-		foreach($document->xpath('//update') as $node)
-			$this->loadUpdateTag($node);
+		foreach($document->xpath('//update') as $node) {
+					$this->loadUpdateTag($node);
+		}
 
-		foreach($document->xpath('//delete') as $node)
-			$this->loadDeleteTag($node);
+		foreach($document->xpath('//delete') as $node) {
+					$this->loadDeleteTag($node);
+		}
 
-		foreach($document->xpath('//procedure') as $node)
-			$this->loadProcedureTag($node);
+		foreach($document->xpath('//procedure') as $node) {
+					$this->loadProcedureTag($node);
+		}
 
-		foreach($document->xpath('//cacheModel') as $node)
-				$this->loadCacheModel($node);
+		foreach($document->xpath('//cacheModel') as $node) {
+						$this->loadCacheModel($node);
+		}
 
 		$this->registerCacheTriggers();
 	}
@@ -482,8 +497,9 @@ 
 					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile,$extendMap);
 			$superMap = $this->_manager->getParameterMap($extendMap);
 			$index = 0;
-			foreach($superMap->getPropertyNames() as $propertyName)
-				$parameterMap->insertProperty($index++,$superMap->getProperty($propertyName));
+			foreach($superMap->getPropertyNames() as $propertyName) {
+							$parameterMap->insertProperty($index++,$superMap->getProperty($propertyName));
+			}
 		}
 		$this->_manager->addParameterMap($parameterMap);
 	}
@@ -565,8 +581,9 @@ 
 				$map = new TParameterMap();
 				$map->setID($statement->getID().'-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
-				foreach($sqlText['parameters'] as $property)
-					$map->addProperty($property);
+				foreach($sqlText['parameters'] as $property) {
+									$map->addProperty($property);
+				}
 			}
 			$sqlStatement = $sqlText['sql'];
 		}
@@ -591,8 +608,7 @@ 
 		{
 			$sql = new TSimpleDynamicSql($dynamics['parameters']);
 			$sqlStatement = $dynamics['sql'];
-		}
-		else
+		} else
 			$sql = new TStaticSql();
 		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
@@ -726,8 +742,9 @@ 
 
 		$cacheModel->initialize($cache);
 		$this->_manager->addCacheModel($cacheModel);
-		foreach($node->xpath('flushOnExecute') as $flush)
-			$this->loadFlushOnCache($cacheModel,$node,$flush);
+		foreach($node->xpath('flushOnExecute') as $flush) {
+					$this->loadFlushOnCache($cacheModel,$node,$flush);
+		}
 	}
 
 	/**