pradosoft / prado

framework/Data/Common/Oracle/TOracleTableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 class TOracleTableColumn extends TDbTableColumn
 {
 	private static $types = [
-		'numeric' => [ 'numeric' ]
+		'numeric' => ['numeric']
 //		'integer' => array('bit', 'bit varying', 'real', 'serial', 'int', 'integer'),
 //		'boolean' => array('boolean'),
 //		'float' => array('bigint', 'bigserial', 'double precision', 'money', 'numeric')

framework/Data/Common/Oracle/TOracleMetaData.php

Braces +6 added lines, -8 removed lines

@@ -207,11 +207,9 @@ 
 				$info['NumericPrecision'] = intval($matches[1]);
 				if(count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
-			}
-			else
+			} else
 				$info['ColumnSize'] = intval($matches[1]);
-		}
-		else
+		} else
 			$info['DbType'] = $col['type'];
 		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
 	}
@@ -317,8 +315,9 @@ 
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = [];
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
+			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey) {
+							$fkeys[$keys[$i]] = $fkey;
+			}
 			return ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
 		}
 	}
@@ -353,8 +352,7 @@ 
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
 			$command = $this->getDbConnection()->createCommand($sql);
-		}
-		else
+		} else
 		{
 			$sql = <<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 		if(count($parts = explode('.', str_replace('"', '', $table))) > 1)
 			return [$parts[0], $parts[1]];
 		else
-			return [$this->getDefaultSchema(),$parts[0]];
+			return [$this->getDefaultSchema(), $parts[0]];
 	}
 
 	/**
@@ -180,11 +180,11 @@ 
 		$info['ColumnName'] = $columnId; //NOT quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if(! (bool)$col['attnotnull']) $info['AllowNull'] = true;
+		if(!(bool) $col['attnotnull']) $info['AllowNull'] = true;
 		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if((int)$col['atttypmod'] > 0) $info['ColumnSize'] = $col['atttypmod']; // - 4;
-		if((bool)$col['atthasdef']) $info['DefaultValue'] = $col['adsrc'];
+		if((int) $col['atttypmod'] > 0) $info['ColumnSize'] = $col['atttypmod']; // - 4;
+		if((bool) $col['atthasdef']) $info['DefaultValue'] = $col['adsrc'];
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -287,7 +287,7 @@ 
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**

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

@@ -97,7 +97,7 @@ 
 			TABLE_NAME = '{$tableName}'
 			AND OWNER = '{$schemaName}'
 		ORDER BY a.COLUMN_ID
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 		$command = $this->getDbConnection()->createCommand($sql);
@@ -160,7 +160,7 @@ 
 		from 	ALL_OBJECTS
 		where	OBJECT_NAME = '{$tableName}'
 		and 	OWNER = '{$schemaName}'
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':schema',$schemaName);
@@ -259,7 +259,7 @@ 
 		and	  a.TABLE_NAME = '{$tableName}'
 		and   a.OWNER = '{$schemaName}'
 		and   a.CONSTRAINT_TYPE in ('P','R')
-EOD;
+eod;
 		$this->getDbConnection()->setActive(true);
 		$command = $this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
@@ -351,7 +351,7 @@ 
 		{
 			$sql = <<<EOD
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
-EOD;
+eod;
 			$command = $this->getDbConnection()->createCommand($sql);
 		}
 		else
@@ -359,7 +359,7 @@ 
 			$sql = <<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects
 WHERE object_type = 'TABLE' AND owner=:schema
-EOD;
+eod;
 			$command = $this->getDbConnection()->createCommand($sql);
 			$command->bindParam(':schema', $schema);
 		}

framework/Data/Common/Mssql/TMssqlCommandBuilder.php

Braces +7 added lines, -6 removed lines

@@ -138,8 +138,7 @@ 
 						$ordering[$subs[1][0]] = $subs[2][0];
 					}
 					//else what?
-				}
-				else
+				} else
 					$ordering[trim($part)] = 'ASC';
 			}
 		}
@@ -155,8 +154,9 @@ 
 		if(count($orders) > 0)
 		{
 			$str = [];
-			foreach($orders as $column => $direction)
-				$str[] = $column . ' ' . $direction;
+			foreach($orders as $column => $direction) {
+							$str[] = $column . ' ' . $direction;
+			}
 			return 'ORDER BY ' . implode(', ', $str);
 		}
 	}
@@ -167,8 +167,9 @@ 
 	 */
 	protected function reverseDirection($orders)
 	{
-		foreach($orders as $column => $direction)
-			$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
+		foreach($orders as $column => $direction) {
+					$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
+		}
 		return $orders;
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	{
 		$limit = $limit !== null ? intval($limit) : -1;
 		$offset = $offset !== null ? intval($offset) : -1;
-		if ($limit > 0 && $offset <= 0) //just limit
+		if($limit > 0 && $offset <= 0) //just limit
 			$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
 		elseif($limit > 0 && $offset > 0)
 			$sql = $this->rewriteLimitOffsetSql($sql, $limit, $offset);

framework/Data/Common/Mssql/TMssqlMetaData.php

Braces +3 added lines, -2 removed lines

@@ -196,8 +196,9 @@
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = [];
-		foreach($command->query()->readAll() as $field)
-			$primary[] = $field['field_name'];
+		foreach($command->query()->readAll() as $field) {
+					$primary[] = $field['field_name'];
+		}
 		$foreign = $this->getForeignConstraints($col);
 		return [$primary,$foreign];
 	}

Spacing +6 added lines, -6 removed lines

@@ -117,11 +117,11 @@ 
 		//remove possible delimiters
 		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
 		if(count($result) === 1)
-			return [null,null,$result[0]];
+			return [null, null, $result[0]];
 		if(count($result) === 2)
-			return [null,$result[0],$result[1]];
+			return [null, $result[0], $result[1]];
 		if(count($result) > 2)
-			return [$result[0],$result[1],$result[2]];
+			return [$result[0], $result[1], $result[2]];
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 		foreach($command->query()->readAll() as $field)
 			$primary[] = $field['field_name'];
 		$foreign = $this->getForeignConstraints($col);
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -280,9 +280,9 @@ 
 		$command->bindParam(":schema", $schema);
 		$rows = $command->queryAll();
 		$names = [];
-		foreach ($rows as $row)
+		foreach($rows as $row)
 		{
-			if ($schema == self::DEFAULT_SCHEMA)
+			if($schema == self::DEFAULT_SCHEMA)
 				$names[] = $row['TABLE_NAME'];
 			else
 				$names[] = $schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];

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

@@ -83,7 +83,7 @@ 
 												INFORMATION_SCHEMA.COLUMNS c
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
-EOD;
+eod;
 		if($schemaName !== null)
 			$sql .= ' AND t.table_schema = :schema';
 		if($catalogName !== null)
@@ -192,7 +192,7 @@ 
 		AND
 			c.constraint_type ='PRIMARY KEY'
 				AND k.table_name = :table
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = [];
@@ -235,7 +235,7 @@ 
 		RC.UNIQUE_CONSTRAINT_NAME
 			AND KCU2.ORDINAL_POSITION = KCU1.ORDINAL_POSITION
 		WHERE KCU1.TABLE_NAME = :table
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$fkeys = [];
@@ -275,7 +275,7 @@ 
 		$sql = <<<EOD
 SELECT TABLE_NAME, TABLE_SCHEMA FROM [INFORMATION_SCHEMA].[TABLES]
 WHERE TABLE_SCHEMA=:schema AND $condition
-EOD;
+eod;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindParam(":schema", $schema);
 		$rows = $command->queryAll();

framework/Data/TDbCommand.php

Braces +9 added lines, -14 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());
 			}
