pradosoft / prado

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/Scaffold/TScaffoldBase.php

Spacing +10 added lines, -10 removed lines

@@ -40,8 +40,8 @@ 
 	 */
 	protected function getTableInfo()
 	{
-		$finder = $this->getRecordFinder();
-		$gateway = $finder->getRecordManager()->getRecordGateWay();
+		$finder=$this->getRecordFinder();
+		$gateway=$finder->getRecordManager()->getRecordGateWay();
 		return $gateway->getRecordTableInfo($finder);
 	}
 
@@ -51,9 +51,9 @@ 
 	 */
 	protected function getRecordPropertyValues($record)
 	{
-		$data = array();
+		$data=array();
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)
-			$data[] = $record->getColumnValue($name);
+			$data[]=$record->getColumnValue($name);
 		return $data;
 	}
 
@@ -67,7 +67,7 @@ 
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)
 		{
 			if($column->getIsPrimaryKey())
-				$data[] = $record->getColumnValue($name);
+				$data[]=$record->getColumnValue($name);
 		}
 		return $data;
 	}
@@ -96,7 +96,7 @@ 
 	 */
 	protected function copyFrom(TScaffoldBase $obj)
 	{
-		$this->_record = $obj->_record;
+		$this->_record=$obj->_record;
 		$this->setRecordClass($obj->getRecordClass());
 		$this->setEnableDefaultStyle($obj->getEnableDefaultStyle());
 	}
@@ -128,13 +128,13 @@ 
 			}
 			else
 			{
-				$class = $this->getRecordClass();
+				$class=$this->getRecordClass();
 				if($class!==null)
 					$this->_record=Prado::createComponent($class);
 				else
 				{
 					throw new TConfigurationException('scaffold_invalid_record_class',
-						$this->getRecordClass(),$this->getID());
+						$this->getRecordClass(), $this->getID());
 				}
 			}
 		}
@@ -197,8 +197,8 @@ 
 		parent::onPreRender($param);
 		if($this->getEnableDefaultStyle())
 		{
-			$url = $this->publishAsset($this->getDefaultStyle().'.css');
-			$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
+			$url=$this->publishAsset($this->getDefaultStyle().'.css');
+			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
 }

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Spacing +27 added lines, -27 removed lines

