pradosoft / prado

framework/Data/ActiveRecord/TActiveRecordGateway.php

Doc Comments +4 added lines

@@ -236,6 +236,7 @@ 
 	 * Return record data from sql query.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria sql query
+	 * @param TSqlCriteria $criteria
 	 * @return array result.
 	 */
 	public function findRecordBySql(TActiveRecord $record, $criteria)
@@ -247,6 +248,7 @@ 
 	 * Return record data from sql query.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria sql query
+	 * @param TSqlCriteria $criteria
 	 * @return TDbDataReader result iterator.
 	 */
 	public function findRecordsBySql(TActiveRecord $record, $criteria)
@@ -288,6 +290,7 @@ 
 	/**
 	 * Sets the last insert ID to the corresponding property of the record if available.
 	 * @param TActiveRecord record for insertion
+	 * @param TActiveRecord $record
 	 */
 	protected function updatePostInsert($record)
 	{
@@ -405,6 +408,7 @@ 
 	 * Delete multiple records by criteria.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param TSqlCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function deleteRecordsByCriteria(TActiveRecord $record, $criteria)

Braces +2 added lines, -4 removed lines

@@ -79,16 +79,14 @@
 				throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record), self::TABLE_CONST);
 			return $value;
-		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		} elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record), self::TABLE_METHOD);
 			return $value;
-		}
-		else
+		} else
 			return strtolower(get_class($record));
 	}
 

Spacing +61 added lines, -61 removed lines

@@ -32,19 +32,19 @@ 
 class TActiveRecordGateway extends \Prado\TComponent
 {
 	private $_manager;
-	private $_tables = []; //table cache
-	private $_meta = []; //meta data cache.
-	private $_commandBuilders = [];
+	private $_tables=[]; //table cache
+	private $_meta=[]; //meta data cache.
+	private $_commandBuilders=[];
 	private $_currentRecord;
 
 	/**
 	 * Constant name for specifying optional table name in TActiveRecord.
 	 */
-	const TABLE_CONST = 'TABLE';
+	const TABLE_CONST='TABLE';
 	/**
 	 * Method name for returning optional table name in in TActiveRecord
 	 */
-	const TABLE_METHOD = 'table';
+	const TABLE_METHOD='table';
 
 	/**
 	 * Record gateway constructor.
@@ -52,7 +52,7 @@ 
 	 */
 	public function __construct(TActiveRecordManager $manager)
 	{
-		$this->_manager = $manager;
+		$this->_manager=$manager;
 	}
 
 	/**
@@ -71,18 +71,18 @@ 
 	 */
 	protected function getRecordTableName(TActiveRecord $record)
 	{
-		$class = new ReflectionClass($record);
+		$class=new ReflectionClass($record);
 		if($class->hasConstant(self::TABLE_CONST))
 		{
-			$value = $class->getConstant(self::TABLE_CONST);
+			$value=$class->getConstant(self::TABLE_CONST);
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		elseif($class->hasMethod(self::TABLE_METHOD))
 		{
-			$value = $record->{self::TABLE_METHOD}();
+			$value=$record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record), self::TABLE_METHOD);
@@ -99,7 +99,7 @@ 
 	 */
 	public function getRecordTableInfo(TActiveRecord $record)
 	{
-		$tableName = $this->getRecordTableName($record);
+		$tableName=$this->getRecordTableName($record);
 		return $this->getTableInfo($record->getDbConnection(), $tableName);
 	}
 
@@ -111,27 +111,27 @@ 
 	 */
 	public function getTableInfo(TDbConnection $connection, $tableName)
 	{
-		$connStr = $connection->getConnectionString();
-		$key = $connStr . $tableName;
+		$connStr=$connection->getConnectionString();
+		$key=$connStr.$tableName;
 		if(!isset($this->_tables[$key]))
 		{
 			//call this first to ensure that unserializing the cache
 			//will find the correct driver dependent classes.
 			if(!isset($this->_meta[$connStr]))
 			{
-				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
+				$this->_meta[$connStr]=TDbMetaData::getInstance($connection);
 			}
 
-			$tableInfo = null;
-			if(($cache = $this->getManager()->getCache()) !== null)
-				$tableInfo = $cache->get($key);
+			$tableInfo=null;
+			if(($cache=$this->getManager()->getCache())!==null)
+				$tableInfo=$cache->get($key);
 			if(empty($tableInfo))
 			{
-				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
-				if($cache !== null)
+				$tableInfo=$this->_meta[$connStr]->getTableInfo($tableName);
+				if($cache!==null)
 					$cache->set($key, $tableInfo);
 			}
-			$this->_tables[$key] = $tableInfo;
+			$this->_tables[$key]=$tableInfo;
 		}
 		return $this->_tables[$key];
 	}
@@ -142,20 +142,20 @@ 
 	 */
 	public function getCommand(TActiveRecord $record)
 	{
-		$conn = $record->getDbConnection();
-		$connStr = $conn->getConnectionString();
-		$tableInfo = $this->getRecordTableInfo($record);
+		$conn=$record->getDbConnection();
+		$connStr=$conn->getConnectionString();
+		$tableInfo=$this->getRecordTableInfo($record);
 		if(!isset($this->_commandBuilders[$connStr]))
 		{
-			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
-			$command = new TDataGatewayCommand($builder);
-			$command->OnCreateCommand[] = [$this, 'onCreateCommand'];
-			$command->OnExecuteCommand[] = [$this, 'onExecuteCommand'];
-			$this->_commandBuilders[$connStr] = $command;
+			$builder=$tableInfo->createCommandBuilder($record->getDbConnection());
+			$command=new TDataGatewayCommand($builder);
+			$command->OnCreateCommand[]=[$this, 'onCreateCommand'];
+			$command->OnExecuteCommand[]=[$this, 'onExecuteCommand'];
+			$this->_commandBuilders[$connStr]=$command;
 
 		}
 		$this->_commandBuilders[$connStr]->getBuilder()->setTableInfo($tableInfo);
-		$this->_currentRecord = $record;
+		$this->_currentRecord=$record;
 		return $this->_commandBuilders[$connStr];
 	}
 
@@ -172,7 +172,7 @@ 
 	public function onCreateCommand($sender, $param)
 	{
 		$this->raiseEvent('OnCreateCommand', $this, $param);
-		if($this->_currentRecord !== null)
+		if($this->_currentRecord!==null)
 			$this->_currentRecord->onCreateCommand($param);
 	}
 
@@ -190,7 +190,7 @@ 
 	public function onExecuteCommand($sender, $param)
 	{
 		$this->raiseEvent('OnExecuteCommand', $this, $param);
-		if($this->_currentRecord !== null)
+		if($this->_currentRecord!==null)
 			$this->_currentRecord->onExecuteCommand($param);
 	}
 
@@ -203,7 +203,7 @@ 
 	 */
 	public function findRecordByPK(TActiveRecord $record, $keys)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $command->findByPk($keys);
 	}
 
@@ -227,9 +227,9 @@ 
 	 * @param boolean true to return multiple rows as iterator, false returns first row.
 	 * @return mixed matching data.
 	 */
-	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator = false)
+	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator=false)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $iterator ? $command->findAll($criteria) : $command->find($criteria);
 	}
 
