pradosoft / prado

framework/Data/ActiveRecord/TActiveRecordGateway.php

Spacing +50 added lines, -50 removed lines

@@ -59,21 +59,21 @@ 
 	 */
 	protected function getRecordTableName(TActiveRecord $record)
 	{
-		$class = new ReflectionClass($record);
+		$class=new ReflectionClass($record);
 		if($class->hasConstant(self::TABLE_CONST))
 		{
-			$value = $class->getConstant(self::TABLE_CONST);
+			$value=$class->getConstant(self::TABLE_CONST);
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_property',
-					get_class($record),self::TABLE_CONST);
+					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		elseif($class->hasMethod(self::TABLE_METHOD))
 		{
-			$value = $record->{self::TABLE_METHOD}();
+			$value=$record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
-					get_class($record),self::TABLE_METHOD);
+					get_class($record), self::TABLE_METHOD);
 			return $value;
 		}
 		else
@@ -87,7 +87,7 @@ 
 	 */
 	public function getRecordTableInfo(TActiveRecord $record)
 	{
-		$tableName = $this->getRecordTableName($record);
+		$tableName=$this->getRecordTableName($record);
 		return $this->getTableInfo($record->getDbConnection(), $tableName);
 	}
 
@@ -99,8 +99,8 @@ 
 	 */
 	public function getTableInfo(TDbConnection $connection, $tableName)
 	{
-		$connStr = $connection->getConnectionString();
-		$key = $connStr.$tableName;
+		$connStr=$connection->getConnectionString();
+		$key=$connStr.$tableName;
 		if(!isset($this->_tables[$key]))
 		{
 			//call this first to ensure that unserializing the cache
@@ -108,19 +108,19 @@ 
 			if(!isset($this->_meta[$connStr]))
 			{
 				Prado::using('System.Data.Common.TDbMetaData');
-				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
+				$this->_meta[$connStr]=TDbMetaData::getInstance($connection);
 			}
 
-			$tableInfo = null;
+			$tableInfo=null;
 			if(($cache=$this->getManager()->getCache())!==null)
-				$tableInfo = $cache->get($key);
+				$tableInfo=$cache->get($key);
 			if(empty($tableInfo))
 			{
-				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
+				$tableInfo=$this->_meta[$connStr]->getTableInfo($tableName);
 				if($cache!==null)
 					$cache->set($key, $tableInfo);
 			}
-			$this->_tables[$key] = $tableInfo;
+			$this->_tables[$key]=$tableInfo;
 		}
 		return $this->_tables[$key];
 	}
@@ -131,17 +131,17 @@ 
 	 */
 	public function getCommand(TActiveRecord $record)
 	{
-		$conn = $record->getDbConnection();
-		$connStr = $conn->getConnectionString();
-		$tableInfo = $this->getRecordTableInfo($record);
+		$conn=$record->getDbConnection();
+		$connStr=$conn->getConnectionString();
+		$tableInfo=$this->getRecordTableInfo($record);
 		if(!isset($this->_commandBuilders[$connStr]))
 		{
-			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
+			$builder=$tableInfo->createCommandBuilder($record->getDbConnection());
 			Prado::using('System.Data.DataGateway.TDataGatewayCommand');
-			$command = new TDataGatewayCommand($builder);
-			$command->OnCreateCommand[] = array($this, 'onCreateCommand');
-			$command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
-			$this->_commandBuilders[$connStr] = $command;
+			$command=new TDataGatewayCommand($builder);
+			$command->OnCreateCommand[]=array($this, 'onCreateCommand');
+			$command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
+			$this->_commandBuilders[$connStr]=$command;
 
 		}
 		$this->_commandBuilders[$connStr]->getBuilder()->setTableInfo($tableInfo);
@@ -191,9 +191,9 @@ 
 	 * @param array primary name value pairs
 	 * @return array record data
 	 */
-	public function findRecordByPK(TActiveRecord $record,$keys)
+	public function findRecordByPK(TActiveRecord $record, $keys)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $command->findByPk($keys);
 	}
 
@@ -219,7 +219,7 @@ 
 	 */
 	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator=false)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $iterator ? $command->findAll($criteria) : $command->find($criteria);
 	}
 
