pradosoft / prado

framework/Collections/TPagedDataSource.php

Doc Comments +6 added lines

@@ -68,6 +68,7 @@ 
 
 	/**
 	 * @param mixed original data source
+	 * @param \Traversable $value
 	 */
 	public function setDataSource($value)
 	{
@@ -93,6 +94,7 @@ 
 
 	/**
 	 * @param integer number of items in each page
+	 * @param integer $value
 	 */
 	public function setPageSize($value)
 	{
@@ -112,6 +114,7 @@ 
 
 	/**
 	 * @param integer current page index
+	 * @param integer $value
 	 */
 	public function setCurrentPageIndex($value)
 	{
@@ -130,6 +133,7 @@ 
 
 	/**
 	 * @param boolean whether to allow paging
+	 * @param boolean $value
 	 */
 	public function setAllowPaging($value)
 	{
@@ -146,6 +150,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setAllowCustomPaging($value)
 	{
@@ -162,6 +167,7 @@ 
 
 	/**
 	 * @param integer user-assigned number of items in data source
+	 * @param integer $value
 	 */
 	public function setVirtualItemCount($value)
 	{

Spacing +10 added lines, -10 removed lines

@@ -96,7 +96,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');
@@ -115,7 +115,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=0;
 		$this->_currentPageIndex=$value;
 	}
@@ -165,7 +165,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');
@@ -181,7 +181,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;
 	}
 
@@ -203,9 +203,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);
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	public function getIsLastPage()
 	{
 		if($this->_allowPaging)
-			return $this->_currentPageIndex===$this->getPageCount()-1;
+			return $this->_currentPageIndex===$this->getPageCount() - 1;
 		else
 			return true;
 	}
@@ -237,7 +237,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;
 	}
@@ -261,9 +261,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;
 	}

framework/Collections/TPagedListIterator.php

Doc Comments +2 added lines

@@ -35,6 +35,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)
 	{

Spacing +5 added lines, -5 removed lines

@@ -36,13 +36,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;
 	}
@@ -73,7 +73,7 @@ 
 	 */
 	public function current()
 	{
-		return $this->_list->itemAt($this->_startIndex+$this->_index);
+		return $this->_list->itemAt($this->_startIndex + $this->_index);
 	}
 
 	/**
@@ -92,6 +92,6 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
\ No newline at end of file

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

Doc Comments +2 added lines

@@ -34,6 +34,8 @@
 	/**
 	 * Constructor.
 	 * @param array the data to be iterated through
+	 * @param integer $startIndex
+	 * @param integer $count
 	 */
 	public function __construct(TMap $map,$startIndex,$count)
 	{

Spacing +5 added lines, -5 removed lines

@@ -35,13 +35,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();
@@ -54,7 +54,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;
 	}
@@ -96,6 +96,6 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
\ No newline at end of file

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.
 	 */

Braces +3 added lines, -6 removed lines

@@ -390,8 +390,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);
 			}
-		}
-		else if(is_array($data)||$data instanceof \Traversable)
+		} else if(is_array($data)||$data instanceof \Traversable)
 		{
 			foreach($data as $priority=>$item)
 				$this->add($item);
 
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

Spacing +90 added lines, -90 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and is neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
 		parent::__construct();
 		if($data!==null)
@@ -125,7 +125,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;
@@ -146,7 +146,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	protected function sortPriorities() {
 		if(!$this->_o) {
-			ksort($this->_d,SORT_NUMERIC);
+			ksort($this->_d, SORT_NUMERIC);
 			$this->_o=true;
 		}
 	}
@@ -208,7 +208,7 @@ 
 		$this->sortPriorities();
 		$this->_fd=array();
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -222,11 +222,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
+		if($index >= 0 && $index < $this->getCount()) {
 			$arr=$this->flattenPriorities();
 			return $arr[$index];
 		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -238,9 +238,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;
 	}
 
 	/**
@@ -249,14 +249,14 @@ 
 	 * @param numeric the priority which to index.  no parameter or null will result in the default priority
 	 * @return mixed the element at the offset, false if no element is found at the offset
 	 */
-	public function itemAtIndexInPriority($index,$priority=null)
+	public function itemAtIndexInPriority($index, $priority=null)
 	{
 		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
 			);
 	}
 
