pradosoft / prado

framework/Data/ActiveRecord/TActiveRecordGateway.php

Spacing +27 added lines, -27 removed lines

@@ -72,9 +72,9 @@ 
 	protected function getRecordTableName(TActiveRecord $record)
 	{
 		$class = new ReflectionClass($record);
-		if ($class->hasConstant(self::TABLE_CONST)) {
+		if($class->hasConstant(self::TABLE_CONST)) {
 			$value = $class->getConstant(self::TABLE_CONST);
-			if (empty($value)) {
+			if(empty($value)) {
 				throw new TActiveRecordException(
 					'ar_invalid_tablename_property',
 					get_class($record),
@@ -82,9 +82,9 @@ 
 				);
 			}
 			return $value;
-		} elseif ($class->hasMethod(self::TABLE_METHOD)) {
+		} elseif($class->hasMethod(self::TABLE_METHOD)) {
 			$value = $record->{self::TABLE_METHOD}();
-			if (empty($value)) {
+			if(empty($value)) {
 				throw new TActiveRecordException(
 					'ar_invalid_tablename_method',
 					get_class($record),
@@ -118,20 +118,20 @@ 
 	{
 		$connStr = $connection->getConnectionString();
 		$key = $connStr . $tableName;
-		if (!isset($this->_tables[$key])) {
+		if(!isset($this->_tables[$key])) {
 			//call this first to ensure that unserializing the cache
 			//will find the correct driver dependent classes.
-			if (!isset($this->_meta[$connStr])) {
+			if(!isset($this->_meta[$connStr])) {
 				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
 			}
 
 			$tableInfo = null;
-			if (($cache = $this->getManager()->getCache()) !== null) {
+			if(($cache = $this->getManager()->getCache()) !== null) {
 				$tableInfo = $cache->get($key);
 			}
-			if (empty($tableInfo)) {
+			if(empty($tableInfo)) {
 				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
-				if ($cache !== null) {
+				if($cache !== null) {
 					$cache->set($key, $tableInfo);
 				}
 			}
@@ -149,7 +149,7 @@ 
 		$conn = $record->getDbConnection();
 		$connStr = $conn->getConnectionString();
 		$tableInfo = $this->getRecordTableInfo($record);
-		if (!isset($this->_commandBuilders[$connStr])) {
+		if(!isset($this->_commandBuilders[$connStr])) {
 			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
 			$command = new TDataGatewayCommand($builder);
 			$command->OnCreateCommand[] = [$this, 'onCreateCommand'];
@@ -174,7 +174,7 @@ 
 	public function onCreateCommand($sender, $param)
 	{
 		$this->raiseEvent('OnCreateCommand', $this, $param);
-		if ($this->_currentRecord !== null) {
+		if($this->_currentRecord !== null) {
 			$this->_currentRecord->onCreateCommand($param);
 		}
 	}
@@ -193,7 +193,7 @@ 
 	public function onExecuteCommand($sender, $param)
 	{
 		$this->raiseEvent('OnExecuteCommand', $this, $param);
-		if ($this->_currentRecord !== null) {
+		if($this->_currentRecord !== null) {
 			$this->_currentRecord->onExecuteCommand($param);
 		}
 	}
@@ -284,7 +284,7 @@ 
 	{
 		//$this->updateAssociatedRecords($record,true);
 		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
-		if ($result) {
+		if($result) {
 			$this->updatePostInsert($record);
 		}
 		//$this->updateAssociatedRecords($record);
@@ -299,8 +299,8 @@ 
 	{
 		$command = $this->getCommand($record);
 		$tableInfo = $command->getTableInfo();
-		foreach ($tableInfo->getColumns() as $name => $column) {
-			if ($column->hasSequence()) {
+		foreach($tableInfo->getColumns() as $name => $column) {
+			if($column->hasSequence()) {
 				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
 			}
 		}
@@ -314,12 +314,12 @@ 
 	{
 		$values = [];
 		$tableInfo = $this->getCommand($record)->getTableInfo();
-		foreach ($tableInfo->getColumns() as $name => $column) {
-			if ($column->getIsExcluded()) {
+		foreach($tableInfo->getColumns() as $name => $column) {
+			if($column->getIsExcluded()) {
 				continue;
 			}
 			$value = $record->getColumnValue($name);
-			if (!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE)) {
+			if(!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE)) {
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null',
 					get_class($record),
@@ -327,7 +327,7 @@ 
 					$name
 				);
 			}
-			if ($value !== null) {
+			if($value !== null) {
 				$values[$name] = $value;
 			}
 		}
@@ -353,12 +353,12 @@ 
 		$values = [];
 		$tableInfo = $this->getCommand($record)->getTableInfo();
 		$primary = [];
-		foreach ($tableInfo->getColumns() as $name => $column) {
-			if ($column->getIsExcluded()) {
+		foreach($tableInfo->getColumns() as $name => $column) {
+			if($column->getIsExcluded()) {
 				continue;
 			}
 			$value = $record->getColumnValue($name);
-			if (!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE)) {
+			if(!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE)) {
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null',
 					get_class($record),
@@ -366,13 +366,13 @@ 
 					$name
 				);
 			}
-			if ($column->getIsPrimaryKey()) {
+			if($column->getIsPrimaryKey()) {
 				$primary[$name] = $value;
 			} else {
 				$values[$name] = $value;
 			}
 		}
-		return [$values,$primary];
+		return [$values, $primary];
 	}
 
 	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo = false)
@@ -395,8 +395,8 @@ 
 	{
 		$tableInfo = $this->getCommand($record)->getTableInfo();
 		$primary = [];
-		foreach ($tableInfo->getColumns() as $name => $column) {
-			if ($column->getIsPrimaryKey()) {
+		foreach($tableInfo->getColumns() as $name => $column) {
+			if($column->getIsPrimaryKey()) {
 				$primary[$name] = $record->getColumnValue($name);
 			}
 		}
@@ -433,7 +433,7 @@ 
 	 */
 	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
-		if (!($criteria instanceof TSqlCriteria)) {
+		if(!($criteria instanceof TSqlCriteria)) {
 			$criteria = new TActiveRecordCriteria(null, $criteria);
 		}
 		$param = new TActiveRecordEventParameter($command, $record, $criteria);

framework/Data/TDbTransaction.php

Spacing +2 added lines, -2 removed lines

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

framework/Data/TDbConnection.php

Spacing +20 added lines, -20 removed lines

@@ -140,7 +140,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"]);
 	}
 
 	/**
@@ -168,8 +168,8 @@ 
 	public function setActive($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if ($value !== $this->_active) {
-			if ($value) {
+		if($value !== $this->_active) {
+			if($value) {
 				$this->open();
 			} else {
 				$this->close();
@@ -183,7 +183,7 @@ 
 	 */
 	protected function open()
 	{
-		if ($this->_pdo === null) {
+		if($this->_pdo === null) {
 			try {
 				$this->_pdo = new PDO(
 					$this->getConnectionString(),
@@ -220,10 +220,10 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false) {
+		if($this->_charset === '' || $this->_active === false) {
 			return;
 		}
-		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME)) {
+		switch($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME)) {
 			case 'mysql':
 			case 'sqlite':
 				$stmt = $this->_pdo->prepare('SET NAMES ?');
@@ -319,7 +319,7 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if ($this->getActive()) {
+		if($this->getActive()) {
 			return new TDbCommand($this, $sql);
 		} else {
 			throw new TDbException('dbconnection_connection_inactive');
@@ -331,8 +331,8 @@ 
 	 */
 	public function getCurrentTransaction()
 	{
-		if ($this->_transaction !== null) {
-			if ($this->_transaction->getActive()) {
+		if($this->_transaction !== null) {
+			if($this->_transaction->getActive()) {
 				return $this->_transaction;
 			}
 		}
@@ -346,7 +346,7 @@ 
 	 */
 	public function beginTransaction()
 	{
-		if ($this->getActive()) {
+		if($this->getActive()) {
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
 		} else {
@@ -370,7 +370,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**
@@ -381,7 +381,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');
@@ -438,7 +438,7 @@ 
 	 */
 	public function getDbMetaData()
 	{
-		if ($this->_dbMeta === null) {
+		if($this->_dbMeta === null) {
 			$this->_dbMeta = TDbMetaData::getInstance($this);
 		}
 		return $this->_dbMeta;
@@ -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;
 			case PDO::CASE_LOWER:
@@ -464,7 +464,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;
 				break;
@@ -483,7 +483,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;
 			case PDO::NULL_EMPTY_STRING:
@@ -498,7 +498,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;
 				break;
@@ -613,7 +613,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if ($this->getActive()) {
+		if($this->getActive()) {
 			return $this->_pdo->getAttribute($name);
 		} else {
 			throw new TDbException('dbconnection_connection_inactive');
@@ -628,7 +628,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;

framework/Data/SqlMap/Statements/TCachingStatement.php

Spacing +4 added lines, -4 removed lines

@@ -47,9 +47,9 @@ 
 	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null, $skip = -1, $max = -1, $delegate = null)
 	{
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);
-		$key = $this->getCacheKey([clone($sql), $keyProperty, $valueProperty,$skip, $max]);
+		$key = $this->getCacheKey([clone($sql), $keyProperty, $valueProperty, $skip, $max]);
 		$map = $this->getStatement()->getCache()->get($key);
-		if ($map === null) {
+		if($map === null) {
 			$map = $this->_mappedStatement->runQueryForMap(
 				$connection,
 				$parameter,
@@ -78,7 +78,7 @@ 
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);
 		$key = $this->getCacheKey([clone($sql), $parameter, $skip, $max]);
 		$list = $this->getStatement()->getCache()->get($key);
-		if ($list === null) {
+		if($list === null) {
 			$list = $this->_mappedStatement->runQueryForList(
 				$connection,
 				$parameter,
@@ -96,7 +96,7 @@ 
 		$sql = $this->createCommand($connection, $parameter);
 		$key = $this->getCacheKey([clone($sql), $parameter]);
 		$object = $this->getStatement()->getCache()->get($key);
-		if ($object === null) {
+		if($object === null) {
 			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);
 			$this->getStatement()->getCache()->set($key, $object);
 		}

framework/Data/SqlMap/Statements/TPreparedCommand.php

Spacing +6 added lines, -6 removed lines

@@ -33,11 +33,11 @@ 
 		$connection->setActive(true);
 		$sql = $prepared->getPreparedSql();
 
-		if ($sqlText instanceof TSimpleDynamicSql) {
+		if($sqlText instanceof TSimpleDynamicSql) {
 			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
 		}
 
-		if ($max !== null || $skip !== null) {
+		if($max !== null || $skip !== null) {
 			$builder = TDbMetaData::getInstance($connection)->createCommandBuilder();
 			$sql = $builder->applyLimitOffset($sql, $max, $skip);
 		}
@@ -52,14 +52,14 @@ 
 		$properties = $prepared->getParameterNames(false);
 		//$parameters = $prepared->getParameterValues();
 		$registry = $manager->getTypeHandlers();
-		if ($properties) {
-			for ($i = 0, $k = $properties->getCount(); $i < $k; $i++) {
+		if($properties) {
+			for($i = 0, $k = $properties->getCount(); $i < $k; $i++) {
 				$property = $statement->parameterMap()->getProperty($i);
 				$value = $statement->parameterMap()->getPropertyValue($registry, $property, $parameterObject);
 				$dbType = $property->getDbType();
-				if ($dbType == '') { //relies on PHP lax comparison
+				if($dbType == '') { //relies on PHP lax comparison
 					$command->bindValue($i + 1, $value, TDbCommandBuilder::getPdoType($value));
-				} elseif (strpos($dbType, 'PDO::') === 0) {
+				} elseif(strpos($dbType, 'PDO::') === 0) {
 					$command->bindValue($i + 1, $value, constant($property->getDbType()));
 				} //assumes PDO types, e.g. PDO::PARAM_INT
 				else {

framework/Data/SqlMap/Statements/TPreparedStatementFactory.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	{
 		$this->_preparedStatement = new TPreparedStatement();
 		$this->_preparedStatement->setPreparedSql($this->_commandText);
-		if ($this->_statement->parameterMap() !== null) {
+		if($this->_statement->parameterMap() !== null) {
 			$this->createParametersForTextCommand();
 		}
 		return $this->_preparedStatement;
@@ -43,7 +43,7 @@ 
 
 	protected function createParametersForTextCommand()
 	{
-		foreach ($this->_statement->ParameterMap()->getProperties() as $prop) {
+		foreach($this->_statement->ParameterMap()->getProperties() as $prop) {
 			$this->_preparedStatement->getParameterNames()->add($prop->getProperty());
 		}
 	}

framework/Data/SqlMap/Statements/TSimpleDynamicSql.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	public function replaceDynamicParameter($sql, $parameter)
 	{
-		foreach ($this->_mappings as $property) {
+		foreach($this->_mappings as $property) {
 			$value = TPropertyAccess::get($parameter, $property);
 			$sql = preg_replace('/' . TSimpleDynamicParser::DYNAMIC_TOKEN . '/', str_replace('$', '\$', $value), $sql, 1);
 		}

framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php

Spacing +22 added lines, -22 removed lines

@@ -57,22 +57,22 @@ 
 	 */
 	public function add($parent, $node, $object = '')
 	{
-		if (isset($this->_entries[$parent]) && ($this->_entries[$parent] !== null)
+		if(isset($this->_entries[$parent]) && ($this->_entries[$parent] !== null)
 			&& isset($this->_entries[$node]) && ($this->_entries[$node] !== null)) {
 			$this->_entries[$node] = $object;
 			return;
 		}
 		$this->_entries[$node] = $object;
-		if (empty($parent)) {
-			if (isset($this->_entries[$node])) {
+		if(empty($parent)) {
+			if(isset($this->_entries[$node])) {
 				return;
 			}
 			$this->_tree[$node] = [];
 		}
 		$found = $this->addNode($this->_tree, $parent, $node);
-		if (!$found && !empty($parent)) {
+		if(!$found && !empty($parent)) {
 			$this->_tree[$parent] = [];
-			if (!isset($this->_entries[$parent]) || $object !== '') {
+			if(!isset($this->_entries[$parent]) || $object !== '') {
 				$this->_entries[$parent] = $object;
 			}
 			$this->addNode($this->_tree, $parent, $node);
@@ -90,10 +90,10 @@ 
 	{
 		$found = false;
 		reset($childs);
-		for ($i = 0, $k = count($childs); $i < $k; $i++) {
+		for($i = 0, $k = count($childs); $i < $k; $i++) {
 			$key = key($childs);
 			next($childs);
-			if ($key == $parent) {
+			if($key == $parent) {
 				$found = true;
 				$childs[$key][$node] = [];
 			} else {
@@ -108,7 +108,7 @@ 
 	 */
 	public function collect()
 	{
-		while (count($this->_tree) > 0) {
+		while(count($this->_tree) > 0) {
 			$this->collectChildren(null, $this->_tree);
 		}
 		return $this->getCollection();
@@ -121,8 +121,8 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach ($nodes as $node) {
-			if (count($node) != 0) {
+		foreach($nodes as $node) {
+			if(count($node) != 0) {
 				return true;
 			}
 		}
@@ -138,16 +138,16 @@ 
 	{
 		$noChildren = !$this->hasChildren($nodes);
 		$childs = [];
-		for (reset($nodes); $key = key($nodes);) {
+		for(reset($nodes); $key = key($nodes);) {
 			next($nodes);
-			if ($noChildren) {
+			if($noChildren) {
 				$childs[] = $key;
 				unset($nodes[$key]);
 			} else {
 				$this->collectChildren($key, $nodes[$key]);
 			}
 		}
-		if (count($childs) > 0) {
+		if(count($childs) > 0) {
 			$this->onChildNodesVisited($parent, $childs);
 		}
 	}
@@ -159,7 +159,7 @@ 
 	 */
 	protected function onChildNodesVisited($parent, $nodes)
 	{
-		if (empty($parent) || empty($this->_entries[$parent])) {
+		if(empty($parent) || empty($this->_entries[$parent])) {
 			return;
 		}
 
@@ -168,10 +168,10 @@ 
 
 		$list = TPropertyAccess::get($parentObject, $property);
 
-		foreach ($nodes as $node) {
-			if ($list instanceof TList) {
+		foreach($nodes as $node) {
+			if($list instanceof TList) {
 				$parentObject->{$property}[] = $this->_entries[$node]['object'];
-			} elseif (is_array($list)) {
+			} elseif(is_array($list)) {
 				$list[] = $this->_entries[$node]['object'];
 			} else {
 				throw new TSqlMapExecutionException(
@@ -180,11 +180,11 @@ 
 			}
 		}
 
-		if (is_array($list)) {
+		if(is_array($list)) {
 			TPropertyAccess::set($parentObject, $property, $list);
 		}
 
-		if ($this->_entries[$parent]['property'] === null) {
+		if($this->_entries[$parent]['property'] === null) {
 			$this->_list[] = $parentObject;
 		}
 	}
@@ -201,13 +201,13 @@ 
 	{
 		$exprops = [];
 		$cn = __CLASS__;
-		if (!count($this->_tree)) {
+		if(!count($this->_tree)) {
 			$exprops[] = "\0$cn\0_tree";
 		}
-		if (!count($this->_entries)) {
+		if(!count($this->_entries)) {
 			$exprops[] = "\0$cn\0_entries";
 		}
-		if (!count($this->_list)) {
+		if(!count($this->_list)) {
 			$exprops[] = "\0$cn\0_list";
 		}
 		return array_diff(parent::__sleep(), $exprops);

framework/Data/SqlMap/Statements/TPreparedStatement.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 
 	public function getParameterNames($needed = true)
 	{
-		if (!$this->_parameterNames and $needed) {
+		if(!$this->_parameterNames and $needed) {
 			$this->_parameterNames = new TList;
 		}
 		return $this->_parameterNames;
@@ -51,7 +51,7 @@ 
 
 	public function getParameterValues($needed = true)
 	{
-		if (!$this->_parameterValues and $needed) {
+		if(!$this->_parameterValues and $needed) {
 			$this->_parameterValues = new TMap;
 		}
 		return $this->_parameterValues;
@@ -66,10 +66,10 @@ 
 	{
 		$exprops = [];
 		$cn = __CLASS__;
-		if (!$this->_parameterNames or !$this->_parameterNames->getCount()) {
+		if(!$this->_parameterNames or !$this->_parameterNames->getCount()) {
 			$exprops[] = "\0$cn\0_parameterNames";
 		}
-		if (!$this->_parameterValues or !$this->_parameterValues->getCount()) {
+		if(!$this->_parameterValues or !$this->_parameterValues->getCount()) {
 			$exprops[] = "\0$cn\0_parameterValues";
 		}
 		return array_diff(parent::__sleep(), $exprops);