pradosoft / prado

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);
+		}
 	}
 }

framework/Data/SqlMap/DataMapper/TPropertyAccess.php

Spacing +22 added lines, -22 removed lines

@@ -54,26 +54,26 @@ 
 	 */
 	public static function get($object, $path)
 	{
-		if(!is_array($object) && !is_object($object))
+		if (!is_array($object) && !is_object($object))
 			return $object;
 		$properties = explode('.', $path);
-		foreach($properties as $prop)
+		foreach ($properties as $prop)
 		{
-			if(is_array($object) || $object instanceof \ArrayAccess)
+			if (is_array($object) || $object instanceof \ArrayAccess)
 			{
-				if(array_key_exists($prop, $object))
+				if (array_key_exists($prop, $object))
 					$object = $object[$prop];
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
-			elseif(is_object($object))
+			elseif (is_object($object))
 			{
-				$getter = 'get' . $prop;
-				if(method_exists($object, $getter) && is_callable([$object, $getter]))
+				$getter = 'get'.$prop;
+				if (method_exists($object, $getter) && is_callable([$object, $getter]))
 					$object = $object->{$getter}();
-				elseif(in_array($prop, array_keys(get_object_vars($object))))
+				elseif (in_array($prop, array_keys(get_object_vars($object))))
 					$object = $object->{$prop};
-				elseif(method_exists($object, '__get') && is_callable([$object, '__get']))
+				elseif (method_exists($object, '__get') && is_callable([$object, '__get']))
 					$object = $object->{$prop};
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
@@ -91,26 +91,26 @@ 
 	 */
 	public static function has($object, $path)
 	{
-		if(!is_array($object) && !is_object($object))
+		if (!is_array($object) && !is_object($object))
 			return false;
 		$properties = explode('.', $path);
-		foreach($properties as $prop)
+		foreach ($properties as $prop)
 		{
-			if(is_array($object) || $object instanceof \ArrayAccess)
+			if (is_array($object) || $object instanceof \ArrayAccess)
 			{
-				if(array_key_exists($prop, $object))
+				if (array_key_exists($prop, $object))
 					$object = $object[$prop];
 				else
 					return false;
 			}
-			elseif(is_object($object))
+			elseif (is_object($object))
 			{
-				$getter = 'get' . $prop;
-				if(method_exists($object, $getter) && is_callable([$object, $getter]))
+				$getter = 'get'.$prop;
+				if (method_exists($object, $getter) && is_callable([$object, $getter]))
 					$object = $object->{$getter}();
-				elseif(in_array($prop, array_keys(get_object_vars($object))))
+				elseif (in_array($prop, array_keys(get_object_vars($object))))
 					$object = $object->{$prop};
-				elseif(method_exists($object, '__get') && is_callable([$object, '__get']))
+				elseif (method_exists($object, '__get') && is_callable([$object, '__get']))
 					$object = $object->{$prop};
 				else
 					return false;
@@ -132,18 +132,18 @@ 
 	{
 		$properties = explode('.', $path);
 		$prop = array_pop($properties);
-		if(count($properties) > 0)
+		if (count($properties) > 0)
 			$object = self::get($originalObject, implode('.', $properties));
 		else
 			$object = &$originalObject;
 
-		if(is_array($object) || $object instanceof \ArrayAccess)
+		if (is_array($object) || $object instanceof \ArrayAccess)
 		{
 			$object[$prop] = $value;
 		}
-		elseif(is_object($object))
+		elseif (is_object($object))
 		{
-			$setter = 'set' . $prop;
+			$setter = 'set'.$prop;
 			if (method_exists($object, $setter) && is_callable([$object, $setter]))
 				$object->{$setter}($value);
 			else

Braces +53 added lines, -48 removed lines

@@ -54,32 +54,34 @@ 
 	 */
 	public static function get($object, $path)
 	{
-		if(!is_array($object) && !is_object($object))
-			return $object;
+		if(!is_array($object) && !is_object($object)) {
+					return $object;
+		}
 		$properties = explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof \ArrayAccess)
 			{
-				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
-				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
-			}
-			elseif(is_object($object))
+				if(array_key_exists($prop, $object)) {
+									$object = $object[$prop];
+				} else {
+									throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
+				}
+			} elseif(is_object($object))
 			{
 				$getter = 'get' . $prop;
-				if(method_exists($object, $getter) && is_callable([$object, $getter]))
-					$object = $object->{$getter}();
-				elseif(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
-				elseif(method_exists($object, '__get') && is_callable([$object, '__get']))
-					$object = $object->{$prop};
-				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
+				if(method_exists($object, $getter) && is_callable([$object, $getter])) {
+									$object = $object->{$getter}();
+				} elseif(in_array($prop, array_keys(get_object_vars($object)))) {
+									$object = $object->{$prop};
+				} elseif(method_exists($object, '__get') && is_callable([$object, '__get'])) {
+									$object = $object->{$prop};
+				} else {
+									throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
+				}
+			} else {
+							throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
-			else
-				throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 		}
 		return $object;
 	}
@@ -91,32 +93,34 @@ 
 	 */
 	public static function has($object, $path)
 	{
-		if(!is_array($object) && !is_object($object))
-			return false;
+		if(!is_array($object) && !is_object($object)) {
+					return false;
+		}
 		$properties = explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof \ArrayAccess)
 			{
-				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
-				else
-					return false;
-			}
-			elseif(is_object($object))
+				if(array_key_exists($prop, $object)) {
+									$object = $object[$prop];
+				} else {
+									return false;
+				}
+			} elseif(is_object($object))
 			{
 				$getter = 'get' . $prop;
-				if(method_exists($object, $getter) && is_callable([$object, $getter]))
-					$object = $object->{$getter}();
-				elseif(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
-				elseif(method_exists($object, '__get') && is_callable([$object, '__get']))
-					$object = $object->{$prop};
-				else
-					return false;
+				if(method_exists($object, $getter) && is_callable([$object, $getter])) {
+									$object = $object->{$getter}();
+				} elseif(in_array($prop, array_keys(get_object_vars($object)))) {
+									$object = $object->{$prop};
+				} elseif(method_exists($object, '__get') && is_callable([$object, '__get'])) {
+									$object = $object->{$prop};
+				} else {
+									return false;
+				}
+			} else {
+							return false;
 			}
-			else
-				return false;
 		}
 		return true;
 	}
@@ -132,25 +136,26 @@ 
 	{
 		$properties = explode('.', $path);
 		$prop = array_pop($properties);
-		if(count($properties) > 0)
-			$object = self::get($originalObject, implode('.', $properties));
-		else
-			$object = &$originalObject;
+		if(count($properties) > 0) {
+					$object = self::get($originalObject, implode('.', $properties));
+		} else {
+					$object = &$originalObject;
+		}
 
 		if(is_array($object) || $object instanceof \ArrayAccess)
 		{
 			$object[$prop] = $value;
-		}
-		elseif(is_object($object))
+		} elseif(is_object($object))
 		{
 			$setter = 'set' . $prop;
-			if (method_exists($object, $setter) && is_callable([$object, $setter]))
-				$object->{$setter}($value);
-			else
-				$object->{$prop} = $value;
+			if (method_exists($object, $setter) && is_callable([$object, $setter])) {
+							$object->{$setter}($value);
+			} else {
+							$object->{$prop} = $value;
+			}
+		} else {
+					throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 		}
-		else
-			throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 	}
 
 }

framework/Data/SqlMap/DataMapper/TSqlMapApplicationCache.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	{
 		$id = 'keyList';
 		if ($this->_cacheModel instanceof TSqlMapCacheModel)
-				$id .= '_' . $this->_cacheModel->getId();
+				$id .= '_'.$this->_cacheModel->getId();
 		return $id;
 	}
 	/**

Braces +3 added lines, -2 removed lines

@@ -44,8 +44,9 @@
 	protected function getKeyListId()
 	{
 		$id = 'keyList';
-		if ($this->_cacheModel instanceof TSqlMapCacheModel)
-				$id .= '_' . $this->_cacheModel->getId();
+		if ($this->_cacheModel instanceof TSqlMapCacheModel) {
+						$id .= '_' . $this->_cacheModel->getId();
+		}
 		return $id;
 	}
 	/**

framework/Data/SqlMap/DataMapper/TSqlMapFifoCache.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
-		if($this->_keyList->getCount() > $this->_cacheSize)
+		if ($this->_keyList->getCount() > $this->_cacheSize)
 		{
 			$oldestKey = $this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);

framework/Data/SqlMap/DataMapper/TSqlMapException.php

Spacing +10 added lines, -10 removed lines

@@ -30,12 +30,12 @@ 
 		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]);
+			if ($args[$i] instanceof SimpleXMLElement)
+				$tokens['{'.$i.'}'] = $this->implodeNode($args[$i]);
 			else
-				$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+				$tokens['{'.$i.'}'] = TPropertyValue::ensureString($args[$i]);
 		}
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
@@ -47,9 +47,9 @@ 
 	protected function implodeNode($node)
 	{
 		$attributes = [];
-		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
-		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
+		foreach ($node->attributes() as $k => $v)
+			$attributes[] = $k.'="'.(string) $v.'"';
+		return '<'.$node->getName().' '.implode(' ', $attributes).'>';
 	}
 
 	/**
@@ -59,9 +59,9 @@ 
 	{
 		$lang = Prado::getPreferredLanguage();
 		$dir = dirname(__FILE__);
-		$msgFile = $dir . '/messages-' . $lang . '.txt';
-		if(!is_file($msgFile))
-			$msgFile = $dir . '/messages.txt';
+		$msgFile = $dir.'/messages-'.$lang.'.txt';
+		if (!is_file($msgFile))
+			$msgFile = $dir.'/messages.txt';
 		return $msgFile;
 	}
 }
\ No newline at end of file

Braces +11 added lines, -8 removed lines

@@ -32,10 +32,11 @@ 
 		$tokens = [];
 		for($i = 0;$i < $n;++$i)
 		{
-			if($args[$i] instanceof SimpleXMLElement)
-				$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
-			else
-				$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+			if($args[$i] instanceof SimpleXMLElement) {
+							$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
+			} else {
+							$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+			}
 		}
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
@@ -47,8 +48,9 @@ 
 	protected function implodeNode($node)
 	{
 		$attributes = [];
-		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
+		foreach($node->attributes() as $k => $v) {
+					$attributes[] = $k . '="' . (string)$v . '"';
+		}
 		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
 	}
 
@@ -60,8 +62,9 @@ 
 		$lang = Prado::getPreferredLanguage();
 		$dir = dirname(__FILE__);
 		$msgFile = $dir . '/messages-' . $lang . '.txt';
-		if(!is_file($msgFile))
-			$msgFile = $dir . '/messages.txt';
+		if(!is_file($msgFile)) {
+					$msgFile = $dir . '/messages.txt';
+		}
 		return $msgFile;
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandler.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 	public function getType()
 	{
-		if($this->_type === null)
+		if ($this->_type === null)
 			return get_class($this);
 		else
 			return $this->_type;

Braces +5 added lines, -4 removed lines

@@ -50,10 +50,11 @@
 
 	public function getType()
 	{
-		if($this->_type === null)
-			return get_class($this);
-		else
-			return $this->_type;
+		if($this->_type === null) {
+					return get_class($this);
+		} else {
+					return $this->_type;
+		}
 	}
 
 	public function setType($value)

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php

Spacing +8 added lines, -8 removed lines

@@ -31,8 +31,8 @@ 
 	 */
 	public function getDbTypeHandler($dbType = 'NULL')
 	{
-		foreach($this->_typeHandlers as $handler)
-			if($handler->getDbType() === $dbType)
+		foreach ($this->_typeHandlers as $handler)
+			if ($handler->getDbType() === $dbType)
 				return $handler;
 	}
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function getTypeHandler($class)
 	{
-		if(isset($this->_typeHandlers[$class]))
+		if (isset($this->_typeHandlers[$class]))
 			return $this->_typeHandlers[$class];
 	}
 
@@ -63,9 +63,9 @@ 
 	 */
 	public function createInstanceOf($type = '')
 	{
-		if(strlen($type) > 0)
+		if (strlen($type) > 0)
 		{
-			switch(strtolower($type))
+			switch (strtolower($type))
 			{
 				case 'string': return '';
 				case 'array': return [];
@@ -74,9 +74,9 @@ 
 				case 'bool': case 'boolean': return false;
 			}
 
-			if(class_exists('Prado', false))
+			if (class_exists('Prado', false))
 				return Prado::createComponent($type);
-			elseif(class_exists($type, false)) //NO auto loading
+			elseif (class_exists($type, false)) //NO auto loading
 				return new $type;
 			else
 				throw new TSqlMapException('sqlmap_unable_to_find_class', $type);
@@ -91,7 +91,7 @@ 
 	 */
 	public function convertToType($type, $value)
 	{
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			case 'integer': case 'int':
 				$type = 'integer'; break;

Braces +13 added lines, -9 removed lines

@@ -31,9 +31,10 @@ 
 	 */
 	public function getDbTypeHandler($dbType = 'NULL')
 	{
-		foreach($this->_typeHandlers as $handler)
-			if($handler->getDbType() === $dbType)
+		foreach($this->_typeHandlers as $handler) {
+					if($handler->getDbType() === $dbType)
 				return $handler;
+		}
 	}
 
 	/**
@@ -42,8 +43,9 @@ 
 	 */
 	public function getTypeHandler($class)
 	{
-		if(isset($this->_typeHandlers[$class]))
-			return $this->_typeHandlers[$class];
+		if(isset($this->_typeHandlers[$class])) {
+					return $this->_typeHandlers[$class];
+		}
 	}
 
 	/**
@@ -74,12 +76,14 @@ 
 				case 'bool': case 'boolean': return false;
 			}
 
-			if(class_exists('Prado', false))
-				return Prado::createComponent($type);
-			elseif(class_exists($type, false)) //NO auto loading
+			if(class_exists('Prado', false)) {
+							return Prado::createComponent($type);
+			} elseif(class_exists($type, false)) {
+				//NO auto loading
 				return new $type;
-			else
-				throw new TSqlMapException('sqlmap_unable_to_find_class', $type);
+			} else {
+							throw new TSqlMapException('sqlmap_unable_to_find_class', $type);
+			}
 		}
 	}
 

framework/Data/SqlMap/DataMapper/TLazyLoadList.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 		$statement = $mappedStatement->getStatement();
 		$registry = $mappedStatement->getManager()->getTypeHandlers();
 		$list = $statement->createInstanceOfListClass($registry);
-		if(!is_object($list))
+		if (!is_object($list))
 			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
 		return new TObjectProxy($handler, $list);
 	}
@@ -79,7 +79,7 @@ 
 	 */
 	protected function fetchListData()
 	{
-		if($this->_loaded == false)
+		if ($this->_loaded == false)
 		{
 			$this->_innerList = $this->_statement->executeQueryForList($this->_connection, $this->_param);
 			$this->_loaded = true;
@@ -96,7 +96,7 @@ 
 	public function hasMethod($method)
 	{
 		$this->fetchListData();
-		if(is_object($this->_innerList))
+		if (is_object($this->_innerList))
 			return in_array($method, get_class_methods($this->_innerList));
 		return false;
 	}

Braces +6 added lines, -4 removed lines

@@ -59,8 +59,9 @@ 
 		$statement = $mappedStatement->getStatement();
 		$registry = $mappedStatement->getManager()->getTypeHandlers();
 		$list = $statement->createInstanceOfListClass($registry);
-		if(!is_object($list))
-			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
+		if(!is_object($list)) {
+					throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
+		}
 		return new TObjectProxy($handler, $list);
 	}
 
@@ -96,8 +97,9 @@ 
 	public function hasMethod($method)
 	{
 		$this->fetchListData();
-		if(is_object($this->_innerList))
-			return in_array($method, get_class_methods($this->_innerList));
+		if(is_object($this->_innerList)) {
+					return in_array($method, get_class_methods($this->_innerList));
+		}
 		return false;
 	}
 }
\ No newline at end of file