@@ -268,12 +268,12 @@ 
 	 * @return int the index within the flattened array
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($item,$priority=null)
+	public function add($item, $priority=null)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		return $this->insertAtIndexInPriority($item,false,$priority,true);
+		return $this->insertAtIndexInPriority($item, false, $priority, true);
 	}
 
 	/**
@@ -284,15 +284,15 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityAt($index,true))!==false)
-			$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		if(($priority=$this->priorityAt($index, true))!==false)
+			$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -305,54 +305,54 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
+	public function insertAtIndexInPriority($item, $index=false, $priority=null, $preserveCache=false)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		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;
 			} else if(isset($this->_d[$priority])) {
-				$c=$index+$cc;
-				array_splice($this->_d[$priority],$index,0,array($item));
+				$c=$index + $cc;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
-				$c = $cc;
-				$this->_o = false;
+				$c=$cc;
+				$this->_o=false;
 				$this->_d[$priority]=array($item);
 			}
 
-			if($this->_fd&&is_array($this->_fd)) // if there is a flattened array cache
-				array_splice($this->_fd,$c,0,array($item));
+			if($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
+				array_splice($this->_fd, $c, 0, array($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;
 			} else if(isset($this->_d[$priority])) {
 				$cc=$index;
-				array_splice($this->_d[$priority],$index,0,array($item));
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
 				$cc=0;
 				$this->_o=false;
 				$this->_d[$priority]=array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
-				array_splice($this->_fd,$cc,0,array($item));
+			if($this->_fd && is_array($this->_fd) && count($this->_d)==1)
+				array_splice($this->_fd, $cc, 0, array($item));
 			else
 				$this->_fd=null;
 		}
@@ -373,22 +373,22 @@ 
 	 * @return integer index within the flattened list at which the item is being removed
 	 * @throws TInvalidDataValueException If the item does not exist
 	 */
-	public function remove($item,$priority=false)
+	public function remove($item, $priority=false)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($p=$this->priorityOf($item,true))!==false)
+		if(($p=$this->priorityOf($item, true))!==false)
 		{
 			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');
 			}
-			$this->removeAtIndexInPriority($p[1],$p[0]);
+			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
 		}
 		else
@@ -405,11 +405,11 @@ 
 	public function removeAt($index)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		if(($priority=$this->priorityAt($index, true))!==false)
-			return $this->removeAtIndexInPriority($priority[1],$priority[0]);
-		throw new TInvalidDataValueException('list_index_invalid',$index);
+			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -423,17 +423,17 @@ 
 	public function removeAtIndexInPriority($index, $priority=null)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		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
-		$value=array_splice($this->_d[$priority],$index,1);
+		$value=array_splice($this->_d[$priority], $index, 1);
 		$value=$value[0];
 
 		if(!count($this->_d[$priority]))
@@ -450,12 +450,12 @@ 
 	public function clear()
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		$d=array_reverse($this->_d,true);
+		$d=array_reverse($this->_d, true);
 		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+			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;
 	}
 
 	/**
@@ -475,7 +475,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->flattenPriorities(),true))===false)
+		if(($index=array_search($item, $this->flattenPriorities(), true))===false)
 			return -1;
 		else
 			return $index;
@@ -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) {
+			if(($index=array_search($item, $items, true))!==false) {
 				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($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())
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		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?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 		}
 		return false;
 	}
@@ -544,12 +544,12 @@ 
 	public function insertBefore($indexitem, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if(($priority=$this->priorityOf($indexitem, true))===false)
 			throw new TInvalidDataValueException('list_item_inexistent');
 
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 
 		return $priority[2];
 	}
@@ -565,14 +565,14 @@ 
 	public function insertAfter($indexitem, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		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;
 	}
 
 	/**
@@ -599,15 +599,15 @@ 
 	 * @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.
 	 */
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -619,15 +619,15 @@ 
 	 * @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.
 	 */
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -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);
+					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} else if(is_array($data)||$data instanceof \Traversable) {
-			if($this->getCount()>0)
+		} else if(is_array($data) || $data instanceof \Traversable) {
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$item)
 				$this->add($item);
