pradosoft / prado

framework/Data/Common/TDbMetaData.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 	{
 		$conn->setActive(true); //must be connected before retrieving driver name
 		$driver = $conn->getDriverName();
-		switch (strtolower($driver)) {
+		switch(strtolower($driver)) {
 			case 'pgsql':
 				return new TPgsqlMetaData($conn);
 			case 'mysqli':
@@ -94,7 +94,7 @@ 
 	public function getTableInfo($tableName = null)
 	{
 		$key = $tableName === null ? $this->getDbConnection()->getConnectionString() : $tableName;
-		if (!isset($this->_tableInfoCache[$key])) {
+		if(!isset($this->_tableInfoCache[$key])) {
 			$class = $this->getTableInfoClass();
 			$tableInfo = $tableName === null ? new $class : $this->createTableInfo($tableName);
 			$this->_tableInfoCache[$key] = $tableInfo;
@@ -141,11 +141,11 @@ 
 		$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) {
+		foreach($names as &$n) {
 			$n = $lft . $n . $rgt;
 		}
 		return implode('.', $names);

framework/Data/Common/Mssql/TMssqlMetaData.php

Spacing +29 added lines, -29 removed lines

@@ -83,30 +83,30 @@ 
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
 EOD;
-		if ($schemaName !== null) {
+		if($schemaName !== null) {
 			$sql .= ' AND t.table_schema = :schema';
 		}
-		if ($catalogName !== null) {
+		if($catalogName !== null) {
 			$sql .= ' AND t.table_catalog = :catalog';
 		}
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if ($schemaName !== null) {
+		if($schemaName !== null) {
 			$command->bindValue(':schema', $schemaName);
 		}
-		if ($catalogName !== null) {
+		if($catalogName !== null) {
 			$command->bindValue(':catalog', $catalogName);
 		}
 
 		$tableInfo = null;
-		foreach ($command->query() as $col) {
-			if ($tableInfo === null) {
+		foreach($command->query() as $col) {
+			if($tableInfo === null) {
 				$tableInfo = $this->createNewTableInfo($col);
 			}
 			$this->processColumn($tableInfo, $col);
 		}
-		if ($tableInfo === null) {
+		if($tableInfo === null) {
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		}
 		return $tableInfo;
@@ -120,14 +120,14 @@ 
 	{
 		//remove possible delimiters
 		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
-		if (count($result) === 1) {
-			return [null,null,$result[0]];
+		if(count($result) === 1) {
+			return [null, null, $result[0]];
 		}
-		if (count($result) === 2) {
-			return [null,$result[0],$result[1]];
+		if(count($result) === 2) {
+			return [null, $result[0], $result[1]];
 		}
-		if (count($result) > 2) {
-			return [$result[0],$result[1],$result[2]];
+		if(count($result) > 2) {
+			return [$result[0], $result[1], $result[2]];
 		}
 	}
 
@@ -142,31 +142,31 @@ 
 		$info['ColumnName'] = "[$columnId]"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION']) - 1; //zero-based index
-		if ($col['IS_NULLABLE'] !== 'NO') {
+		if($col['IS_NULLABLE'] !== 'NO') {
 			$info['AllowNull'] = true;
 		}
-		if ($col['COLUMN_DEFAULT'] !== null) {
+		if($col['COLUMN_DEFAULT'] !== null) {
 			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
 		}
 
-		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['IsIdentity'] === '1') {
+		if($col['IsIdentity'] === '1') {
 			$info['AutoIncrement'] = true;
 		}
 		$info['DbType'] = $col['DATA_TYPE'];
-		if ($col['CHARACTER_MAXIMUM_LENGTH'] !== null) {
+		if($col['CHARACTER_MAXIMUM_LENGTH'] !== null) {
 			$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
 		}
-		if ($col['NUMERIC_PRECISION'] !== null) {
+		if($col['NUMERIC_PRECISION'] !== null) {
 			$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
 		}
-		if ($col['NUMERIC_SCALE'] !== null) {
+		if($col['NUMERIC_SCALE'] !== null) {
 			$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
 		}
 		$tableInfo->Columns[$columnId] = new TMssqlTableColumn($info);
@@ -182,7 +182,7 @@ 
 		$info['CatalogName'] = $col['TABLE_CATALOG'];
 		$info['SchemaName'] = $col['TABLE_SCHEMA'];
 		$info['TableName'] = $col['TABLE_NAME'];
-		if ($col['TABLE_TYPE'] === 'VIEW') {
+		if($col['TABLE_TYPE'] === 'VIEW') {
 			$info['IsView'] = true;
 		}
 		list($primary, $foreign) = $this->getConstraintKeys($col);
@@ -212,11 +212,11 @@ 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = [];
-		foreach ($command->query()->readAll() as $field) {
+		foreach($command->query()->readAll() as $field) {
 			$primary[] = $field['field_name'];
 		}
 		$foreign = $this->getForeignConstraints($col);
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$fkeys = [];
 		$catalogSchema = "[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
-		foreach ($command->query() as $info) {
+		foreach($command->query() as $info) {
 			$fkeys[$info['FK_CONSTRAINT_NAME']]['keys'][$info['FK_COLUMN_NAME']] = $info['UQ_COLUMN_NAME'];
 			$fkeys[$info['FK_CONSTRAINT_NAME']]['table'] = $info['UQ_TABLE_NAME'];
 		}
@@ -271,8 +271,8 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach ($tableInfo->getForeignKeys() as $fk) {
-			if (in_array($columnId, array_keys($fk['keys']))) {
+		foreach($tableInfo->getForeignKeys() as $fk) {
+			if(in_array($columnId, array_keys($fk['keys']))) {
 				return true;
 			}
 		}
@@ -296,8 +296,8 @@ 
 		$command->bindParam(":schema", $schema);
 		$rows = $command->queryAll();
 		$names = [];
-		foreach ($rows as $row) {
-			if ($schema == self::DEFAULT_SCHEMA) {
+		foreach($rows as $row) {
+			if($schema == self::DEFAULT_SCHEMA) {
 				$names[] = $row['TABLE_NAME'];
 			} else {
 				$names[] = $schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -82,7 +82,7 @@ 
 												INFORMATION_SCHEMA.COLUMNS c
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
-EOD;
+eod;
 		if ($schemaName !== null) {
 			$sql .= ' AND t.table_schema = :schema';
 		}
@@ -208,7 +208,7 @@ 
 		AND
 			c.constraint_type ='PRIMARY KEY'
 				AND k.table_name = :table
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = [];
@@ -252,7 +252,7 @@ 
 		RC.UNIQUE_CONSTRAINT_NAME
 			AND KCU2.ORDINAL_POSITION = KCU1.ORDINAL_POSITION
 		WHERE KCU1.TABLE_NAME = :table
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$fkeys = [];
@@ -291,7 +291,7 @@ 
 		$sql = <<<EOD
 SELECT TABLE_NAME, TABLE_SCHEMA FROM [INFORMATION_SCHEMA].[TABLES]
 WHERE TABLE_SCHEMA=:schema AND $condition
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindParam(":schema", $schema);
 		$rows = $command->queryAll();

framework/Data/Common/Mssql/TMssqlCommandBuilder.php

Spacing +12 added lines, -12 removed lines

@@ -30,8 +30,8 @@ 
 	 */
 	public function getLastInsertID()
 	{
-		foreach ($this->getTableInfo()->getColumns() as $column) {
-			if ($column->hasSequence()) {
+		foreach($this->getTableInfo()->getColumns() as $column) {
+			if($column->hasSequence()) {
 				$command = $this->getDbConnection()->createCommand('SELECT @@Identity');
 				return intval($command->queryScalar());
 			}
@@ -82,9 +82,9 @@ 
 	{
 		$limit = $limit !== null ? intval($limit) : -1;
 		$offset = $offset !== null ? intval($offset) : -1;
-		if ($limit > 0 && $offset <= 0) { //just limit
+		if($limit > 0 && $offset <= 0) { //just limit
 			$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
-		} elseif ($limit > 0 && $offset > 0) {
+		} elseif($limit > 0 && $offset > 0) {
 			$sql = $this->rewriteLimitOffsetSql($sql, $limit, $offset);
 		}
 		return $sql;
@@ -118,18 +118,18 @@ 
 	 */
 	protected function findOrdering($sql)
 	{
-		if (!preg_match('/ORDER BY/i', $sql)) {
+		if(!preg_match('/ORDER BY/i', $sql)) {
 			return [];
 		}
 		$matches = [];
 		$ordering = [];
 		preg_match_all('/(ORDER BY)[\s"\[](.*)(ASC|DESC)?(?:[\s"\[]|$|COMPUTE|FOR)/i', $sql, $matches);
-		if (count($matches) > 1 && count($matches[2]) > 0) {
+		if(count($matches) > 1 && count($matches[2]) > 0) {
 			$parts = explode(',', $matches[2][0]);
-			foreach ($parts as $part) {
+			foreach($parts as $part) {
 				$subs = [];
-				if (preg_match_all('/(.*)[\s"\]](ASC|DESC)$/i', trim($part), $subs)) {
-					if (count($subs) > 1 && count($subs[2]) > 0) {
+				if(preg_match_all('/(.*)[\s"\]](ASC|DESC)$/i', trim($part), $subs)) {
+					if(count($subs) > 1 && count($subs[2]) > 0) {
 						$ordering[$subs[1][0]] = $subs[2][0];
 					}
 					//else what?
@@ -147,9 +147,9 @@ 
 	 */
 	protected function joinOrdering($orders)
 	{
-		if (count($orders) > 0) {
+		if(count($orders) > 0) {
 			$str = [];
-			foreach ($orders as $column => $direction) {
+			foreach($orders as $column => $direction) {
 				$str[] = $column . ' ' . $direction;
 			}
 			return 'ORDER BY ' . implode(', ', $str);
@@ -162,7 +162,7 @@ 
 	 */
 	protected function reverseDirection($orders)
 	{
-		foreach ($orders as $column => $direction) {
+		foreach($orders as $column => $direction) {
 			$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
 		}
 		return $orders;

framework/Data/TDataSourceConfig.php

Spacing +10 added lines, -10 removed lines

@@ -60,17 +60,17 @@ 
 	 */
 	public function init($xml)
 	{
-		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
-			if (isset($xml['database']) && is_array($xml['database'])) {
+		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+			if(isset($xml['database']) && is_array($xml['database'])) {
 				$db = $this->getDbConnection();
-				foreach ($xml['database'] as $name => $value) {
+				foreach($xml['database'] as $name => $value) {
 					$db->setSubProperty($name, $value);
 				}
 			}
 		} else {
-			if ($prop = $xml->getElementByTagName('database')) {
+			if($prop = $xml->getElementByTagName('database')) {
 				$db = $this->getDbConnection();
-				foreach ($prop->getAttributes() as $name => $value) {
+				foreach($prop->getAttributes() as $name => $value) {
 					$db->setSubproperty($name, $value);
 				}
 			}
@@ -104,8 +104,8 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if ($this->_conn === null) {
-			if ($this->_connID !== '') {
+		if($this->_conn === null) {
+			if($this->_connID !== '') {
 				$this->_conn = $this->findConnectionByID($this->getConnectionID());
 			} else {
 				$this->_conn = Prado::createComponent($this->getConnectionClass());
@@ -142,7 +142,7 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if ($this->_conn !== null) {
+		if($this->_conn !== null) {
 			throw new TConfigurationException('datasource_dbconnection_exists', $value);
 		}
 		$this->_connClass = $value;
@@ -157,9 +157,9 @@ 
 	protected function findConnectionByID($id)
 	{
 		$conn = $this->getApplication()->getModule($id);
-		if ($conn instanceof TDbConnection) {
+		if($conn instanceof TDbConnection) {
 			return $conn;
-		} elseif ($conn instanceof TDataSourceConfig) {
+		} elseif($conn instanceof TDataSourceConfig) {
 			return $conn->getDbConnection();
 		} else {
 			throw new TConfigurationException('datasource_dbconnection_invalid', $id);

framework/Data/TDbCommand.php

Spacing +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
 	 */
 	public function prepare()
 	{
-		if ($this->_statement == null) {
+		if($this->_statement == null) {
 			try {
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
 			} catch (Exception $e) {
@@ -145,9 +145,9 @@ 
 	public function bindParameter($name, &$value, $dataType = null, $length = null)
 	{
 		$this->prepare();
-		if ($dataType === null) {
+		if($dataType === null) {
 			$this->_statement->bindParam($name, $value);
-		} elseif ($length === null) {
+		} elseif($length === null) {
 			$this->_statement->bindParam($name, $value, $dataType);
 		} else {
 			$this->_statement->bindParam($name, $value, $dataType, $length);
@@ -167,7 +167,7 @@ 
 	public function bindValue($name, $value, $dataType = null)
 	{
 		$this->prepare();
-		if ($dataType === null) {
+		if($dataType === null) {
 			$this->_statement->bindValue($name, $value);
 		} else {
 			$this->_statement->bindValue($name, $value, $dataType);
@@ -186,7 +186,7 @@ 
 		try {
 			// Do not trace because it will remain even in Performance mode
 			// Prado::trace('Execute Command: '.$this->getDebugStatementText(), 'Prado\Data');
-			if ($this->_statement instanceof PDOStatement) {
+			if($this->_statement instanceof PDOStatement) {
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
 			} else {
@@ -218,7 +218,7 @@ 
 	{
 		try {
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'Prado\Data');
-			if ($this->_statement instanceof PDOStatement) {
+			if($this->_statement instanceof PDOStatement) {
 				$this->_statement->execute();
 			} else {
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
@@ -241,7 +241,7 @@ 
 	{
 		try {
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'Prado\Data');
-			if ($this->_statement instanceof PDOStatement) {
+			if($this->_statement instanceof PDOStatement) {
 				$this->_statement->execute();
 			} else {
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
@@ -265,14 +265,14 @@ 
 	{
 		try {
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'Prado\Data');
-			if ($this->_statement instanceof PDOStatement) {
+			if($this->_statement instanceof PDOStatement) {
 				$this->_statement->execute();
 			} else {
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
 			}
 			$result = $this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if (is_resource($result) && get_resource_type($result) === 'stream') {
+			if(is_resource($result) && get_resource_type($result) === 'stream') {
 				return stream_get_contents($result);
 			} else {
 				return $result;
@@ -294,7 +294,7 @@ 
 	{
 		$rows = $this->query()->readAll();
 		$column = [];
-		foreach ($rows as $row) {
+		foreach($rows as $row) {
 			$column[] = current($row);
 		}
 		return $column;

framework/Data/TDbDataReader.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function bindColumn($column, &$value, $dataType = null)
 	{
-		if ($dataType === null) {
+		if($dataType === null) {
 			$this->_statement->bindColumn($column, $value);
 		} else {
 			$this->_statement->bindColumn($column, $value, $dataType);
@@ -80,7 +80,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params = func_get_args();
-		call_user_func_array([$this->_statement,'setFetchMode'], $params);
+		call_user_func_array([$this->_statement, 'setFetchMode'], $params);
 	}
 
 	/**
@@ -177,7 +177,7 @@ 
 	 */
 	public function rewind()
 	{
-		if ($this->_index < 0) {
+		if($this->_index < 0) {
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;
 		} else {

framework/Data/DataGateway/TSqlCriteria.php

Spacing +26 added lines, -26 removed lines

@@ -53,12 +53,12 @@ 
 	 */
 	public function __construct($condition = null, $parameters = [])
 	{
-		if (!is_array($parameters) && func_num_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);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy = new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -132,7 +132,7 @@ 
 	 */
 	public function setCondition($value)
 	{
-		if (empty($value)) {
+		if(empty($value)) {
 			// reset the condition
 			$this->_condition = null;
 			return;
@@ -144,32 +144,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]);
-			} elseif (strlen($matches[2]) > 0) {
+			} elseif(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);
@@ -188,7 +188,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);
@@ -199,7 +199,7 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach ($this->getParameters() as $k => $v) {
+		foreach($this->getParameters() as $k => $v) {
 			return is_string($k);
 		}
 	}
@@ -217,12 +217,12 @@ 
 	 */
 	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));
+			$value = trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys = [];
-			foreach (explode(',', $value) as $orderBy) {
+			foreach(explode(',', $value) as $orderBy) {
 				$vs = explode(' ', trim($orderBy));
 				$orderBys[$vs[0]] = isset($vs[1]) ? $vs[1] : 'asc';
 			}
@@ -268,27 +268,27 @@ 
 	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 = [];
-		foreach ($this->getParameters() as $k => $v) {
+		foreach($this->getParameters() as $k => $v) {
 			$params[] = "{$k} => ${v}";
 		}
-		if (count($params) > 0) {
+		if(count($params) > 0) {
 			$str .= ', "' . implode(', ', $params) . '"';
 		}
 		$orders = [];
-		foreach ($this->getOrdersBy() as $k => $v) {
+		foreach($this->getOrdersBy() as $k => $v) {
 			$orders[] = "{$k} => ${v}";
 		}
-		if (count($orders) > 0) {
+		if(count($orders) > 0) {
 			$str .= ', "' . implode(', ', $orders) . '"';
 		}
-		if ($this->_limit !== null) {
+		if($this->_limit !== null) {
 			$str .= ', ' . $this->_limit;
 		}
-		if ($this->_offset !== null) {
+		if($this->_offset !== null) {
 			$str .= ', ' . $this->_offset;
 		}
 		return $str;

framework/Data/DataGateway/TDataGatewayCommand.php

Spacing +27 added lines, -27 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function updateByPk($data, $keys)
 	{
-		list($where, $parameters) = $this->getPrimaryKeyCondition((array)$keys);
+		list($where, $parameters) = $this->getPrimaryKeyCondition((array) $keys);
 		return $this->update($data, new TSqlCriteria($where, $parameters));
 	}
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	protected function getFindCommand($criteria)
 	{
-		if ($criteria === null) {
+		if($criteria === null) {
 			return $this->getBuilder()->createFindCommand();
 		}
 		$where = $criteria->getCondition();
@@ -152,10 +152,10 @@ 
 	 */
 	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));
 		return $this->onExecuteCommand($command, $command->queryRow());
@@ -166,7 +166,7 @@ 
 	 */
 	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());
@@ -174,7 +174,7 @@ 
 	public function findAllByIndex($criteria, $fields, $values)
 	{
 		$index = $this->getIndexKeyCondition($this->getTableInfo(), $fields, $values);
-		if (strlen($where = $criteria->getCondition()) > 0) {
+		if(strlen($where = $criteria->getCondition()) > 0) {
 			$criteria->setCondition("({$index}) AND ({$where})");
 		} else {
 			$criteria->setCondition($index);
@@ -190,10 +190,10 @@ 
 	 */
 	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));
 		$command->prepare();
@@ -202,12 +202,12 @@ 
 
 	public function getIndexKeyCondition($table, $fields, $values)
 	{
-		if (!count($values)) {
+		if(!count($values)) {
 			return 'FALSE';
 		}
 		$columns = [];
 		$tableName = $table->getTableFullName();
-		foreach ($fields as $field) {
+		foreach($fields as $field) {
 			$columns[] = $tableName . '.' . $table->getColumn($field)->getColumnName();
 		}
 		return '(' . implode(', ', $columns) . ') IN ' . $this->quoteTuple($values);
@@ -222,22 +222,22 @@ 
 	{
 		$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 = [$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()
@@ -255,7 +255,7 @@ 
 	{
 		$conn = $this->getDbConnection();
 		$data = [];
-		foreach ($array as $k => $v) {
+		foreach($array as $k => $v) {
 			$data[] = is_array($v) ? $this->quoteTuple($v) : $conn->quoteString($v);
 		}
 		return '(' . implode(', ', $data) . ')';
@@ -269,7 +269,7 @@ 
 	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()
@@ -278,7 +278,7 @@ 
 		$criteria = [];
 		$bindings = [];
 		$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++];
@@ -319,10 +319,10 @@ 
 		$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);
@@ -337,8 +337,8 @@ 
 	 */
 	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();
@@ -347,7 +347,7 @@ 
 		$offset = $criteria->getOffset();
 		$command = $this->getBuilder()->createCountCommand($where, $parameters, $ordering, $limit, $offset);
 		$this->onCreateCommand($command, $criteria);
-		return $this->onExecuteCommand($command, (int)$command->queryScalar());
+		return $this->onExecuteCommand($command, (int) $command->queryScalar());
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 		$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;
 		}
@@ -389,7 +389,7 @@ 
 	{
 		$fields = $this->extractMatchingConditions($method, $condition);
 		$args = count($args) === 1 && is_array($args[0]) ? $args[0] : $args;
-		if (count($fields) > count($args)) {
+		if(count($fields) > count($args)) {
 			throw new TDbException(
 				'dbtablegateway_mismatch_args_exception',
 				$method,
@@ -413,7 +413,7 @@ 
 		$columns = $table->getLowerCaseColumnNames();
 		$regexp = '/(' . implode('|', array_keys($columns)) . ')(and|_and_|or|_or_)?/i';
 		$matches = [];
-		if (!preg_match_all($regexp, strtolower($condition), $matches, PREG_SET_ORDER)) {
+		if(!preg_match_all($regexp, strtolower($condition), $matches, PREG_SET_ORDER)) {
 			throw new TDbException(
 				'dbtablegateway_mismatch_column_name',
 				$method,
@@ -423,11 +423,11 @@ 
 		}
 
 		$fields = [];
-		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;

framework/Data/DataGateway/TTableGateway.php

Spacing +15 added lines, -15 removed lines

@@ -92,9 +92,9 @@ 
 	public function __construct($table, $connection)
 	{
 		$this->_connection = $connection;
-		if (is_string($table)) {
+		if(is_string($table)) {
 			$this->setTableName($table);
-		} elseif ($table instanceof TDbTableInfo) {
+		} elseif($table instanceof TDbTableInfo) {
 			$this->setTableInfo($table);
 		} else {
 			throw new TDbException('dbtablegateway_invalid_table_info');
@@ -242,7 +242,7 @@ 
 	public function findAll($criteria = null, $parameters = [])
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if ($criteria !== null) {
+		if($criteria !== null) {
 			$criteria = $this->getCriteria($criteria, $parameters, $args);
 		}
 		return $this->getCommand()->findAll($criteria);
@@ -262,7 +262,7 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if (func_num_args() > 1) {
+		if(func_num_args() > 1) {
 			$keys = func_get_args();
 		}
 		return $this->getCommand()->findByPk($keys);
@@ -287,7 +287,7 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if (func_num_args() > 1) {
+		if(func_num_args() > 1) {
 			$keys = func_get_args();
 		}
 		return $this->getCommand()->findAllByPk($keys);
@@ -336,7 +336,7 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if (func_num_args() > 1) {
+		if(func_num_args() > 1) {
 			$keys = func_get_args();
 		}
 		return $this->getCommand()->deleteByPk($keys);
@@ -347,7 +347,7 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if (func_num_args() > 1) {
+		if(func_num_args() > 1) {
 			$keys = func_get_args();
 		}
 		return $this->deleteByPk($keys);
@@ -362,7 +362,7 @@ 
 	public function count($criteria = null, $parameters = [])
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if ($criteria !== null) {
+		if($criteria !== null) {
 			$criteria = $this->getCriteria($criteria, $parameters, $args);
 		}
 		return $this->getCommand()->count($criteria);
@@ -420,10 +420,10 @@ 
 	 */
 	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);
-		} elseif ($criteria instanceof TSqlCriteria) {
+		} elseif($criteria instanceof TSqlCriteria) {
 			return $criteria;
 		} else {
 			throw new TDbException('dbtablegateway_invalid_criteria');
@@ -462,20 +462,20 @@ 
 	public function __call($method, $args)
 	{
 		$delete = false;
-		if ($findOne = substr(strtolower($method), 0, 6) === 'findby') {
+		if($findOne = substr(strtolower($method), 0, 6) === 'findby') {
 			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
-		} elseif (substr(strtolower($method), 0, 9) === 'findallby') {
+		} elseif(substr(strtolower($method), 0, 9) === 'findallby') {
 			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
-		} elseif ($delete = substr(strtolower($method), 0, 8) === 'deleteby') {
+		} elseif($delete = substr(strtolower($method), 0, 8) === 'deleteby') {
 			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
-		} elseif ($delete = substr(strtolower($method), 0, 11) === 'deleteallby') {
+		} elseif($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);