@@ -247,7 +247,7 @@ 
 
 	public function findRecordsByIndex(TActiveRecord $record, $criteria, $fields, $values)
 	{
-		return $this->getCommand($record)->findAllByIndex($criteria,$fields,$values);
+		return $this->getCommand($record)->findAllByIndex($criteria, $fields, $values);
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	public function insert(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
+		$result=$this->getCommand($record)->insert($this->getInsertValues($record));
 		if($result)
 			$this->updatePostInsert($record);
 		//$this->updateAssociatedRecords($record);
@@ -282,12 +282,12 @@ 
 	 */
 	protected function updatePostInsert($record)
 	{
-		$command = $this->getCommand($record);
-		$tableInfo = $command->getTableInfo();
+		$command=$this->getCommand($record);
+		$tableInfo=$command->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->hasSequence())
-				$record->setColumnValue($name,$command->getLastInsertID($column->getSequenceName()));
+				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
 		}
 	}
 
@@ -298,20 +298,20 @@ 
 	protected function getInsertValues(TActiveRecord $record)
 	{
 		$values=array();
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		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))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($value!==null)
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
 		return $values;
 	}
@@ -324,8 +324,8 @@ 
 	public function update(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		list($data, $keys) = $this->getUpdateValues($record);
-		$result = $this->getCommand($record)->updateByPk($data, $keys);
+		list($data, $keys)=$this->getUpdateValues($record);
+		$result=$this->getCommand($record)->updateByPk($data, $keys);
 		//$this->updateAssociatedRecords($record);
 		return $result;
 	}
@@ -333,30 +333,30 @@ 
 	protected function getUpdateValues(TActiveRecord $record)
 	{
 		$values=array();
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $value;
+				$primary[$name]=$value;
 			else
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
-		return array($values,$primary);
+		return array($values, $primary);
 	}
 
-	protected function updateAssociatedRecords(TActiveRecord $record,$updateBelongsTo=false)
+	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo=false)
 	{
-		$context = new TActiveRecordRelationContext($record);
+		$context=new TActiveRecordRelationContext($record);
 		return $context->updateAssociatedRecords($updateBelongsTo);
 	}
 
@@ -372,12 +372,12 @@ 
 
 	protected function getPrimaryKeyValues(TActiveRecord $record)
 	{
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $record->getColumnValue($name);
+				$primary[$name]=$record->getColumnValue($name);
 		}
 		return $primary;
 	}
@@ -410,12 +410,12 @@ 
 	 * @param TActiveRecord active record
 	 * @param TActiveRecordCriteria data for the command.
 	 */
-	protected function raiseCommandEvent($event,$command,$record,$criteria)
+	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
 		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null,$criteria);
-		$param = new TActiveRecordEventParameter($command,$record,$criteria);
-		$manager = $record->getRecordManager();
+			$criteria=new TActiveRecordCriteria(null, $criteria);
+		$param=new TActiveRecordEventParameter($command, $record, $criteria);
+		$manager=$record->getRecordManager();
 		$manager->{$event}($param);
 		$record->{$event}($param);
 	}

framework/Data/ActiveRecord/TActiveRecordManager.php

Spacing +9 added lines, -9 removed lines