@@ -674,10 +674,10 @@ 
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+					$this->insertAtIndexInPriority($item, false, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof \Traversable)
+		else if(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());
 	}
 
 	/**
@@ -721,18 +721,18 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		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);
-			$this->removeAtIndexInPriority($priority[1],$priority[0]);
+			$priority=$this->priorityAt($offset, true);
+			$this->removeAtIndexInPriority($priority[1], $priority[0]);
 		}
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 	}
 
 	/**

framework/Collections/TPriorityMap.php

Doc Comments +5 added lines, -2 removed lines

@@ -118,6 +118,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -135,6 +136,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)
 	{
@@ -152,6 +154,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param integer The precision of numeric priorities.
+	 * @param integer $value
 	 */
 	protected function setPrecision($value)
 	{
@@ -161,7 +164,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the map.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the map.
+	 * @return \ArrayIterator an iterator for traversing the items in the map.
 	 */
 	public function getIterator()
 	{
@@ -342,7 +345,7 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 * @param numeric|null priority, default: null, filled in with default priority
-	 * @return numeric priority at which the pair was added
+	 * @return string priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
 	public function add($key,$value,$priority=null)

Spacing +46 added lines, -46 removed lines

@@ -99,7 +99,7 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -138,7 +138,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -188,9 +188,9 @@ 
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd = array();
+		$this->_fd=array();
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -222,9 +222,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])||!is_array($this->_d[$priority]))
+		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
 	}
@@ -256,16 +256,16 @@ 
 	 * and numeric is a specific priority.  default: false, any priority.
 	 * @return mixed the element at the offset, null if no element is found at the offset
 	 */
-	public function itemAt($key,$priority=false)
+	public function itemAt($key, $priority=false)
 	{
-		if($priority===false){
+		if($priority===false) {
 			$map=$this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+			return isset($map[$key]) ? $map[$key] : null;
 		} else {
 			if($priority===null)
 				$priority=$this->getDefaultPriority();
-			$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-			return (isset($this->_d[$priority])&&isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
+			$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key])) ? $this->_d[$priority][$key] : null;
 		}
 	}
 
@@ -276,16 +276,16 @@ 
 	 * @param numeric|null the priority.  default: null, filled in with the default priority numeric.
 	 * @return numeric old priority of the item
 	 */
-	public function setPriorityAt($key,$priority=null)
+	public function setPriorityAt($key, $priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		$oldpriority=$this->priorityAt($key);
-		if($oldpriority!==false&&$oldpriority!=$priority) {
-			$value=$this->remove($key,$oldpriority);
-			$this->add($key,$value,$priority);
+		if($oldpriority!==false && $oldpriority!=$priority) {
+			$value=$this->remove($key, $oldpriority);
+			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
 	}
@@ -299,9 +299,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;
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+			if(($index=array_search($item, $items, true))!==false)
 				return $priority;
 		return false;
 	}
@@ -327,7 +327,7 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+			if(array_key_exists($key, $items))
 				return $priority;
 		return false;
 	}
@@ -345,16 +345,16 @@ 
 	 * @return numeric priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key,$value,$priority=null)
