pradosoft / prado

framework/Data/Common/Mysql/TMysqlTableInfo.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TMysqlCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 */
 	public function createCommandBuilder($connection)
 	{
-		return new TMysqlCommandBuilder($connection,$this);
+		return new TMysqlCommandBuilder($connection, $this);
 	}
 }
 

framework/Data/Common/Oracle/TOracleTableInfo.php

Doc Comments +3 added lines, -1 removed lines

@@ -47,7 +47,7 @@ 
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TOracleCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{
@@ -57,6 +57,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.
 	 */
 	public function getInfo($name,$default=null)

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 	 * 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;
@@ -51,7 +51,7 @@ 
 	 */
 	public function createCommandBuilder($connection)
 	{
-		return new TOracleCommandBuilder($connection,$this);
+		return new TOracleCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	public function getInfo($name,$default=null)
+	public function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -68,7 +68,7 @@ 
 	 * @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;
 	}
@@ -94,7 +94,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -111,7 +111,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,7 +123,7 @@ 
 	public function getColumnNames()
 	{
 		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
+			$names[]=$column->getColumnName();
 		return $names;
 	}
 
@@ -152,7 +152,7 @@ 
 		{
 			$this->_lowercase=array();
 			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+				$this->_lowercase[strtolower($key)]=$key;
 		}
 		return $this->_lowercase;
 	}

framework/Data/Common/Pgsql/TPgsqlTableInfo.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TPgsqlCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 */
 	public function createCommandBuilder($connection)
 	{
-		return new TPgsqlCommandBuilder($connection,$this);
+		return new TPgsqlCommandBuilder($connection, $this);
 	}
 }
 

framework/Data/Common/Sqlite/TSqliteTableInfo.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 {
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TSqliteCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 */
 	public function createCommandBuilder($connection)
 	{
-		return new TSqliteCommandBuilder($connection,$this);
+		return new TSqliteCommandBuilder($connection, $this);
 	}
 
 	/**

framework/Data/DataGateway/TDataGatewayCommand.php

Doc Comments +3 added lines, -1 removed lines

@@ -84,6 +84,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)
@@ -369,7 +370,8 @@ 
 	 * @param string __call method name
 	 * @param string criteria conditions
 	 * @param array method arguments
-	 * @return TActiveRecordCriteria criteria created from the method name and its arguments.
+	 * @param string $condition
+	 * @return TSqlCriteria criteria created from the method name and its arguments.
 	 */
 	public function createCriteriaFromString($method, $condition, $args)
 	{

Spacing +95 added lines, -95 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function __construct($builder)
 	{
-		$this->_builder = $builder;
+		$this->_builder=$builder;
 	}
 	/**
 	 * @return TDbTableInfo
@@ -73,10 +73,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();
 	}
@@ -88,10 +88,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());
 	}
@@ -102,7 +102,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));
 	}
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function find($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function findAll($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 	/**
@@ -134,13 +134,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;
 	}
@@ -152,9 +152,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());
 	}
 	/**
@@ -163,21 +163,21 @@ 
 	 */
 	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());
 	}
 
 	/**
@@ -188,22 +188,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);
 	}
 
 	/**
@@ -213,26 +213,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);
 	}
 
 	/**
@@ -242,10 +242,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).')';
 	}
 
@@ -256,7 +256,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',
@@ -264,12 +264,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);
 	}
@@ -281,7 +281,7 @@ 
 	 */
 	public function findBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 
@@ -292,7 +292,7 @@ 
 	 */
 	public function findAllBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 
@@ -303,15 +303,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;
@@ -324,15 +324,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());
 	}
 
 	/**
@@ -345,12 +345,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;
 	}
@@ -373,14 +373,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);
 	}
 
 	/**
@@ -392,25 +392,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;
 	}
@@ -425,7 +425,7 @@ 
 	 */
 	public function onCreateCommand($command, $criteria)
 	{
-		$this->raiseEvent('OnCreateCommand', $this, new TDataGatewayEventParameter($command,$criteria));
+		$this->raiseEvent('OnCreateCommand', $this, new TDataGatewayEventParameter($command, $criteria));
 	}
 
 	/**
@@ -439,7 +439,7 @@ 
 	 */
 	public function onExecuteCommand($command, $result)
 	{
-		$parameter = new TDataGatewayResultEventParameter($command, $result);
+		$parameter=new TDataGatewayResultEventParameter($command, $result);
 		$this->raiseEvent('OnExecuteCommand', $this, $parameter);
 		return $parameter->getResult();
 	}

framework/Data/SqlMap/Configuration/TSqlMapCacheKey.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	}
 
 	/**
-	 * @param string serialized object
+	 * @param string string object
 	 * @return string crc32 hash of the serialized object.
 	 */
 	protected function generateKey($string)

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function __construct($object)
 	{
-		$this->_key = $this->generateKey(serialize($object));
+		$this->_key=$this->generateKey(serialize($object));
 	}
 
 	/**
@@ -38,7 +38,7 @@ 
 	 */
 	protected function generateKey($string)
 	{
-		return sprintf('%x',crc32($string));
+		return sprintf('%x', crc32($string));
 	}
 
 	/**

framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php

Doc Comments +3 added lines, -1 removed lines

@@ -149,6 +149,7 @@ 
 
 	/**
 	 * @param TSqlMapCacheKey|string cache key
+	 * @param string $key
 	 * @return mixed cached value.
 	 */
 	public function get($key)