@@ -35,13 +35,13 @@ 
  */
 class TActiveRecordManager extends TComponent
 {
-	const DEFAULT_GATEWAY_CLASS = 'System.Data.ActiveRecord.TActiveRecordGateway';
+	const DEFAULT_GATEWAY_CLASS='System.Data.ActiveRecord.TActiveRecordGateway';
 
 	/**
 	 * Defaults to {@link TActiveRecordManager::DEFAULT_GATEWAY_CLASS DEFAULT_GATEWAY_CLASS}
 	 * @var string
 	 */
-	private $_gatewayClass = self::DEFAULT_GATEWAY_CLASS;
+	private $_gatewayClass=self::DEFAULT_GATEWAY_CLASS;
 
 	private $_gateway;
 	private $_meta=array();
@@ -55,7 +55,7 @@ 
 	 * @var TActiveRecordInvalidFinderResult
 	 * @since 3.1.5
 	 */
-	private $_invalidFinderResult = TActiveRecordInvalidFinderResult::Null;
+	private $_invalidFinderResult=TActiveRecordInvalidFinderResult::Null;
 
 	/**
 	 * @return ICache application cache.
@@ -98,7 +98,7 @@ 
 		if($self!==null)
 			$instance=$self;
 		else if($instance===null)
-			$instance = new self;
+			$instance=new self;
 		return $instance;
 	}
 
@@ -107,8 +107,8 @@ 
 	 */
 	public function getRecordGateway()
 	{
-		if($this->_gateway === null) {
-			$this->_gateway = $this->createRecordGateway();
+		if($this->_gateway===null) {
+			$this->_gateway=$this->createRecordGateway();
 		}
 		return $this->_gateway;
 	}
@@ -127,8 +127,8 @@ 
 	 */
 	public function setGatewayClass($value)
 	{
-		$this->_gateway = null;
-		$this->_gatewayClass = (string)$value;
+		$this->_gateway=null;
+		$this->_gatewayClass=(string) $value;
 	}
 
 	/**
@@ -157,6 +157,6 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
+		$this->_invalidFinderResult=TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
 	}
 }

framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php

Spacing +14 added lines, -14 removed lines

@@ -77,13 +77,13 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
+		$fkeys=$this->getRelationForeignKeys();
 
-		$properties = array_keys($fkeys);
-		$fields = array_values($fkeys);
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields, $indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$properties=array_keys($fkeys);
+		$fields=array_values($fkeys);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -92,8 +92,8 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		return $this->findForeignKeys($this->getSourceRecord(),$fkObject);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		return $this->findForeignKeys($this->getSourceRecord(), $fkObject);
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
 			if(count($collections[$hash]) > 1)
@@ -121,13 +121,13 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObject = $obj->getColumnValue($this->getContext()->getProperty());
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObject=$obj->getColumnValue($this->getContext()->getProperty());
 		if($fkObject!==null)
 		{
 			$fkObject->save();
-			$source = $this->getSourceRecord();
-			$fkeys = $this->findForeignKeys($source, $fkObject);
+			$source=$this->getSourceRecord();
+			$fkeys=$this->findForeignKeys($source, $fkObject);
 			foreach($fkeys as $srcKey => $fKey)
 				$source->setColumnValue($srcKey, $fkObject->getColumnValue($fKey));
 			return true;

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
 
 	public function getPropertyValue()
 	{
-		$obj = $this->getSourceRecord();
+		$obj=$this->getSourceRecord();
 		return $obj->getColumnValue($this->getProperty());
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:array();
+		return isset($this->_relation[4]) ? $this->_relation[4] : array();
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function hasFkField()
 	{
-		$notManyToMany = $this->getRelationType() !== TActiveRecord::MANY_TO_MANY;
+		$notManyToMany=$this->getRelationType()!==TActiveRecord::MANY_TO_MANY;
 		return $notManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -146,7 +146,7 @@ 
 	 */
 	public function hasAssociationTable()
 	{
-		$isManyToMany = $this->getRelationType() === TActiveRecord::MANY_TO_MANY;
+		$isManyToMany=$this->getRelationType()===TActiveRecord::MANY_TO_MANY;
 		return $isManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -174,7 +174,7 @@ 
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
 		if($criteria===null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+			$criteria=new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -202,15 +202,15 @@ 
 		$success=true;
 		foreach($this->_record->getRecordRelations() as $data)
 		{
-			list($property, $relation) = $data;
-			$belongsTo = $relation[0]==TActiveRecord::BELONGS_TO;
+			list($property, $relation)=$data;
+			$belongsTo=$relation[0]==TActiveRecord::BELONGS_TO;
 			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
-				$obj = $this->getSourceRecord();
+				$obj=$this->getSourceRecord();
 				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
-					$context = new TActiveRecordRelationContext($this->getSourceRecord(),$property,$relation);
-					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
+					$context=new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
+					$success=$context->getRelationHandler()->updateAssociatedRecords() && $success;
 				}
 			}
 		}
@@ -220,7 +220,7 @@ 
 	protected function isEmptyFkObject($obj)
 	{
 		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
+			return $obj instanceof TList ? $obj->count()===0 : false;
 		else if(is_array($obj))
 			return count($obj)===0;
 		else

framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php

Spacing +14 added lines, -14 removed lines

@@ -75,14 +75,14 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
+		$fkeys=$this->getRelationForeignKeys();
 
-		$properties = array_values($fkeys);
-		$fields = array_keys($fkeys);
+		$properties=array_values($fkeys);
+		$fields=array_keys($fkeys);
 
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields,$indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
+		$fkObject=$this->getContext()->getForeignRecordFinder();
 		return $this->findForeignKeys($fkObject, $this->getSourceRecord());
 	}
 
@@ -101,18 +101,18 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
 		$success=true;
-		if(($total = count($fkObjects))> 0)
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
-			for($i=0;$i<$total;$i++)
+			$source=$this->getSourceRecord();
+			$fkeys=$this->findForeignKeys($fkObjects[0], $source);
+			for($i=0; $i < $total; $i++)
 			{
 				foreach($fkeys as $fKey => $srcKey)
 					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
-				$success = $fkObjects[$i]->save() && $success;
+				$success=$fkObjects[$i]->save() && $success;
 			}
 		}
 		return $success;

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Spacing +87 added lines, -87 removed lines

@@ -96,10 +96,10 @@ 
 	*/
 	protected function collectForeignObjects(&$results)
 	{
-		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();
-		$properties = array_values($sourceKeys);
-		$indexValues = $this->getIndexValues($properties, $results);
-		$this->fetchForeignObjects($results, $foreignKeys,$indexValues,$sourceKeys);
+		list($sourceKeys, $foreignKeys)=$this->getRelationForeignKeys();
+		$properties=array_values($sourceKeys);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$this->fetchForeignObjects($results, $foreignKeys, $indexValues, $sourceKeys);
 	}
 
 	/**
@@ -107,10 +107,10 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$association = $this->getAssociationTable();
-		$sourceKeys = $this->findForeignKeys($association, $this->getSourceRecord(), true);
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		$foreignKeys = $this->findForeignKeys($association, $fkObject);
+		$association=$this->getAssociationTable();
+		$sourceKeys=$this->findForeignKeys($association, $this->getSourceRecord(), true);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		$foreignKeys=$this->findForeignKeys($association, $fkObject);
 		return array($sourceKeys, $foreignKeys);
 	}
 
@@ -121,16 +121,16 @@ 
 	{
 		if($this->_association===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$conn = $this->getSourceRecord()->getDbConnection();
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$conn=$this->getSourceRecord()->getDbConnection();
 			//table name may include the fk column name separated with a dot.
-			$table = explode('.', $this->getContext()->getAssociationTable());
-			if(count($table)>1)
+			$table=explode('.', $this->getContext()->getAssociationTable());
+			if(count($table) > 1)
 			{
-				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
-				$this->_association_columns = preg_split('/\s*[, ]\*/',$columns);
+				$columns=preg_replace('/^\((.*)\)/', '\1', $table[1]);
+				$this->_association_columns=preg_split('/\s*[, ]\*/', $columns);
 			}
