pradosoft / prado

framework/Collections/TPagedDataSource.php

Doc Comments +10 added lines

@@ -63,6 +63,7 @@ 
 
 	/**
 	 * @param mixed original data source
+	 * @param Traversable $value
 	 */
 	public function setDataSource($value)
 	{
@@ -88,6 +89,7 @@ 
 
 	/**
 	 * @param integer number of items in each page
+	 * @param integer $value
 	 */
 	public function setPageSize($value)
 	{
@@ -107,6 +109,7 @@ 
 
 	/**
 	 * @param integer current page index
+	 * @param integer $value
 	 */
 	public function setCurrentPageIndex($value)
 	{
@@ -125,6 +128,7 @@ 
 
 	/**
 	 * @param boolean whether to allow paging
+	 * @param boolean $value
 	 */
 	public function setAllowPaging($value)
 	{
@@ -141,6 +145,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setAllowCustomPaging($value)
 	{
@@ -157,6 +162,7 @@ 
 
 	/**
 	 * @param integer user-assigned number of items in data source
+	 * @param integer $value
 	 */
 	public function setVirtualItemCount($value)
 	{
@@ -290,6 +296,8 @@ 
 	 * @param TList the data to be iterated through
 	 * @param integer start index
 	 * @param integer number of items to be iterated through
+	 * @param integer $startIndex
+	 * @param integer $count
 	 */
 	public function __construct(TList $list,$startIndex,$count)
 	{
@@ -374,6 +382,8 @@ 
 	/**
 	 * Constructor.
 	 * @param array the data to be iterated through
+	 * @param integer $startIndex
+	 * @param integer $count
 	 */
 	public function __construct(TMap $map,$startIndex,$count)
 	{

Spacing +21 added lines, -21 removed lines

@@ -26,7 +26,7 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TPagedDataSource extends TComponent implements IteratorAggregate,Countable
+class TPagedDataSource extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * @var mixed original data source
@@ -91,7 +91,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
 			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_pagesize_invalid');
@@ -110,7 +110,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=0;
 		$this->_currentPageIndex=$value;
 	}
@@ -160,7 +160,7 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>=0)
+		if(($value=TPropertyValue::ensureInteger($value)) >= 0)
 			$this->_virtualCount=$value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_virtualitemcount_invalid');
@@ -176,7 +176,7 @@ 
 		if(!$this->_allowPaging)
 			return $this->getDataSourceCount();
 		if(!$this->_allowCustomPaging && $this->getIsLastPage())
-			return $this->getDataSourceCount()-$this->getFirstIndexInPage();
+			return $this->getDataSourceCount() - $this->getFirstIndexInPage();
 		return $this->_pageSize;
 	}
 
@@ -198,9 +198,9 @@ 
 		if($this->_dataSource===null)
 			return 0;
 		$count=$this->getDataSourceCount();
-		if(!$this->_allowPaging || $count<=0)
+		if(!$this->_allowPaging || $count <= 0)
 			return 1;
-		return (int)(($count+$this->_pageSize-1)/$this->_pageSize);
+		return (int) (($count + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	public function getIsLastPage()
 	{
 		if($this->_allowPaging)
-			return $this->_currentPageIndex===$this->getPageCount()-1;
+			return $this->_currentPageIndex===$this->getPageCount() - 1;
 		else
 			return true;
 	}
@@ -232,7 +232,7 @@ 
 	public function getFirstIndexInPage()
 	{
 		if($this->_dataSource!==null && $this->_allowPaging && !$this->_allowCustomPaging)
-			return $this->_currentPageIndex*$this->_pageSize;
+			return $this->_currentPageIndex * $this->_pageSize;
 		else
 			return 0;
 	}
@@ -256,9 +256,9 @@ 
 	public function getIterator()
 	{
 		if($this->_dataSource instanceof TList)
-			return new TPagedListIterator($this->_dataSource,$this->getFirstIndexInPage(),$this->getCount());
+			return new TPagedListIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
 		else if($this->_dataSource instanceof TMap)
-			return new TPagedMapIterator($this->_dataSource,$this->getFirstIndexInPage(),$this->getCount());
+			return new TPagedMapIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
 		else
 			return null;
 	}
@@ -291,13 +291,13 @@ 
 	 * @param integer start index
 	 * @param integer number of items to be iterated through
 	 */
-	public function __construct(TList $list,$startIndex,$count)
+	public function __construct(TList $list, $startIndex, $count)
 	{
 		$this->_list=$list;
 		$this->_index=0;
 		$this->_startIndex=$startIndex;
-		if($startIndex+$count>$list->getCount())
-			$this->_count=$list->getCount()-$startIndex;
+		if($startIndex + $count > $list->getCount())
+			$this->_count=$list->getCount() - $startIndex;
 		else
 			$this->_count=$count;
 	}
@@ -328,7 +328,7 @@ 
 	 */
 	public function current()
 	{
-		return $this->_list->itemAt($this->_startIndex+$this->_index);
+		return $this->_list->itemAt($this->_startIndex + $this->_index);
 	}
 
 	/**
@@ -347,7 +347,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
 
@@ -375,13 +375,13 @@ 
 	 * Constructor.
 	 * @param array the data to be iterated through
 	 */
-	public function __construct(TMap $map,$startIndex,$count)
+	public function __construct(TMap $map, $startIndex, $count)
 	{
 		$this->_map=$map;
 		$this->_index=0;
 		$this->_startIndex=$startIndex;
-		if($startIndex+$count>$map->getCount())
-			$this->_count=$map->getCount()-$startIndex;
+		if($startIndex + $count > $map->getCount())
+			$this->_count=$map->getCount() - $startIndex;
 		else
 			$this->_count=$count;
 		$this->_iterator=$map->getIterator();
@@ -394,7 +394,7 @@ 
 	public function rewind()
 	{
 		$this->_iterator->rewind();
-		for($i=0;$i<$this->_startIndex;++$i)
+		for($i=0; $i < $this->_startIndex; ++$i)
 			$this->_iterator->next();
 		$this->_index=0;
 	}
@@ -436,7 +436,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
 

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Doc Comments +6 added lines

@@ -208,6 +208,7 @@ 
 	 * @param string active record class name.
 	 * @param array row data
 	 * @param array foreign key column names
+	 * @param string $type
 	 * @return TActiveRecord
 	 */
 	protected function createFkObject($type,$row,$foreignKeys)
@@ -227,6 +228,7 @@ 
 	 * @param TTableInfo association table info
 	 * @param array field names
 	 * @param array field values
+	 * @param TActiveRecordCriteria $criteria
 	 */
 	public function createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys)
 	{
@@ -341,6 +343,10 @@ 
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
+	/**
+	 * @param TActiveRecord $obj
+	 * @param TDbCommandBuilder $builder
+	 */
 	private function updateAssociationTable($obj,$fkObjects, $builder)
 	{
 		$source = $this->getSourceRecordValues($obj);

Indentation +4 added lines, -4 removed lines

@@ -90,10 +90,10 @@
 	private $_association_columns=array();
 
 	/**
-	* Get the foreign key index values from the results and make calls to the
-	* database to find the corresponding foreign objects using association table.
-	* @param array original results.
-	*/
+	 * Get the foreign key index values from the results and make calls to the
+	 * database to find the corresponding foreign objects using association table.
+	 * @param array original results.
+	 */
 	protected function collectForeignObjects(&$results)
 	{
 		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();

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

Doc Comments +2 added lines, -1 removed lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * Fetch results for current relationship.
+	 * @param TActiveRecord $obj
 	 * @return boolean always true.
 	 */
 	public function fetchResultsInto($obj)
@@ -104,7 +105,6 @@ 
 	 * Returns foreign keys in $fromRecord with source column names as key
 	 * and foreign column names in the corresponding $matchesRecord as value.
 	 * The method returns the first matching foreign key between these 2 records.
-	 * @param TActiveRecord $fromRecord
 	 * @param TActiveRecord $matchesRecord
 	 * @return array foreign keys with source column names as key and foreign column names as value.
 	 */
@@ -212,6 +212,7 @@ 
 	 * @param array source property names
 	 * @param array foreign objects
 	 * @param array foreign object field names.
+	 * @param TActiveRecord[] $fkObjects
 	 */
 	protected function populateResult(&$results,$properties,&$fkObjects,$fields)
 	{

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

Braces +5 added lines, -6 removed lines

@@ -80,10 +80,10 @@ 
 		if($validArray || $results instanceof ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
-		}
-		else if($results instanceof TActiveRecordRelation)
+			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();
@@ -233,8 +233,7 @@ 
 		{
 			for($i=0,$k=count($results);$i<$k;$i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
-		}
-		else
+		} else
 			$this->setObjectProperty($results, $properties, $collections);
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Doc Comments +5 added lines, -1 removed lines

@@ -30,6 +30,9 @@ 
 	private $_relation; //data from an entry of TActiveRecord::$RELATION
 	private $_fkeys;
 
+	/**
+	 * @param TActiveRecord $record
+	 */
 	public function __construct($record, $property=null, $relation=null)
 	{
 		$this->_record=$record;
@@ -163,6 +166,7 @@ 
 	 * An instance of TActiveRecordHasOne, TActiveRecordBelongsTo, TActiveRecordHasMany,
 	 * or TActiveRecordHasManyAssocation will be returned.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param TSqlCriteria $criteria
 	 * @return TActiveRecordRelation record relationship handler instnace.
 	 * @throws TActiveRecordException if property is not defined or missing.
 	 */
@@ -195,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return TActiveRecordRelationCommand
+	 * @return boolean
 	 */
 	public function updateAssociatedRecords($updateBelongsTo=false)
 	{

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

Doc Comments +9 added lines

@@ -46,6 +46,10 @@ 
 		}
 	}
 
+	/**
+	 * @param TScaffoldEditView $parent
+	 * @param TActiveRecord $record
+	 */
 	public function createScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent=$parent;
@@ -62,6 +66,11 @@ 
 		$label->setForControl(self::DEFAULT_ID);
 	}
 
+	/**
+	 * @param TScaffoldEditView $parent
+	 * @param TDbTableColumn $column
+	 * @param TActiveRecord $record
+	 */
 	public function loadScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent=$parent;

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  */
 class TScaffoldInputBase
 {
-	const DEFAULT_ID = 'scaffold_input';
+	const DEFAULT_ID='scaffold_input';
 	private $_parent;
 
 	protected function getParent()
@@ -20,7 +20,7 @@ 
 	public static function createInputBuilder($record)
 	{
 		$record->getDbConnection()->setActive(true); //must be connected before retrieving driver name!
-		$driver = $record->getDbConnection()->getDriverName();
+		$driver=$record->getDbConnection()->getDriverName();
 		switch(strtolower($driver))
 		{
 			case 'sqlite': //sqlite 3
@@ -42,7 +42,7 @@ 
 				return new TIbmScaffoldInput($conn);
 			default:
 				throw new TConfigurationException(
-					'scaffold_invalid_database_driver',$driver);
+					'scaffold_invalid_database_driver', $driver);
 		}
 	}
 
@@ -57,7 +57,7 @@ 
 
 	protected function createControlLabel($label, $column, $record)
 	{
-		$fieldname = ucwords(str_replace('_', ' ', $column->getColumnId())).':';
+		$fieldname=ucwords(str_replace('_', ' ', $column->getColumnId())).':';
 		$label->setText($fieldname);
 		$label->setForControl(self::DEFAULT_ID);
 	}
@@ -67,20 +67,20 @@ 
 		$this->_parent=$parent;
 		if($this->getIsEnabled($column, $record))
 		{
-			$prop = $column->getColumnId();
+			$prop=$column->getColumnId();
 			$record->setColumnValue($prop, $this->getControlValue($item->_input, $column, $record));
 		}
 	}
 
 	protected function getIsEnabled($column, $record)
 	{
-		return !($this->getParent()->getRecordPk() !== null
+		return !($this->getParent()->getRecordPk()!==null
 				&& $column->getIsPrimaryKey() || $column->hasSequence());
 	}
 
 	protected function getRecordPropertyValue($column, $record)
 	{
-		$value = $record->getColumnValue($column->getColumnId());
+		$value=$record->getColumnValue($column->getColumnId());
 		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null)
 			return $column->getDefaultValue();
 		else

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

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 		return $control;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getDefaultControlValue($container,$column, $record)
 	{
 		$control = $container->findControl(self::DEFAULT_ID);

Spacing +72 added lines, -72 removed lines

@@ -15,7 +15,7 @@ 
 	{
 		$control->setID(self::DEFAULT_ID);
 		$control->setEnabled($this->getIsEnabled($column, $record));
-		$container->Controls[] = $control;
+		$container->Controls[]=$control;
 	}
 
 	protected function setNotNullProperty($container, $control, $column, $record)
@@ -27,8 +27,8 @@ 
 
 	protected function createBooleanControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TCheckBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TCheckBox();
 		$control->setChecked(TPropertyValue::ensureBoolean($value));
 		$control->setCssClass('boolean-checkbox');
 		$this->setDefaultProperty($container, $control, $column, $record);
@@ -37,8 +37,8 @@ 
 
 	protected function createDefaultControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TTextBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TTextBox();
 		$control->setText($value);
 		$control->setCssClass('default-textbox scaffold_input');
 		if(($len=$column->getColumnSize())!==null)
@@ -47,9 +47,9 @@ 
 		return $control;
 	}
 
-	protected function getDefaultControlValue($container,$column, $record)
+	protected function getDefaultControlValue($container, $column, $record)
 	{
-		$control = $container->findControl(self::DEFAULT_ID);
+		$control=$container->findControl(self::DEFAULT_ID);
 		if($control instanceof TCheckBox)
 			return $control->getChecked();
 		else if($control instanceof TControl)
@@ -58,8 +58,8 @@ 
 
 	protected function createMultiLineControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TTextBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TTextBox();
 		$control->setText($value);
 		$control->setTextMode(TTextBoxMode::MultiLine);
 		$control->setCssClass('multiline-textbox scaffold_input');
@@ -69,13 +69,13 @@ 
 
 	protected function createYearControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TDropDownList();
-		$years = array();
-		$current = intval(@date('Y'));
-		$from = $current-10; $to=$current+10;
-		for($i = $from; $i <= $to; $i++)
-			$years[$i] = $i;
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TDropDownList();
+		$years=array();
+		$current=intval(@date('Y'));
+		$from=$current - 10; $to=$current + 10;
+		for($i=$from; $i <= $to; $i++)
+			$years[$i]=$i;
 		$control->setDataSource($years);
 		$control->setSelectedValue(empty($value) ? $current : $value);
 		$control->setCssClass('year-dropdown');
@@ -85,8 +85,8 @@ 
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		$control = $this->createDefaultControl($container, $column, $record);
-		$val = $this->createTypeValidator($container, $column, $record);
+		$control=$this->createDefaultControl($container, $column, $record);
+		$val=$this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Integer);
 		$val->setErrorMessage('Please entery an integer.');
 		return $control;
@@ -94,13 +94,13 @@ 
 
 	protected function createFloatControl($container, $column, $record)
 	{
-		$control = $this->createDefaultControl($container, $column, $record);
-		$val = $this->createTypeValidator($container, $column, $record);
+		$control=$this->createDefaultControl($container, $column, $record);
+		$val=$this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Float);
 		$val->setErrorMessage('Please entery a decimal number.');
-		if(($max= $column->getMaxiumNumericConstraint())!==null)
+		if(($max=$column->getMaxiumNumericConstraint())!==null)
 		{
-			$val = $this->createRangeValidator($container,$column,$record);
+			$val=$this->createRangeValidator($container, $column, $record);
 			$val->setDataType(TValidationDataType::Float);
 			$val->setMaxValue($max);
 			$val->setStrictComparison(true);
@@ -111,99 +111,99 @@ 
 
 	protected function createRequiredValidator($container, $column, $record)
 	{
-		$val = new TRequiredFieldValidator();
+		$val=new TRequiredFieldValidator();
 		$val->setErrorMessage('*');
 		$val->setControlCssClass('required-input');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createTypeValidator($container, $column, $record)
 	{
-		$val = new TDataTypeValidator();
+		$val=new TDataTypeValidator();
 		$val->setControlCssClass('required-input2');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createRangeValidator($container, $column, $record)
 	{
-		$val = new TRangeValidator();
+		$val=new TRangeValidator();
 		$val->setControlCssClass('required-input3');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		$hours=array();
-		for($i=0;$i<24;$i++) $hours[] = str_pad($i,2,'0',STR_PAD_LEFT);
+		for($i=0; $i < 24; $i++) $hours[]=str_pad($i, 2, '0', STR_PAD_LEFT);
 		$mins=array();
-		for($i=0;$i<60;$i++) $mins[] = str_pad($i,2,'0',STR_PAD_LEFT);
-		$hour = intval(@date('H'));
-		$min = intval(@date('i'));
-		$sec = intval(@date('s'));
+		for($i=0; $i < 60; $i++) $mins[]=str_pad($i, 2, '0', STR_PAD_LEFT);
+		$hour=intval(@date('H'));
+		$min=intval(@date('i'));
+		$sec=intval(@date('s'));
 		if(!empty($value))
 		{
 			$match=array();
 			if(preg_match('/(\d+):(\d+):?(\d+)?/', $value, $match))
 			{
-				$hour = $match[1];
-				$min = $match[2];
+				$hour=$match[1];
+				$min=$match[2];
 				if(isset($match[3]))
 					$sec=$match[3];
 			}
 		}
 
-		$hcontrol = new TDropDownList();
+		$hcontrol=new TDropDownList();
 		$hcontrol->setDataSource($hours);
 		$hcontrol->setID(self::DEFAULT_ID);
 		$hcontrol->dataBind();
 		$hcontrol->setSelectedValue(intval($hour));
-		$container->Controls[] = $hcontrol;
-		$container->Controls[] = ' : ';
+		$container->Controls[]=$hcontrol;
+		$container->Controls[]=' : ';
 
-		$mcontrol = new TDropDownList();
+		$mcontrol=new TDropDownList();
 		$mcontrol->setDataSource($mins);
 		$mcontrol->dataBind();
 		$mcontrol->setID('scaffold_time_min');
 		$mcontrol->setSelectedValue(intval($min));
-		$container->Controls[] = $mcontrol;
-		$container->Controls[] = ' : ';
+		$container->Controls[]=$mcontrol;
+		$container->Controls[]=' : ';
 
-		$scontrol = new TDropDownList();
+		$scontrol=new TDropDownList();
 		$scontrol->setDataSource($mins);
 		$scontrol->dataBind();
 		$scontrol->setID('scaffold_time_sec');
 		$scontrol->setSelectedValue(intval($sec));
-		$container->Controls[] = $scontrol;
+		$container->Controls[]=$scontrol;
 
-		return array($hcontrol,$mcontrol,$scontrol);
+		return array($hcontrol, $mcontrol, $scontrol);
 	}
 
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TDatePicker();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TDatePicker();
 		$control->setFromYear(1900);
 		$control->setInputMode(TDatePickerInputMode::DropDownList);
 		$control->setDateFormat('yyyy-MM-dd');
 		if(!empty($value))
-			$control->setDate(substr($value,0,10));
+			$control->setDate(substr($value, 0, 10));
 		$control->setCssClass('date-dropdown');
 		$this->setNotNullProperty($container, $control, $column, $record);
 		return $control;
@@ -211,10 +211,10 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = $this->createDateControl($container, $column, $record);
-		$container->Controls[] = ' @ ';
-		$time = $this->createTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=$this->createDateControl($container, $column, $record);
+		$container->Controls[]=' @ ';
+		$time=$this->createTimeControl($container, $column, $record);
 		if(!empty($value))
 		{
 			$match=array();
@@ -232,30 +232,30 @@ 
 
 	protected function getDateTimeValue($container, $column, $record)
 	{
-		$date = $container->findControl(self::DEFAULT_ID)->getDate();
-		$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+		$date=$container->findControl(self::DEFAULT_ID)->getDate();
+		$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 		return "{$date} {$hour}:{$mins}:{$secs}";
 	}
 
 	protected function getTimeValue($container, $column, $record)
 	{
-		$hour = $container->findControl(self::DEFAULT_ID)->getSelectedValue();
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+		$hour=$container->findControl(self::DEFAULT_ID)->getSelectedValue();
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 		return "{$hour}:{$mins}:{$secs}";
 	}
 
 	protected function createSetControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$selectedValues = preg_split('/\s*,\s*/', $value);
-		$control = new TCheckBoxList();
-		$values = $column->getDbTypeValues();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$selectedValues=preg_split('/\s*,\s*/', $value);
+		$control=new TCheckBoxList();
+		$values=$column->getDbTypeValues();
 		$control->setDataSource($values);
 		$control->dataBind();
-		$control->setSelectedIndices($this->getMatchingIndices($values,$selectedValues));
+		$control->setSelectedIndices($this->getMatchingIndices($values, $selectedValues));
 		$control->setID(self::DEFAULT_ID);
 		$control->setCssClass('set-checkboxes');
 		$this->setNotNullProperty($container, $control, $column, $record);
@@ -265,23 +265,23 @@ 
 	protected function getMatchingIndices($checks, $values)
 	{
 		$index=array();
-		for($i=0, $k=count($checks); $i<$k; $i++)
+		for($i=0, $k=count($checks); $i < $k; $i++)
 		{
 			if(in_array($checks[$i], $values))
-				$index[] = $i;
+				$index[]=$i;
 		}
 		return $index;
 	}
 
 	protected function createEnumControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$selectedValues = preg_split('/\s*,\s*/', $value);
-		$control = new TRadioButtonList();
-		$values = $column->getDbTypeValues();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$selectedValues=preg_split('/\s*,\s*/', $value);
+		$control=new TRadioButtonList();
+		$values=$column->getDbTypeValues();
 		$control->setDataSource($values);
 		$control->dataBind();
-		$index = $this->getMatchingIndices($values,$selectedValues);
+		$index=$this->getMatchingIndices($values, $selectedValues);
 		if(count($index) > 0)
 			$control->setSelectedIndex($index[0]);
 		$control->setID(self::DEFAULT_ID);
@@ -296,7 +296,7 @@ 
 		foreach($container->findControl(self::DEFAULT_ID)->getItems() as $item)
 		{
 			if($item->getSelected())
-				$value[] = $item->getText();
+				$value[]=$item->getText();
 		}
 		return implode(',', $value);
 	}

framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php

Doc Comments +3 added lines, -1 removed lines

@@ -36,7 +36,7 @@ 
 	private $_record;
 
 	/**
-	 * @return TDbMetaData table/view information
+	 * @return TDbTableInfo table/view information
 	 */
 	protected function getTableInfo()
 	{
@@ -84,6 +84,7 @@ 
 	/**
 	 * Name of the Active Record class to be viewed or scaffolded.
 	 * @param string Active Record class name.
+	 * @param string $value
 	 */
 	public function setRecordClass($value)
 	{
@@ -183,6 +184,7 @@ 
 
 	/**
 	 * @param boolean enable default stylesheet, default is true.
+	 * @param boolean $value
 	 */
 	public function setEnableDefaultStyle($value)
 	{

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

Braces +1 added lines, -2 removed lines

@@ -158,8 +158,7 @@
 				$e->setAttribute('maxOccurs','unbounded');
 				$sequence->appendChild($e);
 				$complexType->appendChild($sequence);
-			}
-			else
+			} else
 			{
 				$all = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:all');
 				foreach($elements as $elem)

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Doc Comments +4 added lines

@@ -129,6 +129,8 @@ 
 	 * Instantiate the external edit renderer.
 	 * @param TActiveRecord record to be edited
 	 * @param string external edit renderer class name.
+	 * @param TActiveRecord $record
+	 * @param string $classPath
 	 * @throws TConfigurationException raised when renderer is not an
 	 * instance of IScaffoldEditRenderer.
 	 */
@@ -260,6 +262,7 @@ 
 	/**
 	 * Create the default scaffold editor control factory.
 	 * @param TActiveRecord record instance.
+	 * @param TActiveRecord $record
 	 * @return TScaffoldInputBase scaffold editor control factory.
 	 */
 	protected function getScaffoldInputBuilder($record)
@@ -300,6 +303,7 @@ 
 	/**
 	 * This method should update the record with the user input data.
 	 * @param TActiveRecord record to be saved.
+	 * @param TActiveRecord $record
 	 */
 	public function updateRecord($record);
 }

Braces +4 added lines, -8 removed lines

@@ -115,8 +115,7 @@ 
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
-		}
-		else
+		} else
 		{
 			if($this->_editRenderer===null)
 				$this->createEditRenderer($record, $classPath);
@@ -140,8 +139,7 @@ 
 			$index = $this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index,$this->_editRenderer);
 			$this->_editRenderer->setData($record);
-		}
-		else
+		} else
 		{
 			throw new TConfigurationException(
 				'scaffold_invalid_edit_renderer', $this->getID(), get_class($record));
@@ -204,15 +202,13 @@ 
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
-			}
-			else
+			} else
 			{
 				$this->_editRenderer->updateRecord($record);
 			}
 			$record->save();
 			return true;
-		}
-		else if($this->_editRenderer!==null)
+		} else if($this->_editRenderer!==null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());

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];
 	}

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Doc Comments +1 added lines

@@ -121,6 +121,7 @@
 
 	/**
 	 * @param string search condition, the SQL string after the WHERE clause.
+	 * @param string|null $value
 	 */
 	public function setSearchCondition($value)
 	{

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;