@@ -167,6 +168,7 @@ 
 	/**
 	 * @param TSqlMapCacheKey|string cache key
 	 * @param mixed value to be cached.
+	 * @param string $key
 	 */
 	public function set($key, $value)
 	{
@@ -178,7 +180,7 @@ 
 	}
 
 	/**
-	 * @return float cache hit ratio.
+	 * @return integer cache hit ratio.
 	 */
 	public function getHitRatio()
 	{

Spacing +19 added lines, -19 removed lines

@@ -37,18 +37,18 @@ 
 class TSqlMapCacheModel extends \Prado\TComponent
 {
 	private $_cache;
-	private $_hits = 0;
-	private $_requests = 0;
+	private $_hits=0;
+	private $_requests=0;
 	private $_id;
 	private $_implementation=TSqlMapCacheTypes::Basic;
-	private $_properties = array();
-	private $_flushInterval = 0;
+	private $_properties=array();
+	private $_flushInterval=0;
 
-	private static $_cacheTypes = array();
+	private static $_cacheTypes=array();
 
 	public static function registerCacheType($type, $className)
 	{
-		self::$_cacheTypes[$type] = $className;
+		self::$_cacheTypes[$type]=$className;
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -80,10 +80,10 @@ 
 	 */
 	public function setImplementation($value)
 	{
-		if (isset(self::$_cacheTypes[$value]))
-			$this->_implementation = $value;
+		if(isset(self::$_cacheTypes[$value]))
+			$this->_implementation=$value;
 		else
-			$this->_implementation = TPropertyValue::ensureEnum($value,'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes');
+			$this->_implementation=TPropertyValue::ensureEnum($value, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	public function initialize($cache=null)
 	{
 		if($cache===null)
-			$this->_cache= Prado::createComponent($this->getImplementationClass(), $this);
+			$this->_cache=Prado::createComponent($this->getImplementationClass(), $this);
 		else
 			$this->_cache=$cache;
 	}
@@ -119,10 +119,10 @@ 
 	 */
 	public function getImplementationClass()
 	{
-		$implementation = $this->_implementation;
-		if (isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
+		$implementation=$this->_implementation;
+		if(isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
 
-		switch(TPropertyValue::ensureEnum($implementation,'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes'))
+		switch(TPropertyValue::ensureEnum($implementation, 'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes'))
 		{
 			case TSqlMapCacheTypes::FIFO: return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapFifoCache';
 			case TSqlMapCacheTypes::LRU : return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapLruCache';
@@ -136,7 +136,7 @@ 
 	 */
 	public function registerTriggerStatement($mappedStatement)
 	{
-		$mappedStatement->attachEventHandler('OnExecuteQuery',array($this, 'flush'));
+		$mappedStatement->attachEventHandler('OnExecuteQuery', array($this, 'flush'));
 	}
 
 	/**
@@ -154,10 +154,10 @@ 
 	public function get($key)
 	{
 		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+			$key=$key->getHash();
 
 		//if flush ?
-		$value = $this->_cache->get($key);
+		$value=$this->_cache->get($key);
 		$this->_requests++;
 		if($value!==null)
 			$this->_hits++;
@@ -171,7 +171,7 @@ 
 	public function set($key, $value)
 	{
 		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+			$key=$key->getHash();
 
 		if($value!==null)
 			$this->_cache->set($key, $value, $this->_flushInterval);
@@ -182,7 +182,7 @@ 
 	 */
 	public function getHitRatio()
 	{
-		if($this->_requests != 0)
+		if($this->_requests!=0)
 			return $this->_hits / $this->_requests;
 		else
 			return 0;

framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php

Doc Comments +7 added lines, -3 removed lines

@@ -27,7 +27,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 \Prado\TComponent new instance of class with class name given by 'class' attribute value.
 	 */
 	protected function createObjectFromNode($node)
 	{
@@ -47,6 +47,7 @@ 
 	 * @param Object object instance
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
+	 * @param \Prado\TComponent $obj
 	 */
 	protected function setObjectPropFromNode($obj,$node,$except=array())
 	{
@@ -67,6 +68,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)
@@ -84,7 +87,7 @@ 
 	/**
 	 * Load document using simple xml.
 	 * @param string filename.
-	 * @return SimpleXmlElement xml document.
+	 * @return \SimpleXMLElement xml document.
 	 */
 	protected function loadXmlDocument($filename,TSqlMapXmlConfiguration $config)
 	{
@@ -97,9 +100,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)

Spacing +14 added lines, -14 removed lines

@@ -33,8 +33,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(
@@ -48,14 +48,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),
@@ -69,12 +69,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
@@ -86,10 +86,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(
 				'sqlmap_unable_to_find_config', $filename);
@@ -105,9 +105,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;
 		}

framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php

Doc Comments +1 added lines

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

Spacing +15 added lines, -15 removed lines

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