-			$this->_association = $gateway->getTableInfo($conn, $table[0]);
+			$this->_association=$gateway->getTableInfo($conn, $table[0]);
 		}
 		return $this->_association;
 	}
@@ -142,8 +142,8 @@ 
 	{
 		if($this->_sourceTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$this->_sourceTable=$gateway->getRecordTableInfo($this->getSourceRecord());
 		}
 		return $this->_sourceTable;
 	}
@@ -155,9 +155,9 @@ 
 	{
 		if($this->_foreignTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$fkObject = $this->getContext()->getForeignRecordFinder();
-			$this->_foreignTable = $gateway->getRecordTableInfo($fkObject);
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$fkObject=$this->getContext()->getForeignRecordFinder();
+			$this->_foreignTable=$gateway->getRecordTableInfo($fkObject);
 		}
 		return $this->_foreignTable;
 	}
@@ -175,7 +175,7 @@ 
 	 */
 	protected function getForeignCommandBuilder()
 	{
-		$obj = $this->getContext()->getForeignRecordFinder();
+		$obj=$this->getContext()->getForeignRecordFinder();
 		return $this->getSourceRecord()->getRecordGateway()->getCommand($obj);
 	}
 
@@ -185,21 +185,21 @@ 
 	 * @param array field names
 	 * @param array foreign key index values.
 	 */
