pradosoft / prado

framework/TPropertyValue.php

Spacing +16 added lines, -16 removed lines

@@ -65,7 +65,7 @@ 
 		if (is_string($value))
 			return strcasecmp($value, 'true') == 0 || $value != 0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -80,9 +80,9 @@ 
 		if (TJavaScript::isJsLiteral($value))
 			return $value;
 		if (is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -116,20 +116,20 @@ 
 	 */
 	public static function ensureArray($value)
 	{
-		if(is_string($value))
+		if (is_string($value))
 		{
 			$value = trim($value);
 			$len = strlen($value);
 			if ($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
 			{
-				eval('$array=array' . $value . ';');
+				eval('$array=array'.$value.';');
 				return $array;
 			}
 			else
-				return $len > 0?[$value]:[];
+				return $len > 0 ? [$value] : [];
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -161,23 +161,23 @@ 
 	public static function ensureEnum($value, $enums)
 	{
 		static $types = [];
-		if(func_num_args() === 2 && is_string($enums))
+		if (func_num_args() === 2 && is_string($enums))
 		{
-			if(!isset($types[$enums]))
+			if (!isset($types[$enums]))
 				$types[$enums] = new \ReflectionClass($enums);
-			if($types[$enums]->hasConstant($value))
+			if ($types[$enums]->hasConstant($value))
 				return $value;
 			else
 				throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid', $value,
 						implode(' | ', $types[$enums]->getConstants()));
 		}
-		elseif(!is_array($enums))
+		elseif (!is_array($enums))
 		{
 			$enums = func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value, $enums, true))
+		if (in_array($value, $enums, true))
 			return $value;
 		else
 			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
@@ -190,6 +190,6 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ?null:$value;
 	}
 }
\ No newline at end of file

Braces +31 added lines, -26 removed lines

@@ -62,10 +62,11 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value, 'true') == 0 || $value != 0;
-		else
-			return (boolean)$value;
+		if (is_string($value)) {
+					return strcasecmp($value, 'true') == 0 || $value != 0;
+		} else {
+					return (boolean)$value;
+		}
 	}
 
 	/**
@@ -77,12 +78,14 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
-			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
-		else
-			return (string)$value;
+		if (TJavaScript::isJsLiteral($value)) {
+					return $value;
+		}
+		if (is_bool($value)) {
+					return $value?'true':'false';
+		} else {
+					return (string)$value;
+		}
 	}
 
 	/**
@@ -124,12 +127,12 @@ 
 			{
 				eval('$array=array' . $value . ';');
 				return $array;
+			} else {
+							return $len > 0?[$value]:[];
 			}
-			else
-				return $len > 0?[$value]:[];
+		} else {
+					return (array)$value;
 		}
-		else
-			return (array)$value;
 	}
 
 	/**
@@ -163,24 +166,26 @@ 
 		static $types = [];
 		if(func_num_args() === 2 && is_string($enums))
 		{
-			if(!isset($types[$enums]))
-				$types[$enums] = new \ReflectionClass($enums);
-			if($types[$enums]->hasConstant($value))
-				return $value;
-			else
-				throw new TInvalidDataValueException(
+			if(!isset($types[$enums])) {
+							$types[$enums] = new \ReflectionClass($enums);
+			}
+			if($types[$enums]->hasConstant($value)) {
+							return $value;
+			} else {
+							throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid', $value,
 						implode(' | ', $types[$enums]->getConstants()));
-		}
-		elseif(!is_array($enums))
+			}
+		} elseif(!is_array($enums))
 		{
 			$enums = func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value, $enums, true))
-			return $value;
-		else
-			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
+		if(in_array($value, $enums, true)) {
+					return $value;
+		} else {
+					throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
+		}
 	}
 
 	/**

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);
@@ -79,7 +79,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);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index < 0)
+		if ($this->_index < 0)
 		{
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;

Braces +7 added lines, -6 removed lines

@@ -67,10 +67,11 @@ 
 	 */
 	public function bindColumn($column, &$value, $dataType = null)
 	{
-		if($dataType === null)
-			$this->_statement->bindColumn($column, $value);
-		else
-			$this->_statement->bindColumn($column, $value, $dataType);
+		if($dataType === null) {
+					$this->_statement->bindColumn($column, $value);
+		} else {
+					$this->_statement->bindColumn($column, $value, $dataType);
+		}
 	}
 
 	/**
@@ -180,9 +181,9 @@ 
 		{
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;
+		} else {
+					throw new TDbException('dbdatareader_rewind_invalid');
 		}
-		else
-			throw new TDbException('dbdatareader_rewind_invalid');
 	}
 
 	/**

framework/Data/TDbConnection.php

Spacing +22 added lines, -22 removed lines

@@ -141,7 +141,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo","\0Prado\Data\TDbConnection\0_active"]);
+		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo", "\0Prado\Data\TDbConnection\0_active"]);
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 	public function setActive($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if($value !== $this->_active)
+		if ($value !== $this->_active)
 		{
-			if($value)
+			if ($value)
 				$this->open();
 			else
 				$this->close();
@@ -184,11 +184,11 @@ 
 	 */
 	protected function open()
 	{
-		if($this->_pdo === null)
+		if ($this->_pdo === null)
 		{
 			try
 			{
-				$this->_pdo = new PDO($this->getConnectionString(),$this->getUsername(),
+				$this->_pdo = new PDO($this->getConnectionString(), $this->getUsername(),
 									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
@@ -197,7 +197,7 @@ 
 				$this->_active = true;
 				$this->setConnectionCharset();
 			}
-			catch(PDOException $e)
+			catch (PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
@@ -290,7 +290,7 @@ 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -298,7 +298,7 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
 		$this->_charset = $value;
 		$this->setConnectionCharset();
@@ -320,7 +320,7 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return new TDbCommand($this, $sql);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -331,9 +331,9 @@ 
 	 */
 	public function getCurrentTransaction()
 	{
-		if($this->_transaction !== null)
+		if ($this->_transaction !== null)
 		{
-			if($this->_transaction->getActive())
+			if ($this->_transaction->getActive())
 				return $this->_transaction;
 		}
 		return null;
@@ -346,7 +346,7 @@ 
 	 */
 	public function beginTransaction()
 	{
-		if($this->getActive())
+		if ($this->getActive())
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
@@ -371,7 +371,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function getLastInsertID($sequenceName = '')
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->lastInsertId($sequenceName);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -396,7 +396,7 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->quote($str);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -437,7 +437,7 @@ 
 	 */
 	public function getDbMetaData()
 	{
-		if($this->_dbMeta === null)
+		if ($this->_dbMeta === null)
 		{
 			$this->_dbMeta = TDbMetaData::getInstance($this);
 		}
@@ -449,7 +449,7 @@ 
 	 */
 	public function getColumnCase()
 	{
-		switch($this->getAttribute(PDO::ATTR_CASE))
+		switch ($this->getAttribute(PDO::ATTR_CASE))
 		{
 			case PDO::CASE_NATURAL:
 				return TDbColumnCaseMode::Preserved;
@@ -465,7 +465,7 @@ 
 	 */
 	public function setColumnCase($value)
 	{
-		switch(TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbColumnCaseMode'))
+		switch (TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
 				$value = PDO::CASE_NATURAL;
@@ -485,7 +485,7 @@ 
 	 */
 	public function getNullConversion()
 	{
-		switch($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
+		switch ($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
 		{
 			case PDO::NULL_NATURAL:
 				return TDbNullConversionMode::Preserved;
@@ -501,7 +501,7 @@ 
 	 */
 	public function setNullConversion($value)
 	{
-		switch(TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbNullConversionMode'))
+		switch (TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
 				$value = PDO::NULL_NATURAL;
@@ -617,7 +617,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->getAttribute($name);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -631,7 +631,7 @@ 
 	 */
 	public function setAttribute($name, $value)
 	{
-		if($this->_pdo instanceof PDO)
+		if ($this->_pdo instanceof PDO)
 			$this->_pdo->setAttribute($name, $value);
 		else
 			$this->_attributes[$name] = $value;

Braces +39 added lines, -32 removed lines

@@ -171,10 +171,11 @@ 
 		$value = TPropertyValue::ensureBoolean($value);
 		if($value !== $this->_active)
 		{
-			if($value)
-				$this->open();
-			else
-				$this->close();
+			if($value) {
+							$this->open();
+			} else {
+							$this->close();
+			}
 		}
 	}
 
@@ -196,8 +197,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active = true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
@@ -221,8 +221,9 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
-			return;
+		if ($this->_charset === '' || $this->_active === false) {
+					return;
+		}
 		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
@@ -320,10 +321,11 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
-			return new TDbCommand($this, $sql);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return new TDbCommand($this, $sql);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -333,8 +335,9 @@ 
 	{
 		if($this->_transaction !== null)
 		{
-			if($this->_transaction->getActive())
-				return $this->_transaction;
+			if($this->_transaction->getActive()) {
+							return $this->_transaction;
+			}
 		}
 		return null;
 	}
@@ -350,9 +353,9 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
 		}
-		else
-			throw new TDbException('dbconnection_connection_inactive');
 	}
 
 	/**
@@ -382,10 +385,11 @@ 
 	 */
 	public function getLastInsertID($sequenceName = '')
 	{
-		if($this->getActive())
-			return $this->_pdo->lastInsertId($sequenceName);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->lastInsertId($sequenceName);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -396,10 +400,11 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
-			return $this->_pdo->quote($str);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->quote($str);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -617,10 +622,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
-			return $this->_pdo->getAttribute($name);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->getAttribute($name);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -631,9 +637,10 @@ 
 	 */
 	public function setAttribute($name, $value)
 	{
-		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name, $value);
-		else
-			$this->_attributes[$name] = $value;
+		if($this->_pdo instanceof PDO) {
+					$this->_pdo->setAttribute($name, $value);
+		} else {
+					$this->_attributes[$name] = $value;
+		}
 	}
 }
\ No newline at end of file

framework/Data/TDbTransaction.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function commit()
 	{
-		if($this->_active && $this->_connection->getActive())
+		if ($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active = false;
@@ -79,7 +79,7 @@ 
 	 */
 	public function rollback()
 	{
-		if($this->_active && $this->_connection->getActive())
+		if ($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active = false;

Braces +4 added lines, -4 removed lines

@@ -68,9 +68,9 @@ 
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active = false;
+		} else {
+					throw new TDbException('dbtransaction_transaction_inactive');
 		}
-		else
-			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
 	/**
@@ -83,9 +83,9 @@ 
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active = false;
+		} else {
+					throw new TDbException('dbtransaction_transaction_inactive');
 		}
-		else
-			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
 	/**

framework/Data/TDbCommand.php

Spacing +15 added lines, -15 removed lines

@@ -112,13 +112,13 @@ 
 	 */
 	public function prepare()
 	{
-		if($this->_statement == null)
+		if ($this->_statement == null)
 		{
 			try
 			{
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
@@ -149,9 +149,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);
@@ -170,7 +170,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);
@@ -189,7 +189,7 @@ 
 		{
 			// 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();
@@ -197,7 +197,7 @@ 
 			else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -225,13 +225,13 @@ 
 		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());
 			return new TDbDataReader($this);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -250,7 +250,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());
@@ -258,7 +258,7 @@ 
 			$this->_statement->closeCursor();
 			return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -276,18 +276,18 @@ 
 		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;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -305,7 +305,7 @@ 
 	{
 		$rows = $this->query()->readAll();
 		$column = [];
-		foreach($rows as $row)
+		foreach ($rows as $row)
 			$column[] = current($row);
 		return $column;
 	}

Braces +42 added lines, -40 removed lines

@@ -117,8 +117,7 @@ 
 			try
 			{
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
@@ -149,12 +148,13 @@ 
 	public function bindParameter($name, &$value, $dataType = null, $length = null)
 	{
 		$this->prepare();
-		if($dataType === null)
-			$this->_statement->bindParam($name, $value);
-		elseif($length === null)
-			$this->_statement->bindParam($name, $value, $dataType);
-		else
-			$this->_statement->bindParam($name, $value, $dataType, $length);
+		if($dataType === null) {
+					$this->_statement->bindParam($name, $value);
+		} elseif($length === null) {
+					$this->_statement->bindParam($name, $value, $dataType);
+		} else {
+					$this->_statement->bindParam($name, $value, $dataType, $length);
+		}
 	}
 
 	/**
@@ -170,10 +170,11 @@ 
 	public function bindValue($name, $value, $dataType = null)
 	{
 		$this->prepare();
-		if($dataType === null)
-			$this->_statement->bindValue($name, $value);
-		else
-			$this->_statement->bindValue($name, $value, $dataType);
+		if($dataType === null) {
+					$this->_statement->bindValue($name, $value);
+		} else {
+					$this->_statement->bindValue($name, $value, $dataType);
+		}
 	}
 
 	/**
@@ -193,11 +194,10 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
+			} else {
+							return $this->getConnection()->getPdoInstance()->exec($this->getText());
 			}
-			else
-				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -225,13 +225,13 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -250,15 +250,15 @@ 
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result = $this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -276,18 +276,19 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			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')
-				return stream_get_contents($result);
-			else
-				return $result;
-		}
-		catch(Exception $e)
+			if(is_resource($result) && get_resource_type($result) === 'stream') {
+							return stream_get_contents($result);
+			} else {
+							return $result;
+			}
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -305,8 +306,9 @@ 
 	{
 		$rows = $this->query()->readAll();
 		$column = [];
-		foreach($rows as $row)
-			$column[] = current($row);
+		foreach($rows as $row) {
+					$column[] = current($row);
+		}
 		return $column;
 	}
 }

framework/Data/DataGateway/TSqlCriteria.php

Spacing +31 added lines, -31 removed lines

@@ -53,11 +53,11 @@ 
 	 */
 	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);
 	}
@@ -198,7 +198,7 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k => $v)
+		foreach ($this->getParameters() as $k => $v)
 			return is_string($k);
 	}
 
@@ -215,16 +215,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));
+			$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';
+				$orderBys[$vs[0]] = isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -268,22 +268,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 = [];
-		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 = [];
-		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

@@ -53,8 +53,9 @@ 
 	 */
 	public function __construct($condition = null, $parameters = [])
 	{
-		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);
@@ -188,8 +189,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);
 	}
 
@@ -198,8 +200,9 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k => $v)
-			return is_string($k);
+		foreach($this->getParameters() as $k => $v) {
+					return is_string($k);
+		}
 	}
 
 	/**
@@ -215,9 +218,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 = [];
@@ -268,22 +271,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 = [];
-		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 = [];
-		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

Spacing +15 added lines, -15 removed lines

@@ -93,9 +93,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);
 	}
@@ -261,7 +261,7 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
@@ -285,7 +285,7 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
@@ -333,7 +333,7 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
@@ -343,7 +343,7 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->deleteByPk($keys);
 	}
@@ -357,7 +357,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);
 	}
@@ -414,12 +414,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);
 		}
-		elseif($criteria instanceof TSqlCriteria)
+		elseif ($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			throw new TDbException('dbtablegateway_invalid_criteria');
@@ -457,19 +457,19 @@ 
 	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);

Braces +45 added lines, -36 removed lines

@@ -93,12 +93,13 @@ 
 	public function __construct($table, $connection)
 	{
 		$this->_connection = $connection;
-		if(is_string($table))
-			$this->setTableName($table);
-		elseif($table instanceof TDbTableInfo)
-			$this->setTableInfo($table);
-		else
-			throw new TDbException('dbtablegateway_invalid_table_info');
+		if(is_string($table)) {
+					$this->setTableName($table);
+		} elseif($table instanceof TDbTableInfo) {
+					$this->setTableInfo($table);
+		} else {
+					throw new TDbException('dbtablegateway_invalid_table_info');
+		}
 	}
 
 	/**
@@ -242,8 +243,9 @@ 
 	public function findAll($criteria = null, $parameters = [])
 	{
 		$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);
 	}
 
@@ -261,8 +263,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);
 	}
 
@@ -285,8 +288,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);
 	}
 
@@ -333,8 +337,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);
 	}
 
@@ -343,8 +348,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);
 	}
 
@@ -357,8 +363,9 @@ 
 	public function count($criteria = null, $parameters = [])
 	{
 		$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);
 	}
 
@@ -418,11 +425,11 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
+		} elseif($criteria instanceof TSqlCriteria) {
+					return $criteria;
+		} else {
+					throw new TDbException('dbtablegateway_invalid_criteria');
 		}
-		elseif($criteria instanceof TSqlCriteria)
-			return $criteria;
-		else
-			throw new TDbException('dbtablegateway_invalid_criteria');
 	}
 
 	/**
@@ -457,22 +464,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);
-		elseif(substr(strtolower($method), 0, 9) === 'findallby')
-			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
-		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')
-			$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);
+		} elseif(substr(strtolower($method), 0, 9) === 'findallby') {
+					$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
+		} 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') {
+					$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);
+		}
 	}
 }
 

framework/Data/DataGateway/TDataGatewayCommand.php

Spacing +33 added lines, -33 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();
 		$parameters = $criteria->getParameters()->toArray();
@@ -151,9 +151,9 @@ 
 	 */
 	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());
@@ -164,7 +164,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());
@@ -172,7 +172,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);
@@ -187,9 +187,9 @@ 
 	 */
 	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,9 +202,9 @@ 
 			return 'FALSE';
 		$columns = [];
 		$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);
 	}
 
 	/**
@@ -216,19 +216,19 @@ 
 	{
 		$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());
@@ -245,9 +245,9 @@ 
 	{
 		$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) . ')';
+		return '('.implode(', ', $data).')';
 	}
 
 	/**
@@ -258,7 +258,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());
@@ -266,11 +266,11 @@ 
 		$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++];
+			$criteria[] = $column.' = :'.$key;
+			$bindings[$key] = isset($values[$key]) ? $values[$key] : $values[$i++];
 		}
 		return [implode(' AND ', $criteria), $bindings];
 	}
@@ -308,9 +308,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());
@@ -324,8 +324,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();
 		$ordering = $criteria->getOrdersBy();
@@ -333,7 +333,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());
 	}
 
 	/**
@@ -348,7 +348,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;
@@ -376,7 +376,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, count($fields), count($args));
@@ -395,21 +395,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 = [];
-		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 = [];
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$key = $columns[$match[1]];
 			$column = $table->getColumn($key)->getColumnName();
-			$sql = $column . ' = ? ';
-			if(count($match) > 2)
+			$sql = $column.' = ? ';
+			if (count($match) > 2)
 				$sql .= strtoupper(str_replace('_', '', $match[2]));
 			$fields[] = $sql;
 		}

Braces +38 added lines, -26 removed lines

@@ -133,8 +133,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();
@@ -151,8 +152,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));
@@ -172,10 +174,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());
@@ -187,8 +190,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));
@@ -198,12 +202,14 @@ 
 
 	public function getIndexKeyCondition($table, $fields, $values)
 	{
-		if (!count($values))
-			return 'FALSE';
+		if (!count($values)) {
+					return 'FALSE';
+		}
 		$columns = [];
 		$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);
 	}
 
@@ -226,8 +232,9 @@ 
 			throw new TDbException('dbtablegateway_missing_pk_values',
 				$this->getTableInfo()->getTableFullName());
 		}
-		if($count > 1 && (!isset($values[0]) || !is_array($values[0])))
-			$values = [$values];
+		if($count > 1 && (!isset($values[0]) || !is_array($values[0]))) {
+					$values = [$values];
+		}
 		if($count > 1 && count($values[0]) !== $count)
 		{
 			throw new TDbException('dbtablegateway_pk_value_count_mismatch',
@@ -245,8 +252,9 @@ 
 	{
 		$conn = $this->getDbConnection();
 		$data = [];
-		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) . ')';
 	}
 
@@ -308,10 +316,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);
@@ -324,8 +334,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();
@@ -409,8 +420,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/TDataSourceConfig.php

Spacing +10 added lines, -10 removed lines

@@ -60,21 +60,21 @@ 
 	 */
 	public function init($xml)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(isset($xml['database']) && is_array($xml['database']))
+			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);
 			}
 		}
@@ -107,9 +107,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn === null)
+		if ($this->_conn === null)
 		{
-			if($this->_connID !== '')
+			if ($this->_connID !== '')
 				$this->_conn = $this->findConnectionByID($this->getConnectionID());
 			else
 				$this->_conn = Prado::createComponent($this->getConnectionClass());
@@ -145,7 +145,7 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn !== null)
+		if ($this->_conn !== null)
 			throw new TConfigurationException('datasource_dbconnection_exists', $value);
 		$this->_connClass = $value;
 	}
@@ -159,9 +159,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);