@@ -279,7 +279,7 @@ 
 	public function insert(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
+		$result=$this->getCommand($record)->insert($this->getInsertValues($record));
 		if($result)
 			$this->updatePostInsert($record);
 		//$this->updateAssociatedRecords($record);
@@ -292,8 +292,8 @@ 
 	 */
 	protected function updatePostInsert($record)
 	{
-		$command = $this->getCommand($record);
-		$tableInfo = $command->getTableInfo();
+		$command=$this->getCommand($record);
+		$tableInfo=$command->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->hasSequence())
@@ -307,21 +307,21 @@ 
 	 */
 	protected function getInsertValues(TActiveRecord $record)
 	{
-		$values = [];
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$values=[];
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($value !== null)
-				$values[$name] = $value;
+			if($value!==null)
+				$values[$name]=$value;
 		}
 		return $values;
 	}
@@ -334,39 +334,39 @@ 
 	public function update(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		list($data, $keys) = $this->getUpdateValues($record);
-		$result = $this->getCommand($record)->updateByPk($data, $keys);
+		list($data, $keys)=$this->getUpdateValues($record);
+		$result=$this->getCommand($record)->updateByPk($data, $keys);
 		//$this->updateAssociatedRecords($record);
 		return $result;
 	}
 
 	protected function getUpdateValues(TActiveRecord $record)
 	{
-		$values = [];
-		$tableInfo = $this->getCommand($record)->getTableInfo();
-		$primary = [];
+		$values=[];
+		$tableInfo=$this->getCommand($record)->getTableInfo();
+		$primary=[];
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $value;
+				$primary[$name]=$value;
 			else
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
-		return [$values,$primary];
+		return [$values, $primary];
 	}
 