-	protected function fetchForeignObjects(&$results,$foreignKeys,$indexValues,$sourceKeys)
+	protected function fetchForeignObjects(&$results, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$criteria = $this->getCriteria();
-		$finder = $this->getContext()->getForeignRecordFinder();
-		$type = get_class($finder);
-		$command = $this->createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys);
-		$srcProps = array_keys($sourceKeys);
+		$criteria=$this->getCriteria();
+		$finder=$this->getContext()->getForeignRecordFinder();
+		$type=get_class($finder);
+		$command=$this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
+		$srcProps=array_keys($sourceKeys);
 		$collections=array();
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
-			$hash = $this->getObjectHash($row, $srcProps);
+			$hash=$this->getObjectHash($row, $srcProps);
 			foreach($srcProps as $column)
 				unset($row[$column]);
-			$obj = $this->createFkObject($type,$row,$foreignKeys);
-			$collections[$hash][] = $obj;
+			$obj=$this->createFkObject($type, $row, $foreignKeys);
+			$collections[$hash][]=$obj;
 		}
 		$this->setResultCollection($results, $collections, array_values($sourceKeys));
 	}
@@ -210,9 +210,9 @@ 
 	 * @param array foreign key column names
 	 * @return TActiveRecord
 	 */
-	protected function createFkObject($type,$row,$foreignKeys)
+	protected function createFkObject($type, $row, $foreignKeys)
 	{
-		$obj = TActiveRecord::createRecord($type, $row);
+		$obj=TActiveRecord::createRecord($type, $row);
 		if(count($this->_association_columns) > 0)
 		{
 			$i=0;
@@ -228,22 +228,22 @@ 
 	 * @param array field names
 	 * @param array field values
 	 */
-	public function createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys)
+	public function createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$innerJoin = $this->getAssociationJoin($foreignKeys,$indexValues,$sourceKeys);
-		$fkTable = $this->getForeignTable()->getTableFullName();
-		$srcColumns = $this->getSourceColumns($sourceKeys);
+		$innerJoin=$this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
+		$fkTable=$this->getForeignTable()->getTableFullName();
+		$srcColumns=$this->getSourceColumns($sourceKeys);
 		if(($where=$criteria->getCondition())===null)
 			$where='1=1';
-		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
+		$sql="SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
 
-		$builder = $this->getForeignCommandBuilder()->getBuilder();
-		$command = $builder->applyCriterias($sql,$parameters,$ordering,$limit,$offset);
+		$builder=$this->getForeignCommandBuilder()->getBuilder();
+		$command=$builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 		$this->getCommandBuilder()->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -255,11 +255,11 @@ 
 	protected function getSourceColumns($sourceKeys)
 	{
 		$columns=array();
-		$table = $this->getAssociationTable();
-		$tableName = $table->getTableFullName();
-		$columnNames = array_merge(array_keys($sourceKeys),$this->_association_columns);
+		$table=$this->getAssociationTable();
+		$tableName=$table->getTableFullName();
+		$columnNames=array_merge(array_keys($sourceKeys), $this->_association_columns);
 		foreach($columnNames as $name)
-			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+			$columns[]=$tableName.'.'.$table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -270,28 +270,28 @@ 
 	 * @param array source table column names.
 	 * @return string inner join condition for M-N relationship via association table.
 	 */
-	protected function getAssociationJoin($foreignKeys,$indexValues,$sourceKeys)
+	protected function getAssociationJoin($foreignKeys, $indexValues, $sourceKeys)
 	{
-		$refInfo= $this->getAssociationTable();
-		$fkInfo = $this->getForeignTable();
+		$refInfo=$this->getAssociationTable();
+		$fkInfo=$this->getForeignTable();
 
-		$refTable = $refInfo->getTableFullName();
-		$fkTable = $fkInfo->getTableFullName();
+		$refTable=$refInfo->getTableFullName();
+		$fkTable=$fkInfo->getTableFullName();
 
-		$joins = array();
-		$hasAssociationColumns = count($this->_association_columns) > 0;
+		$joins=array();
+		$hasAssociationColumns=count($this->_association_columns) > 0;
 		$i=0;
 		foreach($foreignKeys as $ref=>$fk)
 		{
 			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+				$refField=$refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
-			$fkField = $fkInfo->getColumn($fk)->getColumnName();
-			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
+				$refField=$refInfo->getColumn($ref)->getColumnName();
+			$fkField=$fkInfo->getColumn($fk)->getColumnName();
+			$joins[]="{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
-		$joinCondition = implode(' AND ', $joins);
-		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo,array_keys($sourceKeys), $indexValues);
+		$joinCondition=implode(' AND ', $joins);
+		$index=$this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
 		return "INNER JOIN {$refTable} ON ({$joinCondition}) AND {$index}";
 	}
 
@@ -301,15 +301,15 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
 		$success=true;
-		if(($total = count($fkObjects))> 0)
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			$source=$this->getSourceRecord();
+			$builder=$this->getAssociationTableCommandBuilder();
+			for($i=0; $i < $total; $i++)
+				$success=$fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -320,57 +320,57 @@ 
 	 */
 	protected function getAssociationTableCommandBuilder()
 	{
-		$conn = $this->getContext()->getSourceRecord()->getDbConnection();
+		$conn=$this->getContext()->getSourceRecord()->getDbConnection();
 		return $this->getAssociationTable()->createCommandBuilder($conn);
 	}
 
-	private function hasAssociationData($builder,$data)
+	private function hasAssociationData($builder, $data)
 	{
 		$condition=array();
-		$table = $this->getAssociationTable();
+		$table=$this->getAssociationTable();
 		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
-		$command = $builder->createCountCommand(implode(' AND ', $condition),array_values($data));
-		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
+			$condition[]=$table->getColumn($name)->getColumnName().' = ?';
+		$command=$builder->createCountCommand(implode(' AND ', $condition), array_values($data));
+		$result=$this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
 	}
 
-	private function addAssociationData($builder,$data)
+	private function addAssociationData($builder, $data)
 	{
-		$command = $builder->createInsertCommand($data);
+		$command=$builder->createInsertCommand($data);
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
-	private function updateAssociationTable($obj,$fkObjects, $builder)
+	private function updateAssociationTable($obj, $fkObjects, $builder)
 	{
-		$source = $this->getSourceRecordValues($obj);
-		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
+		$source=$this->getSourceRecordValues($obj);
+		$foreignKeys=$this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
 		$success=true;
 		foreach($fkObjects as $fkObject)
 		{
-			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys,$fkObject));
-			if(!$this->hasAssociationData($builder,$data))
-				$success = $this->addAssociationData($builder,$data) && $success;
+			$data=array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
+			if(!$this->hasAssociationData($builder, $data))
+				$success=$this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
 	}
 
 	private function getSourceRecordValues($obj)
 	{
-		$sourceKeys = $this->findForeignKeys($this->getAssociationTable(), $obj);
-		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
-		$data = array();
+		$sourceKeys=$this->findForeignKeys($this->getAssociationTable(), $obj);
+		$indexValues=$this->getIndexValues(array_values($sourceKeys), $obj);
+		$data=array();
 		$i=0;
 		foreach($sourceKeys as $name=>$srcKey)
-			$data[$name] = $indexValues[0][$i++];
+			$data[$name]=$indexValues[0][$i++];
 		return $data;
 	}
 
-	private function getForeignObjectValues($foreignKeys,$fkObject)
+	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data=array();
 		foreach($foreignKeys as $name=>$fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+			$data[$name]=$fkObject->getColumnValue($fKey);
 		return $data;
 	}
 }

framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php

Spacing +12 added lines, -12 removed lines

@@ -92,13 +92,13 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
-		$properties = array_values($fkeys);
-		$fields = array_keys($fkeys);
+		$fkeys=$this->getRelationForeignKeys();
+		$properties=array_values($fkeys);
+		$fields=array_keys($fkeys);
 
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields,$indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
+		$fkObject=$this->getContext()->getForeignRecordFinder();
 		return $this->findForeignKeys($fkObject, $this->getSourceRecord());
 	}
 
