pradosoft / prado

framework/Collections/TPagedListPageChangedEventParameter.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 	/**
 	 * Constructor.
 	 * @param integer old page index
+	 * @param integer $oldPage
 	 */
 	public function __construct($oldPage)
 	{

framework/Collections/TPriorityList.php

Doc Comments +5 added lines, -1 removed lines

@@ -143,6 +143,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param numeric sets the default priority of inserted items without a specified priority
+	 * @param integer $value
 	 */
 	protected function setDefaultPriority($value)
 	{
@@ -160,6 +161,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param integer The precision of numeric priorities.
+	 * @param integer $value
 	 */
 	protected function setPrecision($value)
 	{
@@ -169,7 +171,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{
@@ -596,6 +598,7 @@ 
 	 * Combines the map elements which have a priority below the parameter value
 	 * @param numeric the cut-off priority.  All items of priority less than this are returned.
 	 * @param boolean whether or not the input cut-off priority is inclusive.  Default: false, not inclusive.
+	 * @param integer $priority
 	 * @return array the array of priorities keys with values of arrays of items that are below a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
@@ -616,6 +619,7 @@ 
 	 * Combines the map elements which have a priority above the parameter value
 	 * @param numeric the cut-off priority.  All items of priority greater than this are returned.
 	 * @param boolean whether or not the input cut-off priority is inclusive.  Default: true, inclusive.
+	 * @param integer $priority
 	 * @return array the array of priorities keys with values of arrays of items that are above a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */

Spacing +41 added lines, -41 removed lines

@@ -126,7 +126,7 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
@@ -147,7 +147,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp=(string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -223,7 +223,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
+		if($index >= 0 && $index < $this->getCount()) {
 			$arr=$this->flattenPriorities();
 			return $arr[$index];
 		} else
@@ -239,9 +239,9 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -254,10 +254,10 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return !isset($this->_d[$priority])?false:(
-				isset($this->_d[$priority][$index])?$this->_d[$priority][$index]:false
+		return !isset($this->_d[$priority]) ?false:(
+				isset($this->_d[$priority][$index]) ? $this->_d[$priority][$index] : false
 			);
 	}
 
@@ -313,35 +313,35 @@ 
 
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc=0;
 			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+				if($prioritykey >= $priority)
 					break;
 				else
 					$cc+=count($items);
 
-			if($index===false&&isset($this->_d[$priority])) {
+			if($index===false && isset($this->_d[$priority])) {
 				$c=count($this->_d[$priority]);
 				$c+=$cc;
 				$this->_d[$priority][]=$item;
 			} elseif(isset($this->_d[$priority])) {
-				$c=$index+$cc;
+				$c=$index + $cc;
 				array_splice($this->_d[$priority], $index, 0, [$item]);
 			} else {
-				$c = $cc;
-				$this->_o = false;
+				$c=$cc;
+				$this->_o=false;
 				$this->_d[$priority]=[$item];
 			}
 
-			if($this->_fd&&is_array($this->_fd)) // if there is a flattened array cache
+			if($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
 				array_splice($this->_fd, $c, 0, [$item]);
 		} else {
 			$c=null;
-			if($index===false&&isset($this->_d[$priority])) {
+			if($index===false && isset($this->_d[$priority])) {
 				$cc=count($this->_d[$priority]);
 				$this->_d[$priority][]=$item;
 			} elseif(isset($this->_d[$priority])) {
@@ -352,7 +352,7 @@ 
 				$this->_o=false;
 				$this->_d[$priority]=[$item];
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
+			if($this->_fd && is_array($this->_fd) && count($this->_d)==1)
 				array_splice($this->_fd, $cc, 0, [$item]);
 			else
 				$this->_fd=null;
@@ -384,7 +384,7 @@ 
 			if($priority!==false) {
 				if($priority===null)
 					$priority=$this->getDefaultPriority();
-				$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 				if($p[0]!=$priority)
 					throw new TInvalidDataValueException('list_item_inexistent');
@@ -428,9 +428,9 @@ 
 
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority]))
+		if(!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
 			throw new TInvalidDataValueException('list_item_inexistent');
 
 		// $value is an array of elements removed, only one
@@ -454,7 +454,7 @@ 
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
+			for($index=count($items) - 1; $index >= 0; $index--)
 				$this->removeAtIndexInPriority($index, $priority);
 			unset($this->_d[$priority]);
 		}
@@ -466,7 +466,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -490,16 +490,16 @@ 
 	 *   if withindex is true, an array is returned of [0 => $priority, 1 => $priorityIndex, 2 => flattenedIndex,
 	 * 'priority' => $priority, 'index' => $priorityIndex, 'absindex' => flattenedIndex]
 	 */
-	public function priorityOf($item, $withindex = false)
+	public function priorityOf($item, $withindex=false)
 	{
 		$this->sortPriorities();
 
-		$absindex = 0;
+		$absindex=0;
 		foreach($this->_d as $priority=>$items) {
 			if(($index=array_search($item, $items, true))!==false) {
 				$absindex+=$index;
-				return $withindex?[$priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex]:$priority;
+				return $withindex ? [$priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex] : $priority;
 			} else
 				$absindex+=count($items);
 		}
@@ -516,19 +516,19 @@ 
 	 *   if withindex is true, an array is returned of [0 => $priority, 1 => $priorityIndex, 2 => flattenedIndex,
 	 * 'priority' => $priority, 'index' => $priorityIndex, 'absindex' => flattenedIndex]
 	 */
-	public function priorityAt($index, $withindex = false)
+	public function priorityAt($index, $withindex=false)
 	{
-		if($index<0||$index>=$this->getCount())
+		if($index < 0 || $index >= $this->getCount())
 			throw new TInvalidDataValueException('list_index_invalid', $index);
 
 		$absindex=$index;
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items) {
-			if($index>=($c=count($items)))
+			if($index >= ($c=count($items)))
 				$index-=$c;
 			else
-				return $withindex?[$priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex]:$priority;
+				return $withindex ? [$priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex] : $priority;
 		}
 		return false;
 	}
@@ -570,9 +570,9 @@ 
 		if(($priority=$this->priorityOf($indexitem, true))===false)
 			throw new TInvalidDataValueException('list_item_inexistent');
 
-		$this->insertAtIndexInPriority($item, $priority[1]+1, $priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1] + 1, $priority[0]);
 
-		return $priority[2]+1;
+		return $priority[2] + 1;
 	}
 
 	/**
@@ -605,7 +605,7 @@ 
 		$items=[];
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
 			$items=array_merge($items, $itemsatpriority);
 		}
@@ -625,7 +625,7 @@ 
 		$items=[];
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
 			$items=array_merge($items, $itemsatpriority);
 		}
@@ -643,15 +643,15 @@ 
 	{
 		if($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
 					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} elseif(is_array($data)||$data instanceof \Traversable) {
-			if($this->getCount()>0)
+		} elseif(is_array($data) || $data instanceof \Traversable) {
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$item)
 				$this->add($item);
@@ -677,7 +677,7 @@ 
 					$this->insertAtIndexInPriority($item, false, $priority);
 			}
 		}
-		elseif(is_array($data)||$data instanceof \Traversable)
+		elseif(is_array($data) || $data instanceof \Traversable)
 		{
 			foreach($data as $priority=>$item)
 				$this->add($item);
@@ -695,7 +695,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0&&$offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -726,7 +726,7 @@ 
 		if($offset===null)
 			return $this->add($item);
 		if($offset===$this->getCount()) {
-			$priority=$this->priorityAt($offset-1, true);
+			$priority=$this->priorityAt($offset - 1, true);
 			$priority[1]++;
 		} else {
 			$priority=$this->priorityAt($offset, true);

Braces +3 added lines, -6 removed lines

@@ -391,8 +391,7 @@ 
 			}
 			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 
@@ -676,14 +675,12 @@ 
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
 					$this->insertAtIndexInPriority($item, false, $priority);
 			}
-		}
-		elseif(is_array($data)||$data instanceof \Traversable)
+		} elseif(is_array($data)||$data instanceof \Traversable)
 		{
 			foreach($data as $priority=>$item)
 				$this->add($item);
 
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TQueue.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 	/**
 	 * Returns an iterator for traversing the items in the queue.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the queue.
+	 * @return \ArrayIterator an iterator for traversing the items in the queue.
 	 */
 	public function getIterator()
 	{

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	public function enqueue($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

framework/Collections/TStack.php

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	/**
 	 * Returns an iterator for traversing the items in the stack.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the stack.
+	 * @return \ArrayIterator an iterator for traversing the items in the stack.
 	 */
 	public function getIterator()
 	{

Spacing +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
-			return $this->_d[$this->_c-1];
+			return $this->_d[$this->_c - 1];
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	public function push($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Doc Comments +5 added lines, -1 removed lines

@@ -35,6 +35,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;
@@ -168,6 +171,7 @@ 
 	 * An instance of TActiveRecordHasOne, TActiveRecordBelongsTo, TActiveRecordHasMany,
 	 * or TActiveRecordHasManyAssocation will be returned.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param \Prado\Data\DataGateway\TSqlCriteria $criteria
 	 * @return TActiveRecordRelation record relationship handler instnace.
 	 * @throws TActiveRecordException if property is not defined or missing.
 	 */
@@ -196,7 +200,7 @@ 
 	}
 
 	/**
-	 * @return TActiveRecordRelationCommand
+	 * @return boolean
 	 */
 	public function updateAssociatedRecords($updateBelongsTo=false)
 	{

Spacing +12 added lines, -12 removed lines

@@ -54,7 +54,7 @@ 
 
 	public function getPropertyValue()
 	{
-		$obj = $this->getSourceRecord();
+		$obj=$this->getSourceRecord();
 		return $obj->getColumnValue($this->getProperty());
 	}
 
@@ -117,7 +117,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:[];
+		return isset($this->_relation[4]) ? $this->_relation[4] : [];
 	}
 
 	/**
@@ -135,7 +135,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]);
 	}
 
@@ -152,7 +152,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]);
 	}
 
@@ -180,7 +180,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:
@@ -204,15 +204,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;
 				}
 			}
 		}
@@ -222,7 +222,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;
 		elseif(is_array($obj))
 			return count($obj)===0;
 		else

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

Doc Comments +8 added lines

@@ -52,6 +52,10 @@ 
 		}
 	}
 
+	/**
+	 * @param \Prado\Data\ActiveRecord\Scaffold\TScaffoldEditView $parent
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
+	 */
 	public function createScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent=$parent;
@@ -68,6 +72,10 @@ 
 		$label->setForControl(self::DEFAULT_ID);
 	}
 
+	/**
+	 * @param \Prado\Data\ActiveRecord\Scaffold\TScaffoldEditView $parent
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
+	 */
 	public function loadScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent=$parent;

Spacing +11 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
 
 class TScaffoldInputBase
 {
-	const DEFAULT_ID = 'scaffold_input';
+	const DEFAULT_ID='scaffold_input';
 	private $_parent;
 
 	protected function getParent()
@@ -26,25 +26,25 @@ 
 	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
 			case 'sqlite2': //sqlite 2
-				require_once(dirname(__FILE__) . '/TSqliteScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TSqliteScaffoldInput.php');
 				return new TSqliteScaffoldInput($conn);
 			case 'mysqli':
 			case 'mysql':
-				require_once(dirname(__FILE__) . '/TMysqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TMysqlScaffoldInput.php');
 				return new TMysqlScaffoldInput($conn);
 			case 'pgsql':
-				require_once(dirname(__FILE__) . '/TPgsqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TPgsqlScaffoldInput.php');
 				return new TPgsqlScaffoldInput($conn);
 			case 'mssql':
-				require_once(dirname(__FILE__) . '/TMssqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TMssqlScaffoldInput.php');
 				return new TMssqlScaffoldInput($conn);
 			case 'ibm':
-				require_once(dirname(__FILE__) . '/TIbmScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TIbmScaffoldInput.php');
 				return new TIbmScaffoldInput($conn);
 			default:
 				throw new TConfigurationException(
@@ -63,7 +63,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);
 	}
@@ -73,20 +73,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/IScaffoldEditRenderer.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 	/**
 	 * This method should update the record with the user input data.
 	 * @param TActiveRecord record to be saved.
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
 	 */
 	public function updateRecord($record);
 }
\ No newline at end of file

framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php

Doc Comments +2 added lines

@@ -91,6 +91,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)
 	{
@@ -190,6 +191,7 @@ 
 
 	/**
 	 * @param boolean enable default stylesheet, default is true.
+	 * @param boolean $value
 	 */
 	public function setEnableDefaultStyle($value)
 	{

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 				if($this->_record===null)
 					throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
-			}
-			else
+			} else
 			{
 				$class = $this->getRecordClass();
 				if($class!==null)

Spacing +8 added lines, -8 removed lines

@@ -47,8 +47,8 @@ 
 	 */
 	protected function getTableInfo()
 	{
-		$finder = $this->getRecordFinder();
-		$gateway = $finder->getRecordManager()->getRecordGateWay();
+		$finder=$this->getRecordFinder();
+		$gateway=$finder->getRecordManager()->getRecordGateWay();
 		return $gateway->getRecordTableInfo($finder);
 	}
 
@@ -58,9 +58,9 @@ 
 	 */
 	protected function getRecordPropertyValues($record)
 	{
-		$data = [];
+		$data=[];
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)
-			$data[] = $record->getColumnValue($name);
+			$data[]=$record->getColumnValue($name);
 		return $data;
 	}
 
@@ -74,7 +74,7 @@ 
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)
 		{
 			if($column->getIsPrimaryKey())
-				$data[] = $record->getColumnValue($name);
+				$data[]=$record->getColumnValue($name);
 		}
 		return $data;
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	protected function copyFrom(TScaffoldBase $obj)
 	{
-		$this->_record = $obj->_record;
+		$this->_record=$obj->_record;
 		$this->setRecordClass($obj->getRecordClass());
 		$this->setEnableDefaultStyle($obj->getEnableDefaultStyle());
 	}
@@ -135,7 +135,7 @@ 
 			}
 			else
 			{
-				$class = $this->getRecordClass();
+				$class=$this->getRecordClass();
 				if($class!==null)
 					$this->_record=Prado::createComponent($class);
 				else
@@ -204,7 +204,7 @@ 
 		parent::onPreRender($param);
 		if($this->getEnableDefaultStyle())
 		{
-			$url = $this->publishAsset($this->getDefaultStyle() . '.css');
+			$url=$this->publishAsset($this->getDefaultStyle().'.css');
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Doc Comments +4 added lines, -1 removed lines

@@ -103,7 +103,7 @@ 
 	}
 
 	/**
-	 * @return TActiveRecord current Active Record instance
+	 * @return \Prado\Data\ActiveRecord\TActiveRecord current Active Record instance
 	 */
 	protected function getCurrentRecord()
 	{
@@ -136,6 +136,8 @@ 
 	 * Instantiate the external edit renderer.
 	 * @param TActiveRecord record to be edited
 	 * @param string external edit renderer class name.
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
+	 * @param string $classPath
 	 * @throws TConfigurationException raised when renderer is not an
 	 * instance of IScaffoldEditRenderer.
 	 */
@@ -267,6 +269,7 @@ 
 	/**
 	 * Create the default scaffold editor control factory.
 	 * @param TActiveRecord record instance.
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
 	 * @return TScaffoldInputBase scaffold editor control factory.
 	 */
 	protected function getScaffoldInputBuilder($record)

Spacing +19 added lines, -19 removed lines

@@ -90,7 +90,7 @@ 
 	public function setRecordPk($value)
 	{
 		$this->clearRecordObject();
-		$val = TPropertyValue::ensureArray($value);
+		$val=TPropertyValue::ensureArray($value);
 		$this->setViewState('PK', count($val) > 0 ? $val : null);
 	}
 
@@ -115,11 +115,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();
 		}
@@ -141,10 +141,10 @@ 
 	 */
 	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());
+			$index=$this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
 		}
@@ -160,16 +160,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->getData();
+			$item=$param->getItem();
+			$column=$item->getData();
 			if($column===null)
 				return;
 
-			$record = $this->getCurrentRecord();
-			$builder = $this->getScaffoldInputBuilder($record);
+			$record=$this->getCurrentRecord();
+			$builder=$this->getScaffoldInputBuilder($record);
 			$builder->createScaffoldInput($this, $item, $column, $record);
 		}
 	}
@@ -201,14 +201,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);
 				}
 			}
@@ -272,10 +272,10 @@ 
 	protected function getScaffoldInputBuilder($record)
 	{
 		static $_builders=[];
-		$class = get_class($record);
+		$class=get_class($record);
 		if(!isset($_builders[$class]))
 		{
-			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
+			$_builders[$class]=TScaffoldInputBase::createInputBuilder($record);
 		}
 		return $_builders[$class];
 	}
@@ -285,6 +285,6 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return 'group_' . $this->getUniqueID();
+		return 'group_'.$this->getUniqueID();
 	}
 }
\ No newline at end of file

Braces +4 added lines, -8 removed lines

@@ -122,8 +122,7 @@ 
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
-		}
-		else
+		} else
 		{
 			if($this->_editRenderer===null)
 				$this->createEditRenderer($record, $classPath);
@@ -147,8 +146,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));
@@ -211,15 +209,13 @@ 
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
-			}
-			else
+			} else
 			{
 				$this->_editRenderer->updateRecord($record);
 			}
 			$record->save();
 			return true;
-		}
-		elseif($this->_editRenderer!==null)
+		} elseif($this->_editRenderer!==null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());