pradosoft / prado

framework/Data/Common/Mysql/TMysqlMetaData.php

Spacing +34 added lines, -34 removed lines

@@ -82,7 +82,7 @@ 
 		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$find = $schemaName === null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$colCase = $this->getDbConnection()->getColumnCase();
-		if ($colCase != TDbColumnCaseMode::Preserved) {
+		if($colCase != TDbColumnCaseMode::Preserved) {
 			$this->getDbConnection()->setColumnCase('Preserved');
 		}
 		$this->getDbConnection()->setActive(true);
@@ -90,14 +90,14 @@ 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$tableInfo = $this->createNewTableInfo($table);
 		$index = 0;
-		foreach ($command->query() as $col) {
+		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);
 		}
-		if ($colCase != TDbColumnCaseMode::Preserved) {
+		if($colCase != TDbColumnCaseMode::Preserved) {
 			$this->getDbConnection()->setColumnCase($colCase);
 		}
 		return $tableInfo;
@@ -108,7 +108,7 @@ 
 	 */
 	protected function getServerVersion()
 	{
-		if (!$this->_serverVersion) {
+		if(!$this->_serverVersion) {
 			$version = $this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
 			$digits = [];
 			preg_match('/(\d+)\.(\d+)\.(\d+)/', $version, $digits);
@@ -128,40 +128,40 @@ 
 		$info['ColumnName'] = "`$columnId`"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if ($col['Null'] === 'YES') {
+		if($col['Null'] === 'YES') {
 			$info['AllowNull'] = true;
 		}
-		if (is_int(strpos(strtolower($col['Extra']), 'auto_increment'))) {
+		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment'))) {
 			$info['AutoIncrement'] = true;
 		}
-		if ($col['Default'] !== "") {
+		if($col['Default'] !== "") {
 			$info['DefaultValue'] = $col['Default'];
 		}
 
-		if ($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys())) {
+		if($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys())) {
 			$info['IsPrimaryKey'] = true;
 		}
-		if ($this->isForeignKeyColumn($columnId, $tableInfo)) {
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
 			$info['IsForeignKey'] = true;
 		}
 
 		$info['DbType'] = $col['Type'];
 		$match = [];
 		//find SET/ENUM values, column size, precision, and scale
-		if (preg_match('/\((.*)\)/', $col['Type'], $match)) {
+		if(preg_match('/\((.*)\)/', $col['Type'], $match)) {
 			$info['DbType'] = preg_replace('/\(.*\)/', '', $col['Type']);
 
 			//find SET/ENUM values
-			if ($this->isEnumSetType($info['DbType'])) {
+			if($this->isEnumSetType($info['DbType'])) {
 				$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
 			}
 
 			//find column size, precision and scale
 			$pscale = [];
-			if (preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale)) {
-				if ($this->isPrecisionType($info['DbType'])) {
+			if(preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale)) {
+				if($this->isPrecisionType($info['DbType'])) {
 					$info['NumericPrecision'] = intval($pscale[1]);
-					if (count($pscale) > 2) {
+					if(count($pscale) > 2) {
 						$info['NumericScale'] = intval($pscale[2]);
 					}
 				} else {
@@ -202,8 +202,8 @@ 
 	{
 		//remove the back ticks and separate out the "database.table"
 		$result = explode('.', str_replace('`', '', $table));
-		foreach ($result as $name) {
-			if (!$this->isValidIdentifier($name)) {
+		foreach($result as $name) {
+			if(!$this->isValidIdentifier($name)) {
 				$ref = 'http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
 				throw new TDbException('dbcommon_invalid_identifier_name', $table, $ref);
 			}
@@ -231,7 +231,7 @@ 
 		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$info['SchemaName'] = $schemaName;
 		$info['TableName'] = $tableName;
-		if ($this->getIsView($schemaName, $tableName)) {
+		if($this->getIsView($schemaName, $tableName)) {
 			$info['IsView'] = true;
 		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
@@ -251,10 +251,10 @@ 
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
-		if ($this->getServerVersion() < 5.01) {
+		if($this->getServerVersion() < 5.01) {
 			return false;
 		}
-		if ($schemaName !== null) {
+		if($schemaName !== null) {
 			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
 		} else {
 			$sql = "SHOW FULL TABLES LIKE :table";
@@ -282,19 +282,19 @@ 
 		$sql = "SHOW INDEX FROM {$table}";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$primary = [];
-		foreach ($command->query() as $row) {
-			if ($row['Key_name'] === 'PRIMARY') {
+		foreach($command->query() as $row) {
+			if($row['Key_name'] === 'PRIMARY') {
 				$primary[] = $row['Column_name'];
 			}
 		}
 		// MySQL version was increased to >=5.1.21 instead of 5.x
 		// due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588)
-		if ($this->getServerVersion() >= 5.121) {
+		if($this->getServerVersion() >= 5.121) {
 			$foreign = $this->getForeignConstraints($schemaName, $tableName);
 		} else {
 			$foreign = $this->findForeignConstraints($schemaName, $tableName);
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -322,11 +322,11 @@ 
 EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if ($schemaName !== null) {
+		if($schemaName !== null) {
 			$command->bindValue(':schema', $schemaName);
 		}
 		$fkeys = [];
-		foreach ($command->query() as $col) {
+		foreach($command->query() as $col) {
 			$fkeys[$col['con']]['keys'][$col['col']] = $col['fkcol'];
 			$fkeys[$col['con']]['table'] = $col['fktable'];
 		}
@@ -341,13 +341,13 @@ 
 	 */
 	protected function getShowCreateTable($schemaName, $tableName)
 	{
-		if (version_compare(PHP_VERSION, '5.1.3', '<')) {
+		if(version_compare(PHP_VERSION, '5.1.3', '<')) {
 			throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
 		}
 
 		//See http://netevil.org/node.php?nid=795&SC=1
 		$this->getDbConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
-		if ($schemaName !== null) {
+		if($schemaName !== null) {
 			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
 		} else {
 			$sql = "SHOW CREATE TABLE `{$tableName}`";
@@ -370,11 +370,11 @@ 
 		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
 		preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER);
 		$foreign = [];
-		foreach ($matches as $match) {
+		foreach($matches as $match) {
 			$fields = array_map('trim', explode(',', str_replace('`', '', $match[1])));
 			$fk_fields = array_map('trim', explode(',', str_replace('`', '', $match[3])));
 			$keys = [];
-			foreach ($fields as $k => $v) {
+			foreach($fields as $k => $v) {
 				$keys[$v] = $fk_fields[$k];
 			}
 			$foreign[] = ['keys' => $keys, 'table' => trim($match[2])];
@@ -389,8 +389,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;
 			}
 		}
@@ -405,11 +405,11 @@ 
 	 */
 	public function findTableNames($schema = '')
 	{
-		if ($schema === '') {
+		if($schema === '') {
 			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
 		}
 		$names = $this->getDbConnection()->createCommand('SHOW TABLES FROM ' . $this->quoteTableName($schema))->queryColumn();
-		foreach ($names as &$name) {
+		foreach($names as &$name) {
 			$name = $schema . '.' . $name;
 		}
 		return $names;

framework/Data/Common/Mysql/TMysqlTableColumn.php

Spacing +4 added lines, -4 removed lines

@@ -38,12 +38,12 @@
 	 */
 	public function getPHPType()
 	{
-		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($this->getDbType())));
-		if ($dbtype === 'tinyint' && $this->getColumnSize() === 1) {
+		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['', '', ], strtolower($this->getDbType())));
+		if($dbtype === 'tinyint' && $this->getColumnSize() === 1) {
 			return 'boolean';
 		}
-		foreach (self::$types as $type => $dbtypes) {
-			if (in_array($dbtype, $dbtypes)) {
+		foreach(self::$types as $type => $dbtypes) {
+			if(in_array($dbtype, $dbtypes)) {
 				return $type;
 			}
 		}

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'];

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;