@@ -118,8 +118,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
 			if(count($collections[$hash]) > 1)
@@ -134,9 +134,9 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$fkObject = $this->getContext()->getPropertyValue();
-		$source = $this->getSourceRecord();
-		$fkeys = $this->findForeignKeys($fkObject, $source);
+		$fkObject=$this->getContext()->getPropertyValue();
+		$source=$this->getSourceRecord();
+		$fkeys=$this->findForeignKeys($fkObject, $source);
 		foreach($fkeys as $fKey => $srcKey)
 			$fkObject->setColumnValue($fKey, $source->getColumnValue($srcKey));
 		return $fkObject->save();

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Spacing +31 added lines, -31 removed lines

@@ -30,8 +30,8 @@ 
 
 	public function __construct(TActiveRecordRelationContext $context, $criteria)
 	{
-		$this->_context = $context;
-		$this->_criteria = $criteria;
+		$this->_context=$context;
+		$this->_criteria=$criteria;
 	}
 
 	/**
@@ -71,22 +71,22 @@ 
 	 * @param array method arguments
 	 * @return mixed TActiveRecord or array of TActiveRecord results depending on the method called.
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
 		static $stack=array();
 
-		$results = call_user_func_array(array($this->getSourceRecord(),$method),$args);
-		$validArray = is_array($results) && count($results) > 0;
+		$results=call_user_func_array(array($this->getSourceRecord(), $method), $args);
+		$validArray=is_array($results) && count($results) > 0;
 		if($validArray || $results instanceof ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
+			while($obj=array_pop($stack))
 				$obj->collectForeignObjects($results);
 		}
 		else if($results instanceof TActiveRecordRelation)
-			$stack[] = $this; //call it later
-		else if($results === null || !$validArray)
-			$stack = array();
+			$stack[]=$this; //call it later
+		else if($results===null || !$validArray)
+			$stack=array();
 		return $results;
 	}
 
@@ -110,28 +110,28 @@ 
 	 */
 	protected function findForeignKeys($from, $matchesRecord, $loose=false)
 	{
-		$gateway = $matchesRecord->getRecordGateway();
-		$recordTableInfo = $gateway->getRecordTableInfo($matchesRecord);
-		$matchingTableName = strtolower($recordTableInfo->getTableName());
-		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
+		$gateway=$matchesRecord->getRecordGateway();
+		$recordTableInfo=$gateway->getRecordTableInfo($matchesRecord);
+		$matchingTableName=strtolower($recordTableInfo->getTableName());
+		$matchingFullTableName=strtolower($recordTableInfo->getTableFullName());
 		$tableInfo=$from;
 		if($from instanceof TActiveRecord)
-			$tableInfo = $gateway->getRecordTableInfo($from);
+			$tableInfo=$gateway->getRecordTableInfo($from);
 		//find first non-empty FK
 		foreach($tableInfo->getForeignKeys() as $fkeys)
 		{
-			$fkTable = strtolower($fkeys['table']);
+			$fkTable=strtolower($fkeys['table']);
 			if($fkTable===$matchingTableName || $fkTable===$matchingFullTableName)
 			{
-				$hasFkField = !$loose && $this->getContext()->hasFkField();
-				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
+				$hasFkField=!$loose && $this->getContext()->hasFkField();
+				$key=$hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
 				if(!empty($key))
 					return $key;
 			}
 		}
 
 		//none found
-		$matching = $gateway->getRecordTableInfo($matchesRecord)->getTableFullName();
+		$matching=$gateway->getRecordTableInfo($matchesRecord)->getTableFullName();
 		throw new TActiveRecordException('ar_relations_missing_fk',
 			$tableInfo->getTableFullName(), $matching);
 	}