-	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo = false)
+	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo=false)
 	{
-		$context = new TActiveRecordRelationContext($record);
+		$context=new TActiveRecordRelationContext($record);
 		return $context->updateAssociatedRecords($updateBelongsTo);
 	}
 
@@ -382,12 +382,12 @@ 
 
 	protected function getPrimaryKeyValues(TActiveRecord $record)
 	{
-		$tableInfo = $this->getCommand($record)->getTableInfo();
-		$primary = [];
+		$tableInfo=$this->getCommand($record)->getTableInfo();
+		$primary=[];
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $record->getColumnValue($name);
+				$primary[$name]=$record->getColumnValue($name);
 		}
 		return $primary;
 	}
@@ -423,9 +423,9 @@ 
 	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
 		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null, $criteria);
-		$param = new TActiveRecordEventParameter($command, $record, $criteria);
-		$manager = $record->getRecordManager();
+			$criteria=new TActiveRecordCriteria(null, $criteria);
+		$param=new TActiveRecordEventParameter($command, $record, $criteria);
+		$manager=$record->getRecordManager();
 		$manager->{$event}($param);
 		$record->{$event}($param);
 	}

framework/Data/Common/Mssql/TMssqlTableInfo.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	public function getTableFullName()
 	{
 		//MSSQL alway returns the catalog, schem and table names.
-		return '[' . $this->getCatalogName() . '].[' . $this->getSchemaName() . '].[' . $this->getTableName() . ']';
+		return '['.$this->getCatalogName().'].['.$this->getSchemaName().'].['.$this->getTableName().']';
 	}
 
 	/**

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

@@ -40,10 +40,10 @@
 	 */
 	public function getTableFullName()
 	{
-		if(($schema = $this->getSchemaName()) !== null)
-			return '`' . $schema . '`.`' . $this->getTableName() . '`';
+		if(($schema=$this->getSchemaName())!==null)
+			return '`'.$schema.'`.`'.$this->getTableName().'`';
 		else
-			return '`' . $this->getTableName() . '`';
+			return '`'.$this->getTableName().'`';
 	}
 
 	/**

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

@@ -40,8 +40,8 @@
 	 */
 	public function getTableFullName()
 	{
-		if(($schema = $this->getSchemaName()) !== null)
-			return $schema . '.' . $this->getTableName();
+		if(($schema=$this->getSchemaName())!==null)
+			return $schema.'.'.$this->getTableName();
 		else
 			return $this->getTableName();
 	}

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

@@ -41,7 +41,7 @@
 	 */
 	public function getTableFullName()
 	{
-		return "'" . $this->getTableName() . "'";
+		return "'".$this->getTableName()."'";
 	}
 }
 

framework/Data/Common/TDbCommandBuilder.php

Doc Comments +1 added lines, -2 removed lines

@@ -191,7 +191,6 @@ 
 	 * array('col1' => 'NULL', '*')
 	 * // SELECT `col1`, `col2`, `col3`, NULL AS `col1` FROM...
 	 * </code>
-	 * @param mixed $value
 	 * @return array of generated fields - use implode(', ', $selectfieldlist) to collapse field list for usage
 	 * @since 3.1.7
 	 * @todo add support for table aliasing
