pradosoft / prado

framework/Data/Common/Oracle/TOracleTableInfo.php

Doc Comments +2 added lines

@@ -53,6 +53,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 +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
  */
 class TOracleTableInfo extends TComponent
 {
-	private $_info=array();
+	private $_info = array();
 
 	private $_primaryKeys;
 	private $_foreignKeys;
@@ -32,12 +32,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;
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Oracle.TOracleCommandBuilder');
-		return new TOracleCommandBuilder($connection,$this);
+		return new TOracleCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -55,7 +55,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;
 	}
@@ -64,9 +64,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;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function getTableFullName()
 	{
-		return $this->_info['SchemaName'].'.'.$this->getTableName();
+		return $this->_info['SchemaName'] . '.' . $this->getTableName();
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -107,7 +107,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());
 	}
@@ -118,7 +118,7 @@ 
 	 */
 	public function getColumnNames()
 	{
-		foreach($this->getColumns() as $column)
+		foreach ($this->getColumns() as $column)
 			$names[] = $column->getColumnName();
 		return $names;
 	}
@@ -144,10 +144,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 +9 added lines, -6 removed lines

@@ -107,8 +107,9 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name))!==null)
-			return $column;
+		if(($column = $this->_columns->itemAt($name))!==null) {
+					return $column;
+		}
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
 
@@ -118,8 +119,9 @@ 
 	 */
 	public function getColumnNames()
 	{
-		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
+		foreach($this->getColumns() as $column) {
+					$names[] = $column->getColumnName();
+		}
 		return $names;
 	}
 
@@ -147,8 +149,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/Common/Pgsql/TPgsqlMetaData.php

Doc Comments +1 added lines