@@ -149,13 +149,13 @@ 
 	 */
 	private function getFkFields($fkeys)
 	{
-		$matching = array();
+		$matching=array();
 		preg_match_all('/\s*(\S+\.)?([\w-]+)\s*/', $this->getContext()->getFkField(), $matching);
-		$fields = array();
+		$fields=array();
 		foreach($fkeys as $fkName => $field)
 		{
 			if(in_array($fkName, $matching[2]))
-				$fields[$fkName] = $field;
+				$fields[$fkName]=$field;
 		}
 		return $fields;
 	}
@@ -169,7 +169,7 @@ 
 	{
 		$ids=array();
 		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);
 	}
 
@@ -181,7 +181,7 @@ 
 	 */
 	protected function findForeignObjects($fields, $indexValues)
 	{
-		$finder = $this->getContext()->getForeignRecordFinder();
+		$finder=$this->getContext()->getForeignRecordFinder();
 		return $finder->findAllByIndex($this->_criteria, $fields, $indexValues);
 	}
 
@@ -194,14 +194,14 @@ 
 	protected function getIndexValues($keys, $results)
 	{
 		if(!is_array($results) && !$results instanceof ArrayAccess)
-			$results = array($results);
+			$results=array($results);
 		$values=array();
 		foreach($results as $result)
 		{
-			$value = array();
+			$value=array();
 			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
-			$values[] = $value;
+				$value[]=$result->getColumnValue($name);
+			$values[]=$value;
 		}
 		return $values;
 	}