@@ -399,7 +398,7 @@ 
 	/**
 	 * Returns a list of insert field name and a list of binding names.
 	 * @param object array or object to be inserted.
-	 * @return array tuple ($fields, $bindings)
+	 * @return string[] tuple ($fields, $bindings)
 	 */
 	protected function getInsertFieldBindings($values)
 	{

Spacing +103 added lines, -103 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param TDbConnection database connection.
 	 * @param TDbTableInfo table information.
 	 */
-	public function __construct($connection = null, $tableInfo = null)
+	public function __construct($connection=null, $tableInfo=null)
 	{
 		$this->setDbConnection($connection);
 		$this->setTableInfo($tableInfo);
@@ -50,7 +50,7 @@ 
 	 */
 	public function setDbConnection($value)
 	{
-		$this->_connection = $value;
+		$this->_connection=$value;
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 */
 	public function setTableInfo($value)
 	{
-		$this->_tableInfo = $value;
+		$this->_tableInfo=$value;
 	}
 
 	/**
@@ -91,13 +91,13 @@ 
 	 * @param integer row offset, -1 to ignore offset.
 	 * @return string SQL with limit and offset.
 	 */
-	public function applyLimitOffset($sql, $limit = -1, $offset = -1)
+	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit !== null ? (int)$limit : -1;
-		$offset = $offset !== null ? (int)$offset : -1;
-		$limitStr = $limit >= 0 ? ' LIMIT ' . $limit : '';
-		$offsetStr = $offset >= 0 ? ' OFFSET ' . $offset : '';
-		return $sql . $limitStr . $offsetStr;
+		$limit=$limit!==null ? (int) $limit : -1;
+		$offset=$offset!==null ? (int) $offset : -1;
+		$limitStr=$limit >= 0 ? ' LIMIT '.$limit : '';
+		$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
+		return $sql.$limitStr.$offsetStr;
 	}
 
 	/**
@@ -107,21 +107,21 @@ 
 	 */
 	public function applyOrdering($sql, $ordering)
 	{
-		$orders = [];
+		$orders=[];
 		foreach($ordering as $name => $direction)
 		{
-			$direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC';
-			if(false !== strpos($name, '(') && false !== strpos($name, ')')) {
+			$direction=strtolower($direction)=='desc' ? 'DESC' : 'ASC';
+			if(false!==strpos($name, '(') && false!==strpos($name, ')')) {
 				// key is a function (bad practice, but we need to handle it)
-				$key = $name;
+				$key=$name;
 			} else {
 				// key is a column
-				$key = $this->getTableInfo()->getColumn($name)->getColumnName();
+				$key=$this->getTableInfo()->getColumn($name)->getColumnName();
 			}
-			$orders[] = $key . ' ' . $direction;
+			$orders[]=$key.' '.$direction;
 		}
 		if(count($orders) > 0)
-			$sql .= ' ORDER BY ' . implode(', ', $orders);
+			$sql.=' ORDER BY '.implode(', ', $orders);
 		return $sql;
 	}
 
@@ -135,15 +135,15 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
-		$words = preg_split('/\s/u', $keywords);
-		$conditions = [];
+		if(strlen(trim($keywords))==0) return '';
+		$words=preg_split('/\s/u', $keywords);
+		$conditions=[];
 		foreach($fields as $field)
 		{
-			$column = $this->getTableInfo()->getColumn($field)->getColumnName();
-			$conditions[] = $this->getSearchCondition($column, $words);
+			$column=$this->getTableInfo()->getColumn($field)->getColumnName();
+			$conditions[]=$this->getSearchCondition($column, $words);
 		}
-		return '(' . implode(' OR ', $conditions) . ')';
+		return '('.implode(' OR ', $conditions).')';
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	 */
 	protected function getSearchCondition($column, $words)
 	{
-		$conditions = [];
+		$conditions=[];
 		foreach($words as $word)
-			$conditions[] = $column . ' LIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
-		return '(' . implode(' AND ', $conditions) . ')';
+			$conditions[]=$column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+		return '('.implode(' AND ', $conditions).')';
 	}
 
 	/**
@@ -198,104 +198,104 @@ 
 	 * @todo add support for table aliasing
 	 * @todo add support for quoting of column aliasing
 	 */
-	public function getSelectFieldList($data = '*') {
+	public function getSelectFieldList($data='*') {
 		if(is_scalar($data)) {
-			$tmp = explode(',', $data);
-			$result = [];
+			$tmp=explode(',', $data);
+			$result=[];
 			foreach($tmp as $v)
-				$result[] = trim($v);
+				$result[]=trim($v);
 			return $result;
 		}
 
-		$bHasWildcard = false;
-		$result = [];
+		$bHasWildcard=false;
+		$result=[];
 		if(is_array($data) || $data instanceof Traversable) {
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			foreach($data as $key => $value) {
-				if($key === '*' || $value === '*') {
-					$bHasWildcard = true;
+				if($key==='*' || $value==='*') {
+					$bHasWildcard=true;
 					continue;
 				}
 
-				if(strToUpper($key) === 'NULL') {
-					$result[] = 'NULL';
+				if(strToUpper($key)==='NULL') {
+					$result[]='NULL';
 					continue;
 				}
 
-				if(strpos($key, '(') !== false && strpos($key, ')') !== false) {
-					$result[] = $key;
+				if(strpos($key, '(')!==false && strpos($key, ')')!==false) {
+					$result[]=$key;
 					continue;
 				}
 
-				if(stripos($key, 'AS') !== false) {
-					$result[] = $key;
+				if(stripos($key, 'AS')!==false) {
+					$result[]=$key;
 					continue;
 				}
 
-				if(stripos($value, 'AS') !== false) {
-					$result[] = $value;
+				if(stripos($value, 'AS')!==false) {
+					$result[]=$value;
 					continue;
 				}
 
-				$v = isset($columns[$value]);
-				$k = isset($columns[$key]);
+				$v=isset($columns[$value]);
+				$k=isset($columns[$key]);
 				if(is_int($key) && $v) {
-					$key = $value;
-					$k = $v;
+					$key=$value;
+					$k=$v;
 				}
 
-				if(strToUpper($value) === 'NULL') {
+				if(strToUpper($value)==='NULL') {
 					if($k)
-						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
+						$result[]='NULL AS '.$columns[$key]->getColumnName();
 					else
-						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[]='NULL'.(is_string($key) ? (' AS '.(string) $key) : '');
 					continue;
 				}
 
-				if(strpos($value, '(') !== false && strpos($value, ')') !== false) {
+				if(strpos($value, '(')!==false && strpos($value, ')')!==false) {
 					if($k)
-						$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+						$result[]=$value.' AS '.$columns[$key]->getColumnName();
 					else
-						$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[]=$value.(is_string($key) ? (' AS '.(string) $key) : '');
 					continue;
 				}
 
-				if($v && $key == $value) {
-					$result[] = $columns[$value]->getColumnName();
+				if($v && $key==$value) {
+					$result[]=$columns[$value]->getColumnName();
 					continue;
 				}
 
-				if($k && $value == null) {
-					$result[] = $columns[$key]->getColumnName();
+				if($k && $value==null) {
+					$result[]=$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(is_string($key) && $v) {
-					$result[] = $columns[$value]->getColumnName() . ' AS ' . $key;
+					$result[]=$columns[$value]->getColumnName().' AS '.$key;
 					continue;
 				}
 
 				if(is_numeric($value) && $k) {
-					$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+					$result[]=$value.' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(is_string($value) && $k) {
-					$result[] = $this->getDbConnection()->quoteString($value) . ' AS ' . $columns[$key]->getColumnName();
+					$result[]=$this->getDbConnection()->quoteString($value).' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(!$v && !$k && is_int($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+					$result[]=is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value);
 					continue;
 				}
 
-				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value)) . ' AS ' . $key;
+				$result[]=(is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value)).' AS '.$key;
 			}
 		}
 
-		if($data === null || count($result) == 0 || $bHasWildcard)
-			$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
+		if($data===null || count($result)==0 || $bHasWildcard)
+			$result=$result=array_merge($this->getTableInfo()->getColumnNames(), $result);
 
 		return $result;
 	}
@@ -307,23 +307,23 @@ 
 	 * @param array condition parameters.
 	 * @return TDbCommand query command.
 	 */
-	public function createFindCommand($where = '1=1', $parameters = [], $ordering = [], $limit = -1, $offset = -1, $select = '*')
+	public function createFindCommand($where='1=1', $parameters=[], $ordering=[], $limit=-1, $offset=-1, $select='*')
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		$fields = implode(', ', $this -> getSelectFieldList($select));
-		$sql = "SELECT {$fields} FROM {$table}";
+		$table=$this->getTableInfo()->getTableFullName();
+		$fields=implode(', ', $this -> getSelectFieldList($select));
+		$sql="SELECT {$fields} FROM {$table}";
 		if(!empty($where))
-			$sql .= " WHERE {$where}";
+			$sql.=" WHERE {$where}";
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
-	public function applyCriterias($sql, $parameters = [], $ordering = [], $limit = -1, $offset = -1)
+	public function applyCriterias($sql, $parameters=[], $ordering=[], $limit=-1, $offset=-1)
 	{
 		if(count($ordering) > 0)
-			$sql = $this->applyOrdering($sql, $ordering);
+			$sql=$this->applyOrdering($sql, $ordering);
 		if($limit >= 0 || $offset >= 0)
-			$sql = $this->applyLimitOffset($sql, $limit, $offset);
-		$command = $this->createCommand($sql);
+			$sql=$this->applyLimitOffset($sql, $limit, $offset);
+		$command=$this->createCommand($sql);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -334,7 +334,7 @@ 
 	 * @param array binding parameters.
 	 * @return TDbCommand count command.
 	 */
-	public function createCountCommand($where = '1=1', $parameters = [], $ordering = [], $limit = -1, $offset = -1)
+	public function createCountCommand($where='1=1', $parameters=[], $ordering=[], $limit=-1, $offset=-1)
 	{
 		return $this->createFindCommand($where, $parameters, $ordering, $limit, $offset, 'COUNT(*)');
 	}
@@ -347,12 +347,12 @@ 
 	 * @param array delete parameters.
 	 * @return TDbCommand delete command.
 	 */
-	public function createDeleteCommand($where, $parameters = [])
+	public function createDeleteCommand($where, $parameters=[])
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where))
-			$where = ' WHERE ' . $where;
-		$command = $this->createCommand("DELETE FROM {$table}" . $where);
+		$table=$this->getTableInfo()->getTableFullName();
+		if(!empty($where))
+			$where=' WHERE '.$where;
+		$command=$this->createCommand("DELETE FROM {$table}".$where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -367,9 +367,9 @@ 
 	 */
 	public function createInsertCommand($data)
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		list($fields, $bindings) = $this->getInsertFieldBindings($data);
-		$command = $this->createCommand("INSERT INTO {$table}({$fields}) VALUES ($bindings)");
+		$table=$this->getTableInfo()->getTableFullName();
+		list($fields, $bindings)=$this->getInsertFieldBindings($data);
+		$command=$this->createCommand("INSERT INTO {$table}({$fields}) VALUES ($bindings)");
 		$this->bindColumnValues($command, $data);
 		return $command;
 	}
@@ -382,17 +382,17 @@ 
 	 * @param array update parameters.
 	 * @return TDbCommand update command.
 	 */
-	public function createUpdateCommand($data, $where, $parameters = [])
+	public function createUpdateCommand($data, $where, $parameters=[])
 	{
-		$table = $this->getTableInfo()->getTableFullName();
+		$table=$this->getTableInfo()->getTableFullName();
 		if($this->hasIntegerKey($parameters))
-			$fields = implode(', ', $this->getColumnBindings($data, true));
+			$fields=implode(', ', $this->getColumnBindings($data, true));
 		else
-			$fields = implode(', ', $this->getColumnBindings($data));
+			$fields=implode(', ', $this->getColumnBindings($data));
 
-		if (!empty($where))
-			$where = ' WHERE ' . $where;
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
+		if(!empty($where))
+			$where=' WHERE '.$where;
+		$command=$this->createCommand("UPDATE {$table} SET {$fields}".$where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}
@@ -404,11 +404,11 @@ 
 	 */
 	protected function getInsertFieldBindings($values)
 	{
-		$fields = []; $bindings = [];
+		$fields=[]; $bindings=[];
 		foreach(array_keys($values) as $name)
 		{
-			$fields[] = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = ':' . $name;
+			$fields[]=$this->getTableInfo()->getColumn($name)->getColumnName();
+			$bindings[]=':'.$name;
 		}
 		return [implode(', ', $fields), implode(', ', $bindings)];
 	}
@@ -419,13 +419,13 @@ 
 	 * @param boolean true to bind as position values.
 	 * @return string update column names with corresponding binding substrings.
 	 */
-	protected function getColumnBindings($values, $position = false)
+	protected function getColumnBindings($values, $position=false)
 	{
-		$bindings = [];
+		$bindings=[];
 		foreach(array_keys($values) as $name)
 		{
-			$column = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = $position ? $column . ' = ?' : $column . ' = :' . $name;
+			$column=$this->getTableInfo()->getColumn($name)->getColumnName();
+			$bindings[]=$position ? $column.' = ?' : $column.' = :'.$name;
 		}
 		return $bindings;
 	}
@@ -449,11 +449,11 @@ 
 	{
 		foreach($values as $name => $value)
 		{
-			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
-				$command->bindValue(':' . $name, null, PDO::PARAM_NULL);
+			$column=$this->getTableInfo()->getColumn($name);
+			if($value===null && $column->getAllowNull())
+				$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
 			else
-				$command->bindValue(':' . $name, $value, $column->getPdoType());
+				$command->bindValue(':'.$name, $value, $column->getPdoType());
 		}
 	}
 
@@ -465,15 +465,15 @@ 
 	{
 		if($this->hasIntegerKey($values))
 		{
-			$values = array_values($values);
-			for($i = 0, $max = count($values); $i < $max; $i++)
+			$values=array_values($values);
+			for($i=0, $max=count($values); $i < $max; $i++)
 				$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
 		}
 		else
 		{
 			foreach($values as $name => $value)
 			{
-				$prop = $name[0] === ':' ? $name : ':' . $name;
+				$prop=$name[0]===':' ? $name : ':'.$name;
 				$command->bindValue($prop, $value, $this->getPdoType($value));
 			}
 		}
@@ -502,7 +502,7 @@ 
 	{
 		foreach($array as $k => $v)
 		{
-			if(gettype($k) === 'integer')
+			if(gettype($k)==='integer')
 				return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -468,8 +468,7 @@
 			$values = array_values($values);
 			for($i = 0, $max = count($values); $i < $max; $i++)
 				$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
-		}
-		else
+		} else
 		{
 			foreach($values as $name => $value)
 			{

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

@@ -44,7 +44,7 @@ 
 	 */
 	public function __construct($builder)
 	{
-		$this->_builder = $builder;
+		$this->_builder=$builder;
 	}
 	/**
 	 * @return TDbTableInfo
@@ -74,9 +74,9 @@ 
 	 */
 	public function delete($criteria)
 	{
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createDeleteCommand($where, $parameters);
+		$where=$criteria->getCondition();
+		$parameters=$criteria->getParameters()->toArray();
+		$command=$this->getBuilder()->createDeleteCommand($where, $parameters);
 		$this->onCreateCommand($command, $criteria);
 		$command->prepare();
 		return $command->execute();
@@ -89,9 +89,9 @@ 
 	 */
 	public function update($data, $criteria)
 	{
-		$where = $criteria->getCondition();
-		$parameters = $criteria->getParameters()->toArray();
-		$command = $this->getBuilder()->createUpdateCommand($data, $where, $parameters);
+		$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());
@@ -103,7 +103,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));
 	}
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function find($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function findAll($criteria)
 	{
-		$command = $this->getFindCommand($criteria);
+		$command=$this->getFindCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 	/**
@@ -133,15 +133,15 @@ 
 	 */
 	protected function getFindCommand($criteria)
 	{
-		if($criteria === null)
+		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;
 	}
@@ -151,10 +151,10 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if($keys===null)
 			return null;
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createFindCommand($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());
 	}
@@ -164,19 +164,19 @@ 
 	 */
 	public function findAllByPk($keys)
 	{
-		$where = $this->getCompositeKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createFindCommand($where);
+		$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)
 	{
-		$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());
 	}
@@ -187,10 +187,10 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(count($keys) == 0)
+		if(count($keys)==0)
 			return 0;
-		$where = $this->getCompositeKeyCondition((array)$keys);
-		$command = $this->getBuilder()->createDeleteCommand($where);
+		$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());
@@ -198,13 +198,13 @@ 
 
 	public function getIndexKeyCondition($table, $fields, $values)
 	{
-		if (!count($values))
+		if(!count($values))
 			return 'FALSE';
-		$columns = [];
-		$tableName = $table->getTableFullName();
+		$columns=[];
+		$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);
 	}
 
 	/**
@@ -214,21 +214,21 @@ 
 	 */
 	protected function getCompositeKeyCondition($values)
 	{
-		$primary = $this->getTableInfo()->getPrimaryKeys();
-		$count = count($primary);
-		if($count === 0)
+		$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 = [$values];
-		if($count > 1 && count($values[0]) !== $count)
+			$values=[$values];
+		if($count > 1 && count($values[0])!==$count)
 		{
 			throw new TDbException('dbtablegateway_pk_value_count_mismatch',
 				$this->getTableInfo()->getTableFullName());
@@ -243,11 +243,11 @@ 
 	 */
 	protected function quoteTuple($array)
 	{
-		$conn = $this->getDbConnection();
-		$data = [];
+		$conn=$this->getDbConnection();
+		$data=[];
 		foreach($array as $k => $v)
-			$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
-		return '(' . implode(', ', $data) . ')';
+			$data[]=is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
+		return '('.implode(', ', $data).')';
 	}
 
 	/**
@@ -257,20 +257,20 @@ 
 	 */
 	protected function getPrimaryKeyCondition($values)
 	{
-		$primary = $this->getTableInfo()->getPrimaryKeys();
-		if(count($primary) === 0)
+		$primary=$this->getTableInfo()->getPrimaryKeys();
+		if(count($primary)===0)
 		{
 			throw new TDbException('dbtablegateway_no_primary_key_found',
 				$this->getTableInfo()->getTableFullName());
 		}
-		$criteria = [];
-		$bindings = [];
-		$i = 0;
+		$criteria=[];
+		$bindings=[];
+		$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 [implode(' AND ', $criteria), $bindings];
 	}
@@ -282,7 +282,7 @@ 
 	 */
 	public function findBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->queryRow());
 	}
 
@@ -293,7 +293,7 @@ 
 	 */
 	public function findAllBySql($criteria)
 	{
-		$command = $this->getSqlCommand($criteria);
+		$command=$this->getSqlCommand($criteria);
 		return $this->onExecuteCommand($command, $command->query());
 	}
 
@@ -304,15 +304,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);
+			$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()->applyLimitOffset($sql, $limit, $offset);
+		$command=$this->getBuilder()->createCommand($sql);
 		$this->getBuilder()->bindArrayValues($command, $criteria->getParameters()->toArray());
 		$this->onCreateCommand($command, $criteria);
 		return $command;
@@ -324,16 +324,16 @@ 
 	 */
 	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);
+		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);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command, (int)$command->queryScalar());
+		return $this->onExecuteCommand($command, (int) $command->queryScalar());
 	}
 
 	/**
@@ -345,13 +345,13 @@ 
 	 */
 	public function insert($data)
 	{
-		$command = $this->getBuilder()->createInsertCommand($data);
+		$command=$this->getBuilder()->createInsertCommand($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;
 	}
@@ -374,8 +374,8 @@ 
 	 */
 	public function createCriteriaFromString($method, $condition, $args)
 	{
-		$fields = $this->extractMatchingConditions($method, $condition);
-		$args = count($args) === 1 && is_array($args[0]) ? $args[0] : $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',
@@ -393,25 +393,25 @@ 
 	 */
 	protected function extractMatchingConditions($method, $condition)
 	{
-		$table = $this->getTableInfo();
-		$columns = $table->getLowerCaseColumnNames();
-		$regexp = '/(' . implode('|', array_keys($columns)) . ')(and|_and_|or|_or_)?/i';
-		$matches = [];
+		$table=$this->getTableInfo();
+		$columns=$table->getLowerCaseColumnNames();
+		$regexp='/('.implode('|', array_keys($columns)).')(and|_and_|or|_or_)?/i';
+		$matches=[];
 		if(!preg_match_all($regexp, strtolower($condition), $matches, PREG_SET_ORDER))
 		{
 			throw new TDbException('dbtablegateway_mismatch_column_name',
 				$method, implode(', ', $columns), $table->getTableFullName());
 		}
 
-		$fields = [];
+		$fields=[];
 		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;
 	}
@@ -440,7 +440,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 +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 */
 	public function __construct($object)
 	{
-		$this->_key = $this->generateKey(serialize($object));
+		$this->_key=$this->generateKey(serialize($object));
 	}
 
 	/**

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

@@ -38,18 +38,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 = [];
-	private $_flushInterval = 0;
+	private $_implementation=TSqlMapCacheTypes::Basic;
+	private $_properties=[];
+	private $_flushInterval=0;
 
-	private static $_cacheTypes = [];
+	private static $_cacheTypes=[];
 
 	public static function registerCacheType($type, $className)
 	{
-		self::$_cacheTypes[$type] = $className;
+		self::$_cacheTypes[$type]=$className;
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -81,10 +81,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');
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function setFlushInterval($value)
 	{
-		$this->_flushInterval = TPropertyValue::ensureInteger($value);
+		$this->_flushInterval=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -107,12 +107,12 @@ 
 	 * Initialize the cache implementation, sets the actual cache contain if supplied.
 	 * @param ISqLMapCache cache implementation instance.
 	 */
-	public function initialize($cache = null)
+	public function initialize($cache=null)
 	{
-		if($cache === null)
-			$this->_cache = Prado::createComponent($this->getImplementationClass(), $this);
+		if($cache===null)
+			$this->_cache=Prado::createComponent($this->getImplementationClass(), $this);
 		else
-			$this->_cache = $cache;
+			$this->_cache=$cache;
 	}
 
 	/**
@@ -120,8 +120,8 @@ 
 	 */
 	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'))
 		{
@@ -155,12 +155,12 @@ 
 	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)
+		if($value!==null)
 			$this->_hits++;
 		return $value;
 	}
@@ -172,9 +172,9 @@ 
 	public function set($key, $value)
 	{
 		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+			$key=$key->getHash();
 
-		if($value !== null)
+		if($value!==null)
 			$this->_cache->set($key, $value, $this->_flushInterval);
 	}
 
@@ -183,7 +183,7 @@ 
 	 */
 	public function getHitRatio()
 	{
-		if($this->_requests != 0)
+		if($this->_requests!=0)
 			return $this->_hits / $this->_requests;
 		else
 			return 0;