@@ -204,6 +204,7 @@
 	/**
 	 * @param TPgsqlTableInfo table information.
 	 * @param array column information.
+	 * @param TPgsqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Indentation +6 added lines, -6 removed lines

@@ -417,12 +417,12 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @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.
+		 * @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.
+		 */
 	public function findTableNames($schema='public')
 	{
 		if($schema==='')

Spacing +53 added lines, -53 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	public function setDefaultSchema($schema)
 	{
-		$this->_defaultSchema=$schema;
+		$this->_defaultSchema = $schema;
 	}
 
 	/**
@@ -86,10 +86,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
+		if (count($parts = explode('.', str_replace('"', '', $table))) > 1)
 			return array($parts[0], $parts[1]);
 		else
-			return array($this->getDefaultSchema(),$parts[0]);
+			return array($this->getDefaultSchema(), $parts[0]);
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
@@ -139,13 +139,13 @@ 
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
 		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
-		$index=0;
-		foreach($command->query() as $col)
+		$index = 0;
+		foreach ($command->query() as $col)
 		{
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index===0)
+		if ($index === 0)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		return $tableInfo;
 	}
@@ -155,15 +155,15 @@ 
 	 * @param string table name.
 	 * @return TPgsqlTableInfo
 	 */
-	protected function createNewTableInfo($schemaName,$tableName)
+	protected function createNewTableInfo($schemaName, $tableName)
 	{
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName'] = $this->assertIdentifier($tableName);
-		if($this->getIsView($schemaName,$tableName))
+		if ($this->getIsView($schemaName, $tableName))
 			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	protected function assertIdentifier($name)
 	{
-		if(strpos($name, '"')!==false)
+		if (strpos($name, '"') !== false)
 		{
 			$ref = 'http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
@@ -186,7 +186,7 @@ 
 	 * @param string table name.
 	 * @return boolean true if the table is a view.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
 		$sql =
 <<<EOD
@@ -196,7 +196,7 @@ 
 EOD;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
-		$command->bindValue(':schema',$schemaName);
+		$command->bindValue(':schema', $schemaName);
 		$command->bindValue(':table', $tableName);
 		return intval($command->queryScalar()) === 1;
 	}
@@ -209,36 +209,36 @@ 
 	{
 		$columnId = $col['attname']; //use column name as column Id
 
-		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
+		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if(!$col['attnotnull'])
+		if (!$col['attnotnull'])
 			$info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
+		if (in_array($columnId, $tableInfo->getPrimaryKeys()))
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
+		if ($this->isForeignKeyColumn($columnId, $tableInfo))
 			$info['IsForeignKey'] = true;
 
-		if($col['atttypmod'] > 0)
-			$info['ColumnSize'] =  $col['atttypmod'] - 4;
-		if($col['atthasdef'])
+		if ($col['atttypmod'] > 0)
+			$info['ColumnSize'] = $col['atttypmod'] - 4;
+		if ($col['atthasdef'])
 			$info['DefaultValue'] = $col['adsrc'];
-		if($col['attisserial'] || substr($col['adsrc'],0,8) === 'nextval(')
+		if ($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(')
 		{
-			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc']))!==null)
+			if (($sequence = $this->getSequenceName($tableInfo, $col['adsrc'])) !== null)
 			{
 				$info['SequenceName'] = $sequence;
 				unset($info['DefaultValue']);
 			}
 		}
 		$matches = array();
-		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
+		if (preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/','',$col['type']);
-			if($this->isPrecisionType($info['DbType']))
+			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
+			if ($this->isPrecisionType($info['DbType']))
 			{
 				$info['NumericPrecision'] = intval($matches[1]);
-				if(count($matches) > 2)
+				if (count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
 			}
 			else
@@ -253,15 +253,15 @@ 
 	/**
 	 * @return string serial name if found, null otherwise.
 	 */
-	protected function getSequenceName($tableInfo,$src)
+	protected function getSequenceName($tableInfo, $src)
 	{
 		$matches = array();
-		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
+		if (preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
-			if(is_int(strpos($matches[1], '.')))
+			if (is_int(strpos($matches[1], '.')))
 				return $matches[1];
 			else
-				return $tableInfo->getSchemaName().'.'.$matches[1];
+				return $tableInfo->getSchemaName() . '.' . $matches[1];
 		}
 	}
 
@@ -271,7 +271,7 @@ 
 	protected function isPrecisionType($type)
 	{
 		$type = strtolower(trim($type));
-		return $type==='numeric' || $type==='interval' || strpos($type, 'time')===0;
+		return $type === 'numeric' || $type === 'interval' || strpos($type, 'time') === 0;
 	}
 
 	/**
@@ -335,20 +335,20 @@ 
 		$command->bindValue(':schema', $schemaName);
 		$primary = array();
 		$foreign = array();
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
-			switch($row['contype'])
+			switch ($row['contype'])
 			{
 				case 'p':
 					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
+					if (($fkey = $this->getForeignKeys($row['consrc'])) !== null)
 						$foreign[] = $fkey;
 					break;
 			}
 		}
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 		$command->bindValue(':schema', $schemaName);
 //		$command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex)));
 		$primary = array();
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
 						$primary[] = $row['attname'];
 		}
@@ -392,13 +392,13 @@ 
 		$matches = array();
 		$brackets = '\(([^\)]+)\)';
 		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
-		if(preg_match($find, $src, $matches))
+		if (preg_match($find, $src, $matches))
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = array();
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
+			foreach (preg_split('/,\s+/', $matches[3]) as $i => $fkey)
 				$fkeys[$keys[$i]] = $fkey;
-			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
+			return array('table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys);
 		}
 	}
 
@@ -409,9 +409,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach($tableInfo->getForeignKeys() as $fk)
+		foreach ($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;
@@ -423,24 +423,24 @@ 
 	 * If not empty, the returned table names will be prefixed with the schema name.
 	 * @return array all table names in the database.
 	 */
-	public function findTableNames($schema='public')
+	public function findTableNames($schema = 'public')
 	{
-		if($schema==='')
-			$schema=self::DEFAULT_SCHEMA;
-		$sql=<<<EOD
+		if ($schema === '')
+			$schema = self::DEFAULT_SCHEMA;
+		$sql = <<<EOD
 SELECT table_name, table_schema FROM information_schema.tables
 WHERE table_schema=:schema AND table_type='BASE TABLE'
 EOD;
-		$command=$this->getDbConnection()->createCommand($sql);
-		$command->bindParam(':schema',$schema);
-		$rows=$command->queryAll();
-		$names=array();
-		foreach($rows as $row)
+		$command = $this->getDbConnection()->createCommand($sql);
+		$command->bindParam(':schema', $schema);
+		$rows = $command->queryAll();
+		$names = array();
+		foreach ($rows as $row)
 		{
-			if($schema===self::DEFAULT_SCHEMA)
-				$names[]=$row['table_name'];
+			if ($schema === self::DEFAULT_SCHEMA)
+				$names[] = $row['table_name'];
 			else
-				$names[]=$row['table_schema'].'.'.$row['table_name'];
+				$names[] = $row['table_schema'] . '.' . $row['table_name'];
 		}
 		return $names;
 	}

Braces +55 added lines, -40 removed lines

@@ -86,10 +86,11 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
-			return array($parts[0], $parts[1]);
-		else
-			return array($this->getDefaultSchema(),$parts[0]);
+		if(count($parts= explode('.', str_replace('"','',$table))) > 1) {
+					return array($parts[0], $parts[1]);
+		} else {
+					return array($this->getDefaultSchema(),$parts[0]);
+		}
 	}
 
 	/**
@@ -145,8 +146,9 @@ 
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index===0)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
+		if($index===0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
 		return $tableInfo;
 	}
 
@@ -159,8 +161,9 @@ 
 	{
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName'] = $this->assertIdentifier($tableName);
-		if($this->getIsView($schemaName,$tableName))
-			$info['IsView'] = true;
+		if($this->getIsView($schemaName,$tableName)) {
+					$info['IsView'] = true;
+		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
 		return new $class($info,$primary,$foreign);
@@ -212,17 +215,22 @@ 
 		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if(!$col['attnotnull'])
-			$info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+		if(!$col['attnotnull']) {
+					$info['AllowNull'] = true;
+		}
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+					$info['IsForeignKey'] = true;
+		}
 
-		if($col['atttypmod'] > 0)
-			$info['ColumnSize'] =  $col['atttypmod'] - 4;
-		if($col['atthasdef'])
-			$info['DefaultValue'] = $col['adsrc'];
+		if($col['atttypmod'] > 0) {
+					$info['ColumnSize'] =  $col['atttypmod'] - 4;
+		}
+		if($col['atthasdef']) {
+					$info['DefaultValue'] = $col['adsrc'];
+		}
 		if($col['attisserial'] || substr($col['adsrc'],0,8) === 'nextval(')
 		{
 			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc']))!==null)
@@ -238,14 +246,15 @@ 
 			if($this->isPrecisionType($info['DbType']))
 			{
 				$info['NumericPrecision'] = intval($matches[1]);
-				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+				if(count($matches) > 2) {
+									$info['NumericScale'] = intval($matches[2]);
+				}
+			} else {
+							$info['ColumnSize'] = intval($matches[1]);
 			}
-			else
-				$info['ColumnSize'] = intval($matches[1]);
+		} else {
+					$info['DbType'] = $col['type'];
 		}
-		else
-			$info['DbType'] = $col['type'];
 
 		$tableInfo->Columns[$columnId] = new TPgsqlTableColumn($info);
 	}
@@ -258,10 +267,11 @@ 
 		$matches = array();
 		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
 		{
-			if(is_int(strpos($matches[1], '.')))
-				return $matches[1];
-			else
-				return $tableInfo->getSchemaName().'.'.$matches[1];
+			if(is_int(strpos($matches[1], '.'))) {
+							return $matches[1];
+			} else {
+							return $tableInfo->getSchemaName().'.'.$matches[1];
+			}
 		}
 	}
 
@@ -343,8 +353,9 @@ 
 					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
-						$foreign[] = $fkey;
+					if(($fkey = $this->getForeignKeys($row['consrc']))!==null) {
+											$foreign[] = $fkey;
+					}
 					break;
 			}
 		}
@@ -396,8 +407,9 @@ 
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = array();
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
+			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey) {
+							$fkeys[$keys[$i]] = $fkey;
+			}
 			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
 		}
 	}
@@ -411,8 +423,9 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -425,8 +438,9 @@ 
 	 */
 	public function findTableNames($schema='public')
 	{
-		if($schema==='')
-			$schema=self::DEFAULT_SCHEMA;
+		if($schema==='') {
+					$schema=self::DEFAULT_SCHEMA;
+		}
 		$sql=<<<EOD
 SELECT table_name, table_schema FROM information_schema.tables
 WHERE table_schema=:schema AND table_type='BASE TABLE'
@@ -437,10 +451,11 @@ 
 		$names=array();
 		foreach($rows as $row)
 		{
-			if($schema===self::DEFAULT_SCHEMA)
-				$names[]=$row['table_name'];
-			else
-				$names[]=$row['table_schema'].'.'.$row['table_name'];
+			if($schema===self::DEFAULT_SCHEMA) {
+							$names[]=$row['table_name'];
+			} else {
+							$names[]=$row['table_schema'].'.'.$row['table_name'];
+			}
 		}
 		return $names;
 	}

framework/Data/Common/Sqlite/TSqliteMetaData.php

Doc Comments +1 added lines

@@ -159,6 +159,7 @@
 	 *
 	 *
 	 * @param string quoted table name.
+	 * @param string $table
 	 * @return array foreign key details.
 	 */
 	protected function getForeignKeys($table)

Indentation +5 added lines, -5 removed lines

@@ -189,11 +189,11 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. This is not used for sqlite database.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. This is not used for sqlite database.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='')
 	{
 		$sql="SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'";

Spacing +25 added lines, -25 removed lines

@@ -69,30 +69,30 @@ 
 	 */
 	protected function createTableInfo($tableName)
 	{
-		$tableName = str_replace("'",'',$tableName);
+		$tableName = str_replace("'", '', $tableName);
 		$this->getDbConnection()->setActive(true);
 		$table = $this->getDbConnection()->quoteString($tableName);
 		$sql = "PRAGMA table_info({$table})";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$foreign = $this->getForeignKeys($table);
-		$index=0;
-		$columns=array();
-		$primary=array();
-		foreach($command->query() as $col)
+		$index = 0;
+		$columns = array();
+		$primary = array();
+		foreach ($command->query() as $col)
 		{
 			$col['index'] = $index++;
 			$column = $this->processColumn($col, $foreign);
 			$columns[$col['name']] = $column;
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$primary[] = $col['name'];
 		}
 		$info['TableName'] = $tableName;
-		if($this->getIsView($tableName))
+		if ($this->getIsView($tableName))
 			$info['IsView'] = true;
-		if(count($columns)===0)
+		if (count($columns) === 0)
 			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
 		$class = $this->getTableInfoClass();
-		$tableInfo = new $class($info,$primary,$foreign);
+		$tableInfo = new $class($info, $primary, $foreign);
 		$tableInfo->getColumns()->copyFrom($columns);
 		return $tableInfo;
 	}
@@ -119,37 +119,37 @@ 
 	{
 		$columnId = $col['name']; //use column name as column Id
 
-		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
+		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
 
-		if($col['notnull']!=='99')
+		if ($col['notnull'] !== '99')
 			$info['AllowNull'] = true;
 
-		if($col['pk']==='1')
+		if ($col['pk'] === '1')
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $foreign))
+		if ($this->isForeignKeyColumn($columnId, $foreign))
 			$info['IsForeignKey'] = true;
 
-		if($col['dflt_value']!==null)
+		if ($col['dflt_value'] !== null)
 			$info['DefaultValue'] = $col['dflt_value'];
 
 		$type = strtolower($col['type']);
-		$info['AutoIncrement'] = $type==='integer' && $col['pk']==='1';
+		$info['AutoIncrement'] = $type === 'integer' && $col['pk'] === '1';
 
 		$info['DbType'] = $type;
-		$match=array();
-		if(is_int($pos=strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
+		$match = array();
+		if (is_int($pos = strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
 		{
 			$ps = explode(',', $match[1]);
-			if(count($ps)===2)
+			if (count($ps) === 2)
 			{
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
 			}
 			else
-				$info['ColumnSize']=intval($match[1]);
-			$info['DbType'] = substr($type,0,$pos);
+				$info['ColumnSize'] = intval($match[1]);
+			$info['DbType'] = substr($type, 0, $pos);
 		}
 
 		return new TSqliteTableColumn($info);
@@ -166,7 +166,7 @@ 
 		$sql = "PRAGMA foreign_key_list({$table})";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$fkeys = array();
-		foreach($command->query() as $col)
+		foreach ($command->query() as $col)
 		{
 			$fkeys[$col['table']]['keys'][$col['from']] = $col['to'];
 			$fkeys[$col['table']]['table'] = $col['table'];
@@ -181,9 +181,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $foreign)
 	{
-		foreach($foreign as $fk)
+		foreach ($foreign as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;
@@ -194,9 +194,9 @@ 
 	 * @param string $schema the schema of the tables. This is not used for sqlite database.
 	 * @return array all table names in the database.
 	 */
-	public function findTableNames($schema='')
+	public function findTableNames($schema = '')
 	{
-		$sql="SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'";
+		$sql = "SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'";
 		return $this->getDbConnection()->createCommand($sql)->queryColumn();
 	}
 }
\ No newline at end of file

Braces +26 added lines, -18 removed lines

@@ -83,14 +83,17 @@ 
 			$col['index'] = $index++;
 			$column = $this->processColumn($col, $foreign);
 			$columns[$col['name']] = $column;
-			if($column->getIsPrimaryKey())
-				$primary[] = $col['name'];
+			if($column->getIsPrimaryKey()) {
+							$primary[] = $col['name'];
+			}
 		}
 		$info['TableName'] = $tableName;
-		if($this->getIsView($tableName))
-			$info['IsView'] = true;
-		if(count($columns)===0)
-			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
+		if($this->getIsView($tableName)) {
+					$info['IsView'] = true;
+		}
+		if(count($columns)===0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $tableName);
+		}
 		$class = $this->getTableInfoClass();
 		$tableInfo = new $class($info,$primary,$foreign);
 		$tableInfo->getColumns()->copyFrom($columns);
@@ -123,16 +126,20 @@ 
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
 
-		if($col['notnull']!=='99')
-			$info['AllowNull'] = true;
+		if($col['notnull']!=='99') {
+					$info['AllowNull'] = true;
+		}
 
-		if($col['pk']==='1')
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $foreign))
-			$info['IsForeignKey'] = true;
+		if($col['pk']==='1') {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $foreign)) {
+					$info['IsForeignKey'] = true;
+		}
 
-		if($col['dflt_value']!==null)
-			$info['DefaultValue'] = $col['dflt_value'];
+		if($col['dflt_value']!==null) {
+					$info['DefaultValue'] = $col['dflt_value'];
+		}
 
 		$type = strtolower($col['type']);
 		$info['AutoIncrement'] = $type==='integer' && $col['pk']==='1';
@@ -146,9 +153,9 @@ 
 			{
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
+			} else {
+							$info['ColumnSize']=intval($match[1]);
 			}
-			else
-				$info['ColumnSize']=intval($match[1]);
 			$info['DbType'] = substr($type,0,$pos);
 		}
 
@@ -183,8 +190,9 @@ 
 	{
 		foreach($foreign as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}

framework/Data/Common/TDbCommandBuilder.php

Doc Comments +4 added lines, -3 removed lines

@@ -67,7 +67,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()
 	{
@@ -187,7 +187,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
@@ -395,7 +394,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)
 	{
@@ -439,6 +438,7 @@ 
 	 * Bind the name-value pairs of $values where the array keys correspond to column names.
 	 * @param TDbCommand database command.
 	 * @param array name-value pairs.
+	 * @param TDbCommand $command
 	 */
 	public function bindColumnValues($command, $values)
 	{
@@ -455,6 +455,7 @@ 
 	/**
 	 * @param TDbCommand database command
 	 * @param array values for binding.
+	 * @param TDbCommand $command
 	 */
 	public function bindArrayValues($command, $values)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TDbCommandBuilder class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.Common
- */
+	 * TDbCommandBuilder class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.Common
+	 */
 
 /**
  * TDbCommandBuilder provides basic methods to create query commands for tables

Spacing +83 added lines, -83 removed lines

@@ -26,7 +26,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);
@@ -45,7 +45,7 @@ 
 	 */
 	public function setDbConnection($value)
 	{
-		$this->_connection=$value;
+		$this->_connection = $value;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	public function setTableInfo($value)
 	{
-		$this->_tableInfo=$value;
+		$this->_tableInfo = $value;
 	}
 
 	/**
@@ -71,9 +71,9 @@ 
 	 */
 	public function getLastInsertID()
 	{
-		foreach($this->getTableInfo()->getColumns() as $column)
+		foreach ($this->getTableInfo()->getColumns() as $column)
 		{
-			if($column->hasSequence())
+			if ($column->hasSequence())
 				return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
 		}
 	}
@@ -86,13 +86,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;
 	}
 
 	/**
@@ -102,21 +102,21 @@ 
 	 */
 	public function applyOrdering($sql, $ordering)
 	{
-		$orders=array();
-		foreach($ordering as $name => $direction)
+		$orders = array();
+		foreach ($ordering as $name => $direction)
 		{
 			$direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC';
-			if(false !== strpos($name, '(') && false !== strpos($name, ')')) {
+			if (false !== strpos($name, '(') && false !== strpos($name, ')')) {
 				// key is a function (bad practice, but we need to handle it)
 				$key = $name;
 			} else {
 				// key is a column
 				$key = $this->getTableInfo()->getColumn($name)->getColumnName();
 			}
-			$orders[] = $key.' '.$direction;
+			$orders[] = $key . ' ' . $direction;
 		}
-		if(count($orders) > 0)
-			$sql .= ' ORDER BY '.implode(', ', $orders);
+		if (count($orders) > 0)
+			$sql .= ' ORDER BY ' . implode(', ', $orders);
 		return $sql;
 	}
 
@@ -130,15 +130,15 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
+		if (strlen(trim($keywords)) == 0) return '';
 		$words = preg_split('/\s/u', $keywords);
 		$conditions = array();
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			$column = $this->getTableInfo()->getColumn($field)->getColumnName();
 			$conditions[] = $this->getSearchCondition($column, $words);
 		}
-		return '('.implode(' OR ', $conditions).')';
+		return '(' . implode(' OR ', $conditions) . ')';
 	}
 
 	/**
@@ -148,10 +148,10 @@ 
 	 */
 	protected function getSearchCondition($column, $words)
 	{
-		$conditions=array();
-		foreach($words as $word)
-			$conditions[] = $column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
-		return '('.implode(' AND ', $conditions).')';
+		$conditions = array();
+		foreach ($words as $word)
+			$conditions[] = $column . ' LIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		return '(' . implode(' AND ', $conditions) . ')';
 	}
 
 	/**
@@ -193,103 +193,103 @@ 
 	 * @todo add support for table aliasing
 	 * @todo add support for quoting of column aliasing
 	 */
-	public function getSelectFieldList($data='*') {
-		if(is_scalar($data)) {
+	public function getSelectFieldList($data = '*') {
+		if (is_scalar($data)) {
 			$tmp = explode(',', $data);
 			$result = array();
-			foreach($tmp as $v)
+			foreach ($tmp as $v)
 				$result[] = trim($v);
 			return $result;
 		}
 
 		$bHasWildcard = false;
 		$result = array();
-		if(is_array($data) || $data instanceof Traversable) {
+		if (is_array($data) || $data instanceof Traversable) {
 			$columns = $this->getTableInfo()->getColumns();
-			foreach($data as $key=>$value) {
-				if($key==='*' || $value==='*') {
+			foreach ($data as $key=>$value) {
+				if ($key === '*' || $value === '*') {
 					$bHasWildcard = true;
 					continue;
 				}
 
-				if(strToUpper($key)==='NULL') {
+				if (strToUpper($key) === 'NULL') {
 					$result[] = 'NULL';
 					continue;
 				}
 
-				if(strpos($key, '(')!==false && strpos($key, ')')!==false) {
+				if (strpos($key, '(') !== false && strpos($key, ')') !== false) {
 					$result[] = $key;
 					continue;
 				}
 
-				if(stripos($key, 'AS')!==false) {
+				if (stripos($key, 'AS') !== false) {
 					$result[] = $key;
 					continue;
 				}
 
-				if(stripos($value, 'AS')!==false) {
+				if (stripos($value, 'AS') !== false) {
 					$result[] = $value;
 					continue;
 				}
 
 				$v = isset($columns[$value]);
 				$k = isset($columns[$key]);
-				if(is_integer($key) && $v) {
+				if (is_integer($key) && $v) {
 					$key = $value;
 					$k = $v;
 				}
 
-				if(strToUpper($value)==='NULL') {
-					if($k)
+				if (strToUpper($value) === 'NULL') {
+					if ($k)
 						$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($k)
+				if (strpos($value, '(') !== false && strpos($value, ')') !== false) {
+					if ($k)
 						$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) {
+				if ($v && $key == $value) {
 					$result[] = $columns[$value]->getColumnName();
 					continue;
 				}
 
-				if($k && $value==null) {
+				if ($k && $value == null) {
 					$result[] = $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if(is_string($key) && $v) {
+				if (is_string($key) && $v) {
 					$result[] = $columns[$value]->getColumnName() . ' AS ' . $key;
 					continue;
 				}
 
-				if(is_numeric($value) && $k) {
+				if (is_numeric($value) && $k) {
 					$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if(is_string($value) && $k) {
+				if (is_string($value) && $k) {
 					$result[] = $this->getDbConnection()->quoteString($value) . ' AS ' . $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if(!$v && !$k && is_integer($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+				if (!$v && !$k && is_integer($key)) {
+					$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)
+		if ($data === null || count($result) == 0 || $bHasWildcard)
 			$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
 
 		return $result;
@@ -302,21 +302,21 @@ 
 	 * @param array condition parameters.
 	 * @return TDbCommand query command.
 	 */
-	public function createFindCommand($where='1=1', $parameters=array(), $ordering=array(), $limit=-1, $offset=-1, $select='*')
+	public function createFindCommand($where = '1=1', $parameters = array(), $ordering = array(), $limit = -1, $offset = -1, $select = '*')
 	{
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
 		$sql = "SELECT {$fields} FROM {$table}";
-		if(!empty($where))
+		if (!empty($where))
 			$sql .= " WHERE {$where}";
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
-	public function applyCriterias($sql, $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
+	public function applyCriterias($sql, $parameters = array(), $ordering = array(), $limit = -1, $offset = -1)
 	{
-		if(count($ordering) > 0)
+		if (count($ordering) > 0)
 			$sql = $this->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
+		if ($limit >= 0 || $offset >= 0)
 			$sql = $this->applyLimitOffset($sql, $limit, $offset);
 		$command = $this->createCommand($sql);
 		$this->bindArrayValues($command, $parameters);
@@ -329,7 +329,7 @@ 
 	 * @param array binding parameters.
 	 * @return TDbCommand count command.
 	 */
-	public function createCountCommand($where='1=1', $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
+	public function createCountCommand($where = '1=1', $parameters = array(), $ordering = array(), $limit = -1, $offset = -1)
 	{
 		return $this->createFindCommand($where, $parameters, $ordering, $limit, $offset, 'COUNT(*)');
 	}
@@ -342,12 +342,12 @@ 
 	 * @param array delete parameters.
 	 * @return TDbCommand delete command.
 	 */
-	public function createDeleteCommand($where,$parameters=array())
+	public function createDeleteCommand($where, $parameters = array())
 	{
 		$table = $this->getTableInfo()->getTableFullName();
 		if (!empty($where))
-			$where = ' WHERE '.$where;
-		$command = $this->createCommand("DELETE FROM {$table}".$where);
+			$where = ' WHERE ' . $where;
+		$command = $this->createCommand("DELETE FROM {$table}" . $where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -377,17 +377,17 @@ 
 	 * @param array update parameters.
 	 * @return TDbCommand update command.
 	 */
-	public function createUpdateCommand($data, $where, $parameters=array())
+	public function createUpdateCommand($data, $where, $parameters = array())
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if($this->hasIntegerKey($parameters))
+		if ($this->hasIntegerKey($parameters))
 			$fields = implode(', ', $this->getColumnBindings($data, true));
 		else
 			$fields = implode(', ', $this->getColumnBindings($data));
 
 		if (!empty($where))
-			$where = ' WHERE '.$where;
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}".$where);
+			$where = ' WHERE ' . $where;
+		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}
@@ -399,13 +399,13 @@ 
 	 */
 	protected function getInsertFieldBindings($values)
 	{
-		$fields = array(); $bindings=array();
-		foreach(array_keys($values) as $name)
+		$fields = array(); $bindings = array();
+		foreach (array_keys($values) as $name)
 		{
 			$fields[] = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = ':'.$name;
+			$bindings[] = ':' . $name;
 		}
-		return array(implode(', ',$fields), implode(', ', $bindings));
+		return array(implode(', ', $fields), implode(', ', $bindings));
 	}
 
 	/**
@@ -414,13 +414,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=array();
-		foreach(array_keys($values) as $name)
+		$bindings = array();
+		foreach (array_keys($values) as $name)
 		{
 			$column = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = $position ? $column.' = ?' : $column.' = :'.$name;
+			$bindings[] = $position ? $column . ' = ?' : $column . ' = :' . $name;
 		}
 		return $bindings;
 	}
@@ -442,13 +442,13 @@ 
 	 */
 	public function bindColumnValues($command, $values)
 	{
-		foreach($values as $name=>$value)
+		foreach ($values as $name=>$value)
 		{
 			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
-				$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
+			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());
 		}
 	}
 
@@ -458,17 +458,17 @@ 
 	 */
 	public function bindArrayValues($command, $values)
 	{
-		if($this->hasIntegerKey($values))
+		if ($this->hasIntegerKey($values))
 		{
 			$values = array_values($values);
-			for($i = 0, $max=count($values); $i<$max; $i++)
-				$command->bindValue($i+1, $values[$i], $this->getPdoType($values[$i]));
+			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)
+			foreach ($values as $name=>$value)
 			{
-				$prop = $name[0]===':' ? $name : ':'.$name;
+				$prop = $name[0] === ':' ? $name : ':' . $name;
 				$command->bindValue($prop, $value, $this->getPdoType($value));
 			}
 		}
@@ -480,7 +480,7 @@ 
 	 */
 	public static function getPdoType($value)
 	{
-		switch(gettype($value))
+		switch (gettype($value))
 		{
 			case 'boolean': return PDO::PARAM_BOOL;
 			case 'integer': return PDO::PARAM_INT;
@@ -495,9 +495,9 @@ 
 	 */
 	protected function hasIntegerKey($array)
 	{
-		foreach($array as $k=>$v)
+		foreach ($array as $k=>$v)
 		{
-			if(gettype($k)==='integer')
+			if (gettype($k) === 'integer')
 				return true;
 		}
 		return false;

Braces +60 added lines, -43 removed lines

@@ -73,8 +73,9 @@ 
 	{
 		foreach($this->getTableInfo()->getColumns() as $column)
 		{
-			if($column->hasSequence())
-				return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
+			if($column->hasSequence()) {
+							return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
+			}
 		}
 	}
 
@@ -115,8 +116,9 @@ 
 			}
 			$orders[] = $key.' '.$direction;
 		}
-		if(count($orders) > 0)
-			$sql .= ' ORDER BY '.implode(', ', $orders);
+		if(count($orders) > 0) {
+					$sql .= ' ORDER BY '.implode(', ', $orders);
+		}
 		return $sql;
 	}
 
@@ -130,7 +132,9 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
+		if(strlen(trim($keywords)) == 0) {
+			return '';
+		}
 		$words = preg_split('/\s/u', $keywords);
 		$conditions = array();
 		foreach($fields as $field)
@@ -149,8 +153,9 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions=array();
-		foreach($words as $word)
-			$conditions[] = $column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+		foreach($words as $word) {
+					$conditions[] = $column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+		}
 		return '('.implode(' AND ', $conditions).')';
 	}
 
@@ -197,8 +202,9 @@ 
 		if(is_scalar($data)) {
 			$tmp = explode(',', $data);
 			$result = array();
-			foreach($tmp as $v)
-				$result[] = trim($v);
+			foreach($tmp as $v) {
+							$result[] = trim($v);
+			}
 			return $result;
 		}
 
@@ -240,18 +246,20 @@ 
 				}
 
 				if(strToUpper($value)==='NULL') {
-					if($k)
-						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
-					else
-						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+					if($k) {
+											$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
+					} else {
+											$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+					}
 					continue;
 				}
 
 				if(strpos($value, '(')!==false && strpos($value, ')')!==false) {
-					if($k)
-						$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
-					else
-						$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+					if($k) {
+											$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+					} else {
+											$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+					}
 					continue;
 				}
 
@@ -289,8 +297,9 @@ 
 			}
 		}
 
-		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,17 +316,20 @@ 
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
 		$sql = "SELECT {$fields} FROM {$table}";
-		if(!empty($where))
-			$sql .= " WHERE {$where}";
+		if(!empty($where)) {
+					$sql .= " WHERE {$where}";
+		}
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
 	public function applyCriterias($sql, $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
 	{
-		if(count($ordering) > 0)
-			$sql = $this->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
-			$sql = $this->applyLimitOffset($sql, $limit, $offset);
+		if(count($ordering) > 0) {
+					$sql = $this->applyOrdering($sql, $ordering);
+		}
+		if($limit>=0 || $offset>=0) {
+					$sql = $this->applyLimitOffset($sql, $limit, $offset);
+		}
 		$command = $this->createCommand($sql);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
@@ -345,8 +357,9 @@ 
 	public function createDeleteCommand($where,$parameters=array())
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where))
-			$where = ' WHERE '.$where;
+		if (!empty($where)) {
+					$where = ' WHERE '.$where;
+		}
 		$command = $this->createCommand("DELETE FROM {$table}".$where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
@@ -380,13 +393,15 @@ 
 	public function createUpdateCommand($data, $where, $parameters=array())
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if($this->hasIntegerKey($parameters))
-			$fields = implode(', ', $this->getColumnBindings($data, true));
-		else
-			$fields = implode(', ', $this->getColumnBindings($data));
+		if($this->hasIntegerKey($parameters)) {
+					$fields = implode(', ', $this->getColumnBindings($data, true));
+		} else {
+					$fields = implode(', ', $this->getColumnBindings($data));
+		}
 
-		if (!empty($where))
-			$where = ' WHERE '.$where;
+		if (!empty($where)) {
+					$where = ' WHERE '.$where;
+		}
 		$command = $this->createCommand("UPDATE {$table} SET {$fields}".$where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
@@ -445,10 +460,11 @@ 
 		foreach($values as $name=>$value)
 		{
 			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
-				$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
-			else
-				$command->bindValue(':'.$name, $value, $column->getPdoType());
+			if($value === null && $column->getAllowNull()) {
+							$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
+			} else {
+							$command->bindValue(':'.$name, $value, $column->getPdoType());
+			}
 		}
 	}
 
@@ -461,10 +477,10 @@ 
 		if($this->hasIntegerKey($values))
 		{
 			$values = array_values($values);
-			for($i = 0, $max=count($values); $i<$max; $i++)
-				$command->bindValue($i+1, $values[$i], $this->getPdoType($values[$i]));
-		}
-		else
+			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)
 			{
@@ -497,8 +513,9 @@ 
 	{
 		foreach($array as $k=>$v)
 		{
-			if(gettype($k)==='integer')
-				return true;
+			if(gettype($k)==='integer') {
+							return true;
+			}
 		}
 		return false;
 	}

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)

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

@@ -139,11 +139,13 @@
 		$rgt = $lft = isset($args[1]) ? $args[1] : '';
 		$rgt = isset($args[2]) ? $args[2] : $rgt;
 
-		if(strpos($name, '.')===false)
-			return $lft . $name . $rgt;
+		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);
 	}
 

Indentation +16 added lines, -16 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TDbMetaData class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.Common
- */
+	 * TDbMetaData class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.Common
+	 */
 
 /**
  * TDbMetaData is the base class for retrieving metadata information, such as
@@ -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='');
 }
 

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

@@ -112,8 +112,9 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name))!==null)
-			return $column;
+		if(($column = $this->_columns->itemAt($name))!==null) {
+					return $column;
+		}
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
 
@@ -126,8 +127,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 +158,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 +38 added lines, -26 removed lines

@@ -141,8 +141,9 @@ 
 	 */
 	protected function getFindCommand($criteria)
 	{
-		if($criteria===null)
-			return $this->getBuilder()->createFindCommand();
+		if($criteria===null) {
+					return $this->getBuilder()->createFindCommand();
+		}
 		$where = $criteria->getCondition();
 		$parameters = $criteria->getParameters()->toArray();
 		$ordering = $criteria->getOrdersBy();
@@ -160,8 +161,9 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys===null)
-			return null;
+		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));
@@ -183,10 +185,11 @@ 
 	public function findAllByIndex($criteria,$fields,$values)
 	{
 		$index = $this->getIndexKeyCondition($this->getTableInfo(),$fields,$values);
-		if(strlen($where = $criteria->getCondition())>0)
-			$criteria->setCondition("({$index}) AND ({$where})");
-		else
-			$criteria->setCondition($index);
+		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());
@@ -198,8 +201,9 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(count($keys)==0)
-			return 0;
+		if(count($keys)==0) {
+					return 0;
+		}
 		$where = $this->getCompositeKeyCondition((array)$keys);
 		$command = $this->getBuilder()->createDeleteCommand($where);
 		$this->onCreateCommand($command, new TSqlCriteria($where,$keys));
@@ -209,12 +213,14 @@ 
 
 	public function getIndexKeyCondition($table,$fields,$values)
 	{
-		if (!count($values))
-			return 'FALSE';
+		if (!count($values)) {
+					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);
 	}
 
@@ -237,8 +243,9 @@ 
 			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 && (!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',
@@ -256,8 +263,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).')';
 	}
 
@@ -319,10 +327,12 @@ 
 		$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);
+		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);
 		$this->getBuilder()->bindArrayValues($command, $criteria->getParameters()->toArray());
 		$this->onCreateCommand($command, $criteria);
@@ -335,8 +345,9 @@ 
 	 */
 	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();
@@ -420,8 +431,9 @@ 
 			$key = $columns[$match[1]];
 			$column = $table->getColumn($key)->getColumnName();
 			$sql = $column . ' = ? ';
-			if(count($match) > 2)
-				$sql .= strtoupper(str_replace('_', '', $match[2]));
+			if(count($match) > 2) {
+							$sql .= strtoupper(str_replace('_', '', $match[2]));
+			}
 			$fields[] = $sql;
 		}
 		return $fields;

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

@@ -47,8 +47,9 @@ 
 	 */
 	public function __construct($condition=null, $parameters=array())
 	{
-		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(),1);
+		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);
@@ -182,8 +183,9 @@ 
 	 */
 	public function setParameters($value)
 	{
-		if(!(is_array($value) || $value instanceof ArrayAccess))
-			throw new TException('value must be array or ArrayAccess');
+		if(!(is_array($value) || $value instanceof ArrayAccess)) {
+					throw new TException('value must be array or ArrayAccess');
+		}
 		$this->_parameters->copyFrom($value);
 	}
 
@@ -192,8 +194,9 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k=>$v)
-			return is_string($k);
+		foreach($this->getParameters() as $k=>$v) {
+					return is_string($k);
+		}
 	}
 
 	/**
@@ -209,9 +212,9 @@ 
 	 */
 	public function setOrdersBy($value)
 	{
-		if(is_array($value) || $value instanceof Traversable)
-			$this->_ordersBy->copyFrom($value);
-		else
+		if(is_array($value) || $value instanceof Traversable) {
+					$this->_ordersBy->copyFrom($value);
+		} else
 		{
 			$value=trim(preg_replace('/\s+/',' ',(string)$value));
 			$orderBys=array();
@@ -262,22 +265,29 @@ 
 	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)
-			$params[] = "{$k} => ${v}";
-		if(count($params) > 0)
-			$str .= ', "'.implode(', ',$params).'"';
+		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}";
-		if(count($orders) > 0)
-			$str .= ', "'.implode(', ',$orders).'"';
-		if($this->_limit !==null)
-			$str .= ', '.$this->_limit;
-		if($this->_offset !== null)
-			$str .= ', '.$this->_offset;
+		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;
+		}
 		return $str;
 	}
 }

framework/Data/DataGateway/TTableGateway.php

Doc Comments +10 added lines, -3 removed lines

@@ -86,6 +86,7 @@ 
 	 * and a database connection.
 	 * @param string|TDbTableInfo table or view name or table information.
 	 * @param TDbConnection database connection.
+	 * @param TDbConnection $connection
 	 */
 	public function __construct($table,$connection)
 	{
@@ -100,6 +101,7 @@ 
 
 	/**
 	 * @param TDbTableInfo table or view information.
+	 * @param TDbTableInfo $tableInfo
 	 */
 	protected function setTableInfo($tableInfo)
 	{
@@ -110,6 +112,7 @@ 
 	/**
 	 * Sets up the command builder for the given table.
 	 * @param string table or view name.
+	 * @param string $tableName
 	 */
 	protected function setTableName($tableName)
 	{
@@ -185,7 +188,7 @@ 
 	 * Execute arbituary sql command with binding parameters.
 	 * @param string SQL query string.
 	 * @param array binding parameters, positional or named.
-	 * @return array query results.
+	 * @return TDbDataReader query results.
 	 */
 	public function findBySql($sql, $parameters=array())
 	{
@@ -198,6 +201,7 @@ 
 	 * Execute arbituary sql command with binding parameters.
 	 * @param string SQL query string.
 	 * @param array binding parameters, positional or named.
+	 * @param string $sql
 	 * @return TDbDataReader query results.
 	 */
 	public function findAllBySql($sql, $parameters=array())
@@ -279,6 +283,7 @@ 
 	 * $table->findAllByPk(array(array($key1, $key2), array($key3, $key4), ...));
 	 * </code>
 	 * @param mixed primary keys
+	 * @param integer[] $keys
 	 * @return TDbDataReader data reader.
 	 */
 	public function findAllByPks($keys)
@@ -350,6 +355,7 @@ 
 	 * Find the number of records.
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param string $criteria
 	 * @return int number of records.
 	 */
 	public function count($criteria=null,$parameters=array())
@@ -372,6 +378,7 @@ 
 	 * @param array new record data.
 	 * @param string update condition
 	 * @param array additional binding name-value pairs.
+	 * @param string $criteria
 	 * @return integer number of records updated.
 	 */
 	public function update($data, $criteria, $parameters=array())
@@ -385,7 +392,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)
@@ -394,7 +401,7 @@ 
 	}
 
 	/**
-	 * @return mixed last insert id, null if none is found.
+	 * @return string|null last insert id, null if none is found.
 	 */
 	public function getLastInsertId()
 	{

Spacing +45 added lines, -45 removed lines

@@ -87,12 +87,12 @@ 
 	 * @param string|TDbTableInfo table or view name or table information.
 	 * @param TDbConnection database connection.
 	 */
-	public function __construct($table,$connection)
+	public function __construct($table, $connection)
 	{
-		$this->_connection=$connection;
-		if(is_string($table))
+		$this->_connection = $connection;
+		if (is_string($table))
 			$this->setTableName($table);
-		else if($table instanceof TDbTableInfo)
+		else if ($table instanceof TDbTableInfo)
 			$this->setTableInfo($table);
 		else
 			throw new TDbException('dbtablegateway_invalid_table_info');
@@ -187,10 +187,10 @@ 
 	 * @param array binding parameters, positional or named.
 	 * @return array query results.
 	 */
-	public function findBySql($sql, $parameters=array())
+	public function findBySql($sql, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findBySql($criteria);
 	}
 
@@ -200,10 +200,10 @@ 
 	 * @param array binding parameters, positional or named.
 	 * @return TDbDataReader query results.
 	 */
-	public function findAllBySql($sql, $parameters=array())
+	public function findAllBySql($sql, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findAllBySql($criteria);
 	}
 
@@ -224,10 +224,10 @@ 
 	 * @param mixed parameter values.
 	 * @return array matching record object.
 	 */
-	public function find($criteria, $parameters=array())
+	public function find($criteria, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->find($criteria);
 	}
 
@@ -237,11 +237,11 @@ 
 	 * @param mixed parameter values.
 	 * @return TDbDataReader matching records.
 	 */
-	public function findAll($criteria=null, $parameters=array())
+	public function findAll($criteria = null, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if ($criteria !== null)
+			$criteria = $this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -259,7 +259,7 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
@@ -283,7 +283,7 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
@@ -299,10 +299,10 @@ 
 	 * @param array condition parameters.
 	 * @return integer number of records deleted.
 	 */
-	public function deleteAll($criteria, $parameters=array())
+	public function deleteAll($criteria, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->delete($criteria);
 	}
 
@@ -331,7 +331,7 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
@@ -341,7 +341,7 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->deleteByPk($keys);
 	}
@@ -352,11 +352,11 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria=null,$parameters=array())
+	public function count($criteria = null, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if ($criteria !== null)
+			$criteria = $this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -374,10 +374,10 @@ 
 	 * @param array additional binding name-value pairs.
 	 * @return integer number of records updated.
 	 */
-	public function update($data, $criteria, $parameters=array())
+	public function update($data, $criteria, $parameters = array())
 	{
-		$args = func_num_args() > 2 ? array_slice(func_get_args(),2) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
+		$criteria = $this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->update($data, $criteria);
 	}
 
@@ -412,12 +412,12 @@ 
 	 */
 	protected function getCriteria($criteria, $parameters, $args)
 	{
-		if(is_string($criteria))
+		if (is_string($criteria))
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
-			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
+			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
 		}
-		else if($criteria instanceof TSqlCriteria)
+		else if ($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			throw new TDbException('dbtablegateway_invalid_criteria');
@@ -452,22 +452,22 @@ 
 	 * @return mixed single record if method name starts with "findBy", 0 or more records
 	 * if method name starts with "findAllBy"
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
-		$delete =false;
-		if($findOne = substr(strtolower($method),0,6)==='findby')
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(substr(strtolower($method),0,9)==='findallby')
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete = substr(strtolower($method),0,8)==='deleteby')
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete = substr(strtolower($method),0,11)==='deleteallby')
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		$delete = false;
+		if ($findOne = substr(strtolower($method), 0, 6) === 'findby')
+			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
+		else if (substr(strtolower($method), 0, 9) === 'findallby')
+			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
+		else if ($delete = substr(strtolower($method), 0, 8) === 'deleteby')
+			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
+		else if ($delete = substr(strtolower($method), 0, 11) === 'deleteallby')
+			$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
 		else
 			return null;
 
 		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
-		if($delete)
+		if ($delete)
 			return $this->deleteAll($criteria);
 		else
 			return $findOne ? $this->find($criteria) : $this->findAll($criteria);

Braces +45 added lines, -36 removed lines

@@ -90,12 +90,13 @@ 
 	public function __construct($table,$connection)
 	{
 		$this->_connection=$connection;
-		if(is_string($table))
-			$this->setTableName($table);
-		else if($table instanceof TDbTableInfo)
-			$this->setTableInfo($table);
-		else
-			throw new TDbException('dbtablegateway_invalid_table_info');
+		if(is_string($table)) {
+					$this->setTableName($table);
+		} else if($table instanceof TDbTableInfo) {
+					$this->setTableInfo($table);
+		} else {
+					throw new TDbException('dbtablegateway_invalid_table_info');
+		}
 	}
 
 	/**
@@ -240,8 +241,9 @@ 
 	public function findAll($criteria=null, $parameters=array())
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+		if($criteria!==null) {
+					$criteria = $this->getCriteria($criteria,$parameters, $args);
+		}
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -259,8 +261,9 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->getCommand()->findByPk($keys);
 	}
 
@@ -283,8 +286,9 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->getCommand()->findAllByPk($keys);
 	}
 
@@ -331,8 +335,9 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->getCommand()->deleteByPk($keys);
 	}
 
@@ -341,8 +346,9 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->deleteByPk($keys);
 	}
 
@@ -355,8 +361,9 @@ 
 	public function count($criteria=null,$parameters=array())
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+		if($criteria!==null) {
+					$criteria = $this->getCriteria($criteria,$parameters, $args);
+		}
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -416,11 +423,11 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
+		} else if($criteria instanceof TSqlCriteria) {
+					return $criteria;
+		} else {
+					throw new TDbException('dbtablegateway_invalid_criteria');
 		}
-		else if($criteria instanceof TSqlCriteria)
-			return $criteria;
-		else
-			throw new TDbException('dbtablegateway_invalid_criteria');
 	}
 
 	/**
@@ -455,22 +462,24 @@ 
 	public function __call($method,$args)
 	{
 		$delete =false;
-		if($findOne = substr(strtolower($method),0,6)==='findby')
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(substr(strtolower($method),0,9)==='findallby')
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete = substr(strtolower($method),0,8)==='deleteby')
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete = substr(strtolower($method),0,11)==='deleteallby')
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
-		else
-			return null;
+		if($findOne = substr(strtolower($method),0,6)==='findby') {
+					$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
+		} else if(substr(strtolower($method),0,9)==='findallby') {
+					$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
+		} else if($delete = substr(strtolower($method),0,8)==='deleteby') {
+					$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
+		} else if($delete = substr(strtolower($method),0,11)==='deleteallby') {
+					$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		} else {
+					return null;
+		}
 
 		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
-		if($delete)
-			return $this->deleteAll($criteria);
-		else
-			return $findOne ? $this->find($criteria) : $this->findAll($criteria);
+		if($delete) {
+					return $this->deleteAll($criteria);
+		} else {
+					return $findOne ? $this->find($criteria) : $this->findAll($criteria);
+		}
 	}
 }
 

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * TTableGateway class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @version $Id$
- * @package System.Data.DataGateway
- */
+	 * TTableGateway class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @version $Id$
+	 * @package System.Data.DataGateway
+	 */
 
 /**
  * Loads the data gateway command builder and sql criteria.