@@ -213,7 +213,7 @@ 
 	 * @param array foreign objects
 	 * @param array foreign object field names.
 	 */
-	protected function populateResult(&$results,$properties,&$fkObjects,$fields)
+	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections=array();
 		foreach($fkObjects as $fkObject)
@@ -231,7 +231,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
@@ -246,8 +246,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		$source->$prop=isset($collections[$hash]) ? $collections[$hash] : array();
 	}
 }

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Spacing +19 added lines, -19 removed lines

@@ -83,7 +83,7 @@ 
 	public function setRecordPk($value)
 	{
 		$this->clearRecordObject();
-		$val = TPropertyValue::ensureArray($value);
+		$val=TPropertyValue::ensureArray($value);
 		$this->setViewState('PK', count($val) > 0 ? $val : null);
 	}
 
@@ -108,11 +108,11 @@ 
 	 */
 	public function initializeEditForm()
 	{
-		$record = $this->getCurrentRecord();
-		$classPath = $this->getEditRenderer();
-		if($classPath === '')
+		$record=$this->getCurrentRecord();
+		$classPath=$this->getEditRenderer();
+		if($classPath==='')
 		{
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
 		}
@@ -134,11 +134,11 @@ 
 	 */
 	protected function createEditRenderer($record, $classPath)
 	{
-		$this->_editRenderer = Prado::createComponent($classPath);
+		$this->_editRenderer=Prado::createComponent($classPath);
 		if($this->_editRenderer instanceof IScaffoldEditRenderer)
 		{
-			$index = $this->getControls()->remove($this->getInputRepeater());
-			$this->getControls()->insertAt($index,$this->_editRenderer);
+			$index=$this->getControls()->remove($this->getInputRepeater());
+			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
 		}
 		else
@@ -153,16 +153,16 @@ 
 	 */
 	protected function createRepeaterEditItem($sender, $param)
 	{
-		$type = $param->getItem()->getItemType();
+		$type=$param->getItem()->getItemType();
 		if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 		{
-			$item = $param->getItem();
-			$column = $item->getDataItem();
+			$item=$param->getItem();
+			$column=$item->getDataItem();
 			if($column===null)
 				return;
 
-			$record = $this->getCurrentRecord();
-			$builder = $this->getScaffoldInputBuilder($record);
+			$record=$this->getCurrentRecord();
+			$builder=$this->getScaffoldInputBuilder($record);
 			$builder->createScaffoldInput($this, $item, $column, $record);
 		}
 	}
@@ -194,14 +194,14 @@ 
 	{
 		if($this->getPage()->getIsValid())
 		{
-			$record = $this->getCurrentRecord();
+			$record=$this->getCurrentRecord();
 			if($this->_editRenderer===null)
 			{
-				$table = $this->getTableInfo();
-				$builder = $this->getScaffoldInputBuilder($record);
+				$table=$this->getTableInfo();
+				$builder=$this->getScaffoldInputBuilder($record);
 				foreach($this->getInputRepeater()->getItems() as $item)
 				{
-					$column = $table->getColumn($item->getCustomData());
+					$column=$table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
 			}
@@ -265,11 +265,11 @@ 
 	protected function getScaffoldInputBuilder($record)
 	{
 		static $_builders=array();
-		$class = get_class($record);
+		$class=get_class($record);
 		if(!isset($_builders[$class]))
 		{
 			Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
-			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
+			$_builders[$class]=TScaffoldInputBase::createInputBuilder($record);
 		}
 		return $_builders[$class];
 	}