pradosoft / prado

framework/Data/SqlMap/DataMapper/TSqlMapException.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
+		for($i = 0; $i < $n; ++$i)
 		{
 			if($args[$i] instanceof SimpleXMLElement)
 				$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
@@ -48,7 +48,7 @@ 
 	{
 		$attributes = [];
 		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
+			$attributes[] = $k . '="' . (string) $v . '"';
 		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
 	}
 

framework/Data/SqlMap/Statements/TMappedStatement.php

Spacing +9 added lines, -12 removed lines

@@ -176,8 +176,8 @@ 
 	{
 		if($max > -1 || $skip > -1)
 		{
-			$maxStr = $max > 0?' LIMIT ' . $max:'';
-			$skipStr = $skip > 0?' OFFSET ' . $skip:'';
+			$maxStr = $max > 0 ? ' LIMIT ' . $max : '';
+			$skipStr = $skip > 0 ? ' OFFSET ' . $skip : '';
 			$command->setText($command->getText() . $maxStr . $skipStr);
 		}
 		$connection->setActive(true);
@@ -237,8 +237,7 @@ 
 	public function runQueryForList($connection, $parameter, $sql, $result, $delegate = null)
 	{
 		$registry = $this->getManager()->getTypeHandlers();
-		$list = $result instanceof \ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$list = $result instanceof \ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
 		$reader = $sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
@@ -322,8 +321,7 @@ 
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty === null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
+				$value = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
@@ -335,8 +333,7 @@ 
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty === null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$map[$key] = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -932,15 +929,15 @@ 
 
 	public function __wakeup()
 	{
-		if (null === $this->_selectQueue) $this->_selectQueue = [];
+		if(null === $this->_selectQueue) $this->_selectQueue = [];
 	}
 
 	public function __sleep()
 	{
 		$exprops = []; $cn = __CLASS__;
-		if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
-		if (null === $this->_groupBy) $exprops[] = "\0$cn\0_groupBy";
-		if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
+		if(!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
+		if(null === $this->_groupBy) $exprops[] = "\0$cn\0_groupBy";
+		if(!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php

Spacing +10 added lines, -10 removed lines

@@ -258,12 +258,12 @@ 
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
-		$commandText = (string)$node;
+		$commandText = (string) $node;
 		if(strlen($extend = $statement->getExtends()) > 0)
 		{
 			$superNode = $this->getElementByIdValue($this->_document, '*', $extend);
 			if($superNode !== null)
-				$commandText = (string)$superNode . $commandText;
+				$commandText = (string) $superNode . $commandText;
 			else
 				throw new TSqlMapConfigurationException(
 						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
@@ -431,11 +431,11 @@ 
 	protected function loadCacheModel($node)
 	{
 		$cacheModel = new TSqlMapCacheModel;
-		$properties = ['id','implementation'];
+		$properties = ['id', 'implementation'];
 		foreach($node->attributes() as $name => $value)
 		{
 			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set' . $name}((string)$value);
+				$cacheModel->{'set' . $name}((string) $value);
 		}
 		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
 		$this->setObjectPropFromNode($cache, $node, $properties);
@@ -476,19 +476,19 @@ 
 			switch(strToLower($name))
 			{
 				case 'seconds':
-					$duration += (integer)$value;
+					$duration += (integer) $value;
 				break;
 				case 'minutes':
-					$duration += 60 * (integer)$value;
+					$duration += 60 * (integer) $value;
 				break;
 				case 'hours':
-					$duration += 3600 * (integer)$value;
+					$duration += 3600 * (integer) $value;
 				break;
 				case 'days':
-					$duration += 86400 * (integer)$value;
+					$duration += 86400 * (integer) $value;
 				break;
 				case 'duration':
-					$duration = (integer)$value;
+					$duration = (integer) $value;
 				break 2; // switch, foreach
 			}
 		}
@@ -509,7 +509,7 @@ 
 		foreach($node->attributes() as $name => $value)
 		{
 			if(strtolower($name) === 'statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+				$this->_FlushOnExecuteStatements[$id][] = (string) $value;
 		}
 	}
 

framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 	{
 		if(isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
+			$obj = Prado::createComponent((string) $node['class']);
 			$this->setObjectPropFromNode($obj, $node, ['class']);
 			return $obj;
 		}
@@ -55,7 +55,7 @@ 
 			if(!in_array($name, $except))
 			{
 				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
+					$obj->{$name} = (string) $value;
 				else
 					throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
@@ -105,7 +105,7 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(['id','ID','Id', 'iD'] as $id)
+		foreach(['id', 'ID', 'Id', 'iD'] as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
 			foreach($document->xpath($xpath) as $node)

framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']] = (string) $node['value'];
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	protected function loadSqlMappingFiles($node)
 	{
-		if(strlen($resource = (string)$node['resource']) > 0)
+		if(strlen($resource = (string) $node['resource']) > 0)
 		{
 			if(strpos($resource, '${') !== false)
 				$resource = $this->replaceProperties($resource);

framework/Data/SqlMap/Configuration/TResultMap.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 		if(($disc = $this->getDiscriminator()) !== null)
 		{
 			$value = $disc->getMapping()->getPropertyValue($registry, $row);
-			$subMap = $disc->getSubMap((string)$value);
+			$subMap = $disc->getSubMap((string) $value);
 
 			if($subMap === null)
 				$subMap = $this;

framework/Data/DataGateway/TDataGatewayCommand.php

Spacing +8 added lines, -8 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));
 	}
 	/**
@@ -153,7 +153,7 @@ 
 	{
 		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());
@@ -189,7 +189,7 @@ 
 	{
 		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();
@@ -198,7 +198,7 @@ 
 
 	public function getIndexKeyCondition($table, $fields, $values)
 	{
-		if (!count($values))
+		if(!count($values))
 			return 'FALSE';
 		$columns = [];
 		$tableName = $table->getTableFullName();
@@ -270,7 +270,7 @@ 
 		{
 			$column = $this->getTableInfo()->getColumn($key)->getColumnName();
 			$criteria[] = $column . ' = :' . $key;
-			$bindings[$key] = isset($values[$key])?$values[$key]:$values[$i++];
+			$bindings[$key] = isset($values[$key]) ? $values[$key] : $values[$i++];
 		}
 		return [implode(' AND ', $criteria), $bindings];
 	}
@@ -325,7 +325,7 @@ 
 	public function count($criteria)
 	{
 		if($criteria === null)
-			return (int)$this->getBuilder()->createCountCommand()->queryScalar();
+			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());
 	}
 
 	/**

framework/Data/DataGateway/TSqlCriteria.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
 			$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);
 
@@ -159,17 +159,17 @@ 
 			$value = str_replace($matches[0], '', $value); // remove limit from query
 			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) {
 			// 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);
@@ -219,12 +219,12 @@ 
 			$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)
 			{
 				$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,8 +268,8 @@ 
 	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}";

framework/Data/TDbConnection.php

Spacing +8 added lines, -8 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"]);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 		{
 			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());
 			}
@@ -221,9 +221,9 @@ 
 	 */
 	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':
@@ -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();
@@ -371,7 +371,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**