@@ -53,15 +53,15 @@ 
 	 */
 	protected function initializeSort()
 	{
-		$table = $this->getTableInfo();
-		$sorts = array('Sort By', str_repeat('-',15));
-		$headers = array();
+		$table=$this->getTableInfo();
+		$sorts=array('Sort By', str_repeat('-', 15));
+		$headers=array();
 		foreach($table->getColumns() as $name=>$colum)
 		{
-			$fname = ucwords(str_replace('_', ' ', $name));
-			$sorts[$name.' ASC'] = $fname .' Ascending';
-			$sorts[$name.' DESC'] = $fname .' Descending';
-			$headers[] = $fname ;
+			$fname=ucwords(str_replace('_', ' ', $name));
+			$sorts[$name.' ASC']=$fname.' Ascending';
+			$sorts[$name.' DESC']=$fname.' Descending';
+			$headers[]=$fname;
 		}
 		$this->_sort->setDataSource($sorts);
 		$this->_sort->dataBind();
@@ -88,10 +88,10 @@ 
 	 */
 	protected function loadRecordData()
 	{
-		$search = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+		$search=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		$this->_list->setVirtualItemCount($this->getRecordFinder()->count($search));
-		$finder = $this->getRecordFinder();
-		$criteria = $this->getRecordCriteria();
+		$finder=$this->getRecordFinder();
+		$criteria=$this->getRecordCriteria();
 		$this->_list->setDataSource($finder->findAll($criteria));
 		$this->_list->dataBind();
 	}
@@ -101,21 +101,21 @@ 
 	 */
 	protected function getRecordCriteria()
 	{
-		$total = $this->_list->getVirtualItemCount();
-		$limit = $this->_list->getPageSize();
-		$offset = $this->_list->getCurrentPageIndex()*$limit;
+		$total=$this->_list->getVirtualItemCount();
+		$limit=$this->_list->getPageSize();
+		$offset=$this->_list->getCurrentPageIndex() * $limit;
 		if($offset + $limit > $total)
-			$limit = $total - $offset;
-		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+			$limit=$total - $offset;
+		$criteria=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		if($limit > 0)
 		{
 			$criteria->setLimit($limit);
 			if($offset <= $total)
 				$criteria->setOffset($offset);
 		}
-		$order = explode(' ',$this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
-			$criteria->OrdersBy[$order[0]] = $order[1];
+		$order=explode(' ', $this->_sort->getSelectedValue(), 2);
+		if(is_array($order) && count($order)===2)
+			$criteria->OrdersBy[$order[0]]=$order[1];
 		return $criteria;
 	}
 
@@ -140,7 +140,7 @@ 
 	 */
 	public function setSearchParameters($value)
 	{
-		$this->setViewState('SearchParameters', TPropertyValue::ensureArray($value),array());
+		$this->setViewState('SearchParameters', TPropertyValue::ensureArray($value), array());
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 		{
 			if($param instanceof TRepeaterCommandEventParameter)
 			{
-				$pk = $param->getItem()->getCustomData();
+				$pk=$param->getItem()->getCustomData();
 				$ctrl->setRecordPk($pk);
 				$ctrl->initializeEditForm();
 			}
@@ -190,7 +190,7 @@ 
 	{
 		if($param instanceof TRepeaterCommandEventParameter)
 		{
-			$pk = $param->getItem()->getCustomData();
+			$pk=$param->getItem()->getCustomData();
 			$this->getRecordFinder()->deleteByPk($pk);
 		}
 	}
@@ -200,10 +200,10 @@ 
 	 */
 	protected function listItemCreated($sender, $param)
 	{
-		$item = $param->getItem();
+		$item=$param->getItem();
 		if($item instanceof IItemDataRenderer)
 		{
-			$type = $item->getItemType();
+			$type=$item->getItemType();
 			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 				$this->populateField($sender, $param);
 		}
@@ -215,11 +215,11 @@ 
 	 */
 	protected function populateField($sender, $param)
 	{
-		$item = $param->getItem();
-		if(($data = $item->getData()) !== null)
+		$item=$param->getItem();
+		if(($data=$item->getData())!==null)
 		{
 			$item->setCustomData($this->getRecordPkValues($data));
-			if(($prop = $item->findControl('_properties'))!==null)
+			if(($prop=$item->findControl('_properties'))!==null)
 			{
 				$item->_properties->setDataSource($this->getRecordPropertyValues($data));
 				$item->_properties->dataBind();
@@ -294,7 +294,7 @@ 
 	{
 		if(($id=$this->getEditViewID())!==null)
 		{
-			$ctrl = $this->getParent()->findControl($id);
+			$ctrl=$this->getParent()->findControl($id);
 			if($ctrl===null)
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
 			return $ctrl;

framework/Data/ActiveRecord/Scaffold/TScaffoldView.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 * Handle the "edit" and "new" commands by displaying the edit view.
 	 * Default command shows the list view.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		switch(strtolower($param->getCommandName()))
 		{

framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 			case 'char': case 'varchar':
 				return $this->createMultiLineControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 			case 'timestamp':
 				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 }

framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 			case 'datetime': case 'smalldatetime':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				$control = $this->createDefaultControl($container,$column, $record);
+				$control=$this->createDefaultControl($container, $column, $record);
 				if($column->getIsExcluded())
 					$control->setEnabled(false);
 				return $control;
@@ -40,9 +40,9 @@ 
 			case 'boolean':
 				return $container->findControl(self::DEFAULT_ID)->getChecked();
 			case 'datetime': case 'smalldatetime':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				$value = $this->getDefaultControlValue($container,$column, $record);
+				$value=$this->getDefaultControlValue($container, $column, $record);
 				if(trim($value)==='' && $column->getAllowNull())
 					return null;
 				else