+	public function add($key, $value, $priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!$this->_r)
 		{
 			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+				if(array_key_exists($key, $items))
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
@@ -371,7 +371,7 @@ 
 			$this->_fd=null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
 
@@ -387,7 +387,7 @@ 
 	 * @return mixed the removed value, null if no such key exists.
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function remove($key,$priority=false)
+	public function remove($key, $priority=false)
 	{
 		if(!$this->_r)
 		{
@@ -398,7 +398,7 @@ 
 			{
 				$this->sortPriorities();
 				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+					if(array_key_exists($key, $items))
 					{
 						$value=$this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
@@ -415,8 +415,8 @@ 
 			}
 			else
 			{
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
 				{
 					$value=$this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
@@ -433,7 +433,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -453,7 +453,7 @@ 
 	public function contains($key)
 	{
 		$map=$this->flattenPriorities();
-		return isset($map[$key])||array_key_exists($key,$map);
+		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 
 	/**
@@ -474,15 +474,15 @@ 
 	 * @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.
 	 */
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -494,15 +494,15 @@ 
 	 * @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.
 	 */
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -518,20 +518,20 @@ 
 	{
 		if($data instanceof TPriorityMap)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data->getPriorities() as $priority) {
 				foreach($data->itemsAtPriority($priority) as $key => $value) {
-					$this->add($key,$value,$priority);
+					$this->add($key, $value, $priority);
 				}
 			}
 		}
-		else if(is_array($data)||$data instanceof \Traversable)
+		else if(is_array($data) || $data instanceof \Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -551,13 +551,13 @@ 
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+					$this->add($key, $value, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof \Traversable)
+		else if(is_array($data) || $data instanceof \Traversable)
 		{
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -591,9 +591,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**

Braces +9 added lines, -18 removed lines

@@ -364,13 +364,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
@@ -412,8 +410,7 @@ 
 						return $value;
 					}
 				return null;
-			}
-			else
+			} else
 			{
 				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
@@ -427,12 +424,10 @@ 
 					}
 					$this->_fd=null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 
@@ -525,15 +520,13 @@ 
 					$this->add($key,$value,$priority);
 				}
 			}
-		}
-		else if(is_array($data)||$data instanceof \Traversable)
+		} else if(is_array($data)||$data instanceof \Traversable)
 		{
 			if($this->getCount()>0)
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -553,13 +546,11 @@ 
 				foreach($data->itemsAtPriority($priority) as $key => $value)
 					$this->add($key,$value,$priority);
 			}
-		}
-		else if(is_array($data)||$data instanceof \Traversable)
+		} else if(is_array($data)||$data instanceof \Traversable)
 		{
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

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 +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 
 class TScaffoldInputBase
 {
-	const DEFAULT_ID = 'scaffold_input';
+	const DEFAULT_ID='scaffold_input';
 	private $_parent;
 
 	protected function getParent()
@@ -26,7 +26,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
@@ -48,7 +48,7 @@ 
 				return new TIbmScaffoldInput($conn);
 			default:
 				throw new TConfigurationException(
-					'scaffold_invalid_database_driver',$driver);
+					'scaffold_invalid_database_driver', $driver);
 		}
 	}
 
@@ -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

Indentation +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @link https://github.com/pradosoft/prado
  * @copyright Copyright © 2005-2016 The PRADO Group
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  */
 
 namespace Prado\Data\ActiveRecord\Scaffold;
@@ -20,7 +20,7 @@ 
  * that is called before the save() method is called on the TActiveRecord.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 interface IScaffoldEditRenderer extends \Prado\IDataRenderer

framework/Data/ActiveRecord/TActiveRecordManager.php

Doc Comments +3 added lines

@@ -76,6 +76,7 @@ 
 
 	/**
 	 * @param TDbConnection default database connection
+	 * @param \Prado\Data\TDbConnection $conn
 	 */
 	public function setDbConnection($conn)
 	{
@@ -91,6 +92,7 @@ 
 	}
 
 	/**
+	 * @param \Prado\TComponent $self
 	 * @return TActiveRecordManager static instance of record manager.
 	 */
 	public static function getInstance($self=null)
@@ -153,6 +155,7 @@ 
 	/**
 	 * Define the way an active record finder react if an invalid magic-finder invoked
 	 * @param TActiveRecordInvalidFinderResult
+	 * @param TActiveRecordInvalidFinderResult $value
 	 * @since 3.1.5
 	 * @see getInvalidFinderResult
 	 */

Spacing +9 added lines, -9 removed lines

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