@@ -193,11 +192,9 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
-			}
-			else
+			} else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -230,8 +227,7 @@ 
 			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());
 		}
@@ -257,8 +253,7 @@ 
 			$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());
 		}
@@ -286,8 +281,7 @@ 
 				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,8 +299,9 @@ 
 	{
 		$rows = $this->query()->readAll();
 		$column = [];
-		foreach($rows as $row)
-			$column[] = current($row);
+		foreach($rows as $row) {
+					$column[] = current($row);
+		}
 		return $column;
 	}
 }

Spacing +5 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
 			{
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
@@ -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());
 		}
@@ -231,7 +231,7 @@ 
 				$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());
 		}
@@ -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());
 		}
@@ -287,7 +287,7 @@ 
 			else
 				return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}

framework/Data/DataGateway/TSqlCriteria.php

Braces +9 added lines, -6 removed lines

@@ -198,8 +198,9 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k => $v)
-			return is_string($k);
+		foreach($this->getParameters() as $k => $v) {
+					return is_string($k);
+		}
 	}
 
 	/**
@@ -271,13 +272,15 @@ 
 		if(strlen((string)$this->getCondition()) > 0)
 			$str .= '"' . (string)$this->getCondition() . '"';
 		$params = [];
-		foreach($this->getParameters() as $k => $v)
-			$params[] = "{$k} => ${v}";
+		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}";
+		foreach($this->getOrdersBy() as $k => $v) {
+					$orders[] = "{$k} => ${v}";
+		}
 		if(count($orders) > 0)
 			$str .= ', "' . implode(', ', $orders) . '"';
 		if($this->_limit !== null)

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/DataGateway/TDataGatewayCommand.php

Braces +6 added lines, -4 removed lines

@@ -202,8 +202,9 @@ 
 			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);
 	}
 
@@ -245,8 +246,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) . ')';
 	}
 

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/ActiveRecord/Relations/TActiveRecordRelation.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 	{
 		static $stack = [];
 
-		$results = call_user_func_array([$this->getSourceRecord(),$method], $args);
+		$results = call_user_func_array([$this->getSourceRecord(), $method], $args);
 		$validArray = is_array($results) && count($results) > 0;
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
@@ -172,7 +172,7 @@ 
 	{
 		$ids = [];
 		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+			$ids[] = is_object($obj) ? (string) $obj->getColumnValue($property) : (string) $obj[$property];
 		return serialize($ids);
 	}
 
@@ -234,7 +234,7 @@ 
 	{
 		if(is_array($results) || $results instanceof \ArrayAccess)
 		{
-			for($i = 0,$k = count($results);$i < $k;$i++)
+			for($i = 0, $k = count($results); $i < $k; $i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
 		}
 		else

Braces +17 added lines, -14 removed lines

@@ -83,10 +83,10 @@ 
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
-		}
-		elseif($results instanceof TActiveRecordRelation)
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} elseif($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
 		elseif($results === null || !$validArray)
 			$stack = [];
@@ -171,8 +171,9 @@ 
 	protected function getObjectHash($obj, $properties)
 	{
 		$ids = [];
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		foreach($properties as $property) {
+					$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		}
 		return serialize($ids);
 	}
 
@@ -202,8 +203,9 @@ 
 		foreach($results as $result)
 		{
 			$value = [];
-			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
+			foreach($keys as $name) {
+							$value[] = $result->getColumnValue($name);
+			}
 			$values[] = $value;
 		}
 		return $values;
@@ -219,8 +221,9 @@ 
 	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections = [];
-		foreach($fkObjects as $fkObject)
-			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+		foreach($fkObjects as $fkObject) {
+					$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
+		}
 		$this->setResultCollection($results, $collections, $properties);
 	}
 
@@ -234,10 +237,10 @@ 
 	{
 		if(is_array($results) || $results instanceof \ArrayAccess)
 		{
-			for($i = 0,$k = count($results);$i < $k;$i++)
-				$this->setObjectProperty($results[$i], $properties, $collections);
-		}
-		else
+			for($i = 0,$k = count($results);$i < $k;$i++) {
+							$this->setObjectProperty($results[$i], $properties, $collections);
+			}
+		} else
 			$this->setObjectProperty($results, $properties, $collections);
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 		{
 			$source = $this->getSourceRecord();
 			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
-			for($i = 0;$i < $total;$i++)
+			for($i = 0; $i < $total; $i++)
 			{
 				foreach($fkeys as $fKey => $srcKey)
 					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));

Braces +3 added lines, -2 removed lines

@@ -111,8 +111,9 @@
 			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
 			for($i = 0;$i < $total;$i++)
 			{
-				foreach($fkeys as $fKey => $srcKey)
-					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
+				foreach($fkeys as $fKey => $srcKey) {
+									$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
+				}
 				$success = $fkObjects[$i]->save() && $success;
 			}
 		}