pradosoft / prado

framework/Util/TEmailLogRoute.php

Braces +6 added lines, -4 removed lines

@@ -81,12 +81,14 @@
 	protected function processLogs($logs)
 	{
 		$message = '';
-		foreach($logs as $log)
-			$message .= $this->formatLogMessage($log[0], $log[1], $log[2], $log[3]);
+		foreach($logs as $log) {
+					$message .= $this->formatLogMessage($log[0], $log[1], $log[2], $log[3]);
+		}
 		$message = wordwrap($message, 70);
 		$returnPath = ini_get('sendmail_path') ? "Return-Path:{$this->_from}\r\n" : '';
-		foreach($this->_emails as $email)
-			mail($email, $this->getSubject(), $message, "From:{$this->_from}\r\n{$returnPath}");
+		foreach($this->_emails as $email) {
+					mail($email, $this->getSubject(), $message, "From:{$this->_from}\r\n{$returnPath}");
+		}
 
 	}
 

framework/Util/TParameterModule.php

Braces +9 added lines, -14 removed lines

@@ -78,14 +78,12 @@ 
 					$configFile->loadFromFile($this->_paramFile);
 					$cache->set($cacheKey, $configFile, 0, new TFileCacheDependency($this->_paramFile));
 				}
-			}
-			else
+			} else
 			{
 				if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 				{
 					$configFile = include $this->_paramFile;
-				}
-				else
+				} else
 				{
 					$configFile = new TXmlDocument;
 					$configFile->loadFromFile($this->_paramFile);
@@ -112,14 +110,12 @@ 
 				{
 					$properties = isset($parameter['properties'])?$parameter['properties']:[];
 					$parameters[$id] = [$parameter['class'],$properties];
-				}
-				else
+				} else
 				{
 					$parameters[$id] = $parameter;
 				}
 			}
-		}
-		elseif($config instanceof TXmlElement)
+		} elseif($config instanceof TXmlElement)
 		{
 			foreach($config->getElementsByTagName('parameter') as $node)
 			{
@@ -132,8 +128,7 @@ 
 						$parameters[$id] = $node;
 					else
 						$parameters[$id] = $value;
-				}
-				else
+				} else
 					$parameters[$id] = [$type,$properties->toArray()];
 			}
 		}
@@ -144,11 +139,11 @@ 
 			if(is_array($parameter))
 			{
 				$component = Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name => $value)
-					$component->setSubProperty($name, $value);
+				foreach($parameter[1] as $name => $value) {
+									$component->setSubProperty($name, $value);
+				}
 				$appParams->add($id, $component);
-			}
-			else
+			} else
 				$appParams->add($id, $parameter);
 		}
 	}

Spacing +3 added lines, -3 removed lines

@@ -110,8 +110,8 @@ 
 			{
 				if(is_array($parameter) && isset($parameter['class']))
 				{
-					$properties = isset($parameter['properties'])?$parameter['properties']:[];
-					$parameters[$id] = [$parameter['class'],$properties];
+					$properties = isset($parameter['properties']) ? $parameter['properties'] : [];
+					$parameters[$id] = [$parameter['class'], $properties];
 				}
 				else
 				{
@@ -134,7 +134,7 @@ 
 						$parameters[$id] = $value;
 				}
 				else
-					$parameters[$id] = [$type,$properties->toArray()];
+					$parameters[$id] = [$type, $properties->toArray()];
 			}
 		}
 

framework/Data/Common/TDbMetaData.php

Braces +3 added lines, -2 removed lines

@@ -146,8 +146,9 @@
 		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);
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 */
 	public function getTableInfo($tableName = null)
 	{
-		$key = $tableName === null?$this->getDbConnection()->getConnectionString():$tableName;
+		$key = $tableName === null ? $this->getDbConnection()->getConnectionString() : $tableName;
 		if(!isset($this->_tableInfoCache[$key]))
 		{
 			$class = $this->getTableInfoClass();

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Braces +5 added lines, -6 removed lines

@@ -244,11 +244,9 @@ 
 				$info['NumericPrecision'] = intval($matches[1]);
 				if(count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
-			}
-			else
+			} else
 				$info['ColumnSize'] = intval($matches[1]);
-		}
-		else
+		} else
 			$info['DbType'] = $col['type'];
 
 		$tableInfo->Columns[$columnId] = new TPgsqlTableColumn($info);
@@ -400,8 +398,9 @@ 
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = [];
-			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 ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
 		}
 	}

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 		if(count($parts = explode('.', str_replace('"', '', $table))) > 1)
 			return [$parts[0], $parts[1]];
 		else
-			return [$this->getDefaultSchema(),$parts[0]];
+			return [$this->getDefaultSchema(), $parts[0]];
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**

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

@@ -137,7 +137,7 @@ 
 				nspname = :schema))
 			AND a.attnum > 0 AND NOT a.attisdropped
 		ORDER BY a.attnum
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
@@ -197,7 +197,7 @@ 
 		SELECT count(c.relname) FROM pg_catalog.pg_class c
 		LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
 		WHERE (n.nspname=:schema) AND (c.relkind = 'v'::"char") AND c.relname = :table
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':schema', $schemaName);
@@ -332,7 +332,7 @@ 
 					WHERE nspname=:schema))
 	ORDER BY
 			1
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
@@ -372,7 +372,7 @@ 
 			)
 		)
 				AND attnum IN ({$index})
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
@@ -434,7 +434,7 @@ 
 		$sql = <<<EOD
 SELECT table_name, table_schema FROM information_schema.tables
 WHERE table_schema=:schema AND table_type='BASE TABLE'
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindParam(':schema', $schema);
 		$rows = $command->queryAll();

framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php

Braces +3 added lines, -2 removed lines

@@ -62,8 +62,9 @@
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		foreach($words as $word)
-			$conditions[] = $column . ' ILIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		foreach($words as $word) {
+					$conditions[] = $column . ' ILIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		}
 		return '(' . implode(' AND ', $conditions) . ')';
 	}
 

framework/Data/Common/TDbTableInfo.php

Braces +6 added lines, -4 removed lines

@@ -131,8 +131,9 @@ 
 		if($this->_names === null)
 		{
 			$this->_names = [];
-			foreach($this->getColumns() as $column)
-				$this->_names[] = $column->getColumnName();
+			foreach($this->getColumns() as $column) {
+							$this->_names[] = $column->getColumnName();
+			}
 		}
 		return $this->_names;
 	}
@@ -161,8 +162,9 @@ 
 		if($this->_lowercase === null)
 		{
 			$this->_lowercase = [];
-			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/TDbCommandBuilder.php

Braces +10 added lines, -8 removed lines

@@ -154,8 +154,9 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		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) . ')';
 	}
 
@@ -202,8 +203,9 @@ 
 		if(is_scalar($data)) {
 			$tmp = explode(',', $data);
 			$result = [];
-			foreach($tmp as $v)
-				$result[] = trim($v);
+			foreach($tmp as $v) {
+							$result[] = trim($v);
+			}
 			return $result;
 		}
 
@@ -466,10 +468,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)
 			{

Spacing +8 added lines, -8 removed lines

@@ -93,8 +93,8 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit = -1, $offset = -1)
 	{
-		$limit = $limit !== null ? (int)$limit : -1;
-		$offset = $offset !== null ? (int)$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;
@@ -248,7 +248,7 @@ 
 					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;
 				}
 
@@ -256,7 +256,7 @@ 
 					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;
 				}
 
@@ -286,11 +286,11 @@ 
 				}
 
 				if(!$v && !$k && is_int($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value);
 					continue;
 				}
 
-				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value)) . ' AS ' . $key;
+				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value)) . ' AS ' . $key;
 			}
 		}
 
@@ -350,7 +350,7 @@ 
 	public function createDeleteCommand($where, $parameters = [])
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where))
+		if(!empty($where))
 			$where = ' WHERE ' . $where;
 		$command = $this->createCommand("DELETE FROM {$table}" . $where);
 		$this->bindArrayValues($command, $parameters);
@@ -390,7 +390,7 @@ 
 		else
 			$fields = implode(', ', $this->getColumnBindings($data));
 
-		if (!empty($where))
+		if(!empty($where))
 			$where = ' WHERE ' . $where;
 		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));

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

@@ -311,7 +311,7 @@ 
 	{
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
-		$sql = "SELECT {$fields} FROM {$table}";
+		$sql = "select {$fields} FROM {$table}";
 		if(!empty($where))
 			$sql .= " WHERE {$where}";
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
@@ -392,7 +392,7 @@ 
 
 		if (!empty($where))
 			$where = ' WHERE ' . $where;
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
+		$command = $this->createCommand("update {$table} SET {$fields}" . $where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}

framework/Data/Common/Mysql/TMysqlMetaData.php

Braces +8 added lines, -8 removed lines

@@ -160,8 +160,7 @@ 
 					$info['NumericPrecision'] = intval($pscale[1]);
 					if(count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
-				}
-				else
+				} else
 					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
@@ -260,8 +259,7 @@ 
 		try
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type'] === 'VIEW';
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$table = $schemaName === null?$tableName:$schemaName . '.' . $tableName;
 			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
@@ -370,8 +368,9 @@ 
 			$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)
-				$keys[$v] = $fk_fields[$k];
+			foreach($fields as $k => $v) {
+							$keys[$v] = $fk_fields[$k];
+			}
 			$foreign[] = ['keys' => $keys, 'table' => trim($match[2])];
 		}
 		return $foreign;
@@ -403,8 +402,9 @@ 
 		if($schema === '')
 			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
 		$names = $this->getDbConnection()->createCommand('SHOW TABLES FROM ' . $this->quoteTableName($schema))->queryColumn();
-		foreach($names as &$name)
-			$name = $schema . '.' . $name;
+		foreach($names as &$name) {
+					$name = $schema . '.' . $name;
+		}
 		return $names;
 	}
 }

Spacing +3 added lines, -3 removed lines

@@ -261,9 +261,9 @@ 
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type'] === 'VIEW';
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
-			$table = $schemaName === null?$tableName:$schemaName . '.' . $tableName;
+			$table = $schemaName === null ? $tableName : $schemaName . '.' . $tableName;
 			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
 		}
 	}
@@ -291,7 +291,7 @@ 
 			$foreign = $this->getForeignConstraints($schemaName, $tableName);
 		else
 			$foreign = $this->findForeignConstraints($schemaName, $tableName);
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**

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

@@ -316,7 +316,7 @@
 				REFERENCED_TABLE_NAME IS NOT NULL
 				AND TABLE_NAME LIKE :table
 				$andSchema
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		if($schemaName !== null)

framework/Data/Common/Mysql/TMysqlTableColumn.php

Spacing +1 added lines, -1 removed lines

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