Braces +22 added lines, -18 removed lines

@@ -65,17 +65,18 @@ 
 			if(isset($xml['database']) && is_array($xml['database']))
 			{
 				$db = $this->getDbConnection();
-				foreach($xml['database'] as $name => $value)
-					$db->setSubProperty($name, $value);
+				foreach($xml['database'] as $name => $value) {
+									$db->setSubProperty($name, $value);
+				}
 			}
-		}
-		else
+		} else
 		{
 			if($prop = $xml->getElementByTagName('database'))
 			{
 				$db = $this->getDbConnection();
-				foreach($prop->getAttributes() as $name => $value)
-					$db->setSubproperty($name, $value);
+				foreach($prop->getAttributes() as $name => $value) {
+									$db->setSubproperty($name, $value);
+				}
 			}
 		}
 	}
@@ -109,10 +110,11 @@ 
 	{
 		if($this->_conn === null)
 		{
-			if($this->_connID !== '')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
-			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+			if($this->_connID !== '') {
+							$this->_conn = $this->findConnectionByID($this->getConnectionID());
+			} else {
+							$this->_conn = Prado::createComponent($this->getConnectionClass());
+			}
 		}
 		return $this->_conn;
 	}
@@ -145,8 +147,9 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn !== null)
-			throw new TConfigurationException('datasource_dbconnection_exists', $value);
+		if($this->_conn !== null) {
+					throw new TConfigurationException('datasource_dbconnection_exists', $value);
+		}
 		$this->_connClass = $value;
 	}
 
@@ -159,11 +162,12 @@ 
 	protected function findConnectionByID($id)
 	{
 		$conn = $this->getApplication()->getModule($id);
-		if($conn instanceof TDbConnection)
-			return $conn;
-		elseif($conn instanceof TDataSourceConfig)
-			return $conn->getDbConnection();
-		else
-			throw new TConfigurationException('datasource_dbconnection_invalid', $id);
+		if($conn instanceof TDbConnection) {
+					return $conn;
+		} elseif($conn instanceof TDataSourceConfig) {
+					return $conn->getDbConnection();
+		} else {
+					throw new TConfigurationException('datasource_dbconnection_invalid', $id);
+		}
 	}
 }