pradosoft / prado

framework/Collections/TPagedList.php

Doc Comments +6 added lines

@@ -76,6 +76,7 @@ 
 	 * Constructor.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
+	 * @param integer[] $data
 	 */
 	public function __construct($data=null,$readOnly=false)
 	{
@@ -92,6 +93,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setCustomPaging($value)
 	{
@@ -139,6 +141,7 @@ 
 	 * Raises <b>OnPageIndexChanged</b> event.
 	 * This event is raised each time when the list changes to a different page.
 	 * @param TPagedListPageChangedEventParameter event parameter
+	 * @param TPagedListPageChangedEventParameter|null $param
 	 */
 	public function onPageIndexChanged($param)
 	{
@@ -151,6 +154,7 @@ 
 	 * and needs the new page of data. This event can only be raised when
 	 * {@link setCustomPaging CustomPaging} is true.
 	 * @param TPagedListFetchDataEventParameter event parameter
+	 * @param TPagedListFetchDataEventParameter $param
 	 */
 	public function onFetchData($param)
 	{
@@ -316,6 +320,7 @@ 
 
 	/**
 	 * @param mixed the item
+	 * @param integer $item
 	 * @return integer the index of the item in the list (0 based), -1 if not found.
 	 */
 	public function indexOf($item)
@@ -380,6 +385,7 @@ 
 	/**
 	 * Constructor.
 	 * @param integer old page index
+	 * @param integer $oldPage
 	 */
 	public function __construct($oldPage)
 	{

Spacing +54 added lines, -54 removed lines

@@ -58,28 +58,28 @@ 
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_customPaging=false;
+	private $_customPaging = false;
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize=10;
+	private $_pageSize = 10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex=-1;
+	private $_currentPageIndex = -1;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount=-1;
+	private $_virtualCount = -1;
 
 	/**
 	 * Constructor.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data = null, $readOnly = false)
 	{
-		parent::__construct($data,true);
+		parent::__construct($data, true);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setCustomPaging($value)
 	{
-		$this->_customPaging=TPropertyValue::ensureBoolean($value);
+		$this->_customPaging = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
-			$this->_pageSize=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) > 0)
+			$this->_pageSize = $value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
 	}
@@ -131,7 +131,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false)
+		if ($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
 			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
 	}
 
@@ -142,7 +142,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function onFetchData($param)
 	{
-		$this->raiseEvent('OnFetchData',$this,$param);
+		$this->raiseEvent('OnFetchData', $this, $param);
 	}
 
 	/**
@@ -164,21 +164,21 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex===$this->_currentPageIndex)
+		if ($pageIndex === $this->_currentPageIndex)
 			return $pageIndex;
-		if($this->_customPaging)
+		if ($this->_customPaging)
 		{
-			if($pageIndex>=0 && ($this->_virtualCount<0 || $pageIndex<$this->getPageCount()))
+			if ($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param=new TPagedListFetchDataEventParameter($pageIndex,$this->_pageSize*$pageIndex,$this->_pageSize);
+				$param = new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
-				if(($data=$param->getData())!==null)
+				if (($data = $param->getData()) !== null)
 				{
 					$this->setReadOnly(false);
 					$this->copyFrom($data);
 					$this->setReadOnly(true);
-					$oldPage=$this->_currentPageIndex;
-					$this->_currentPageIndex=$pageIndex;
+					$oldPage = $this->_currentPageIndex;
+					$this->_currentPageIndex = $pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
 				}
@@ -190,9 +190,9 @@ 
 		}
 		else
 		{
-			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
+			if ($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
-				$this->_currentPageIndex=$pageIndex;
+				$this->_currentPageIndex = $pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
 			}
@@ -207,7 +207,7 @@ 
 	 */
 	public function nextPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex+1);
+		return $this->gotoPage($this->_currentPageIndex + 1);
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 */
 	public function previousPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex-1);
+		return $this->gotoPage($this->_currentPageIndex - 1);
 	}
 
 	/**
@@ -232,9 +232,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		$this->_virtualCount=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		$this->_virtualCount = $value;
 	}
 
 	/**
@@ -242,15 +242,15 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 		{
-			if($this->_virtualCount>=0)
-				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
+			if ($this->_virtualCount >= 0)
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -258,7 +258,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		return $this->_currentPageIndex===0;
+		return $this->_currentPageIndex === 0;
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex===$this->getPageCount()-1;
+		return $this->_currentPageIndex === $this->getPageCount() - 1;
 	}
 
 	/**
@@ -274,12 +274,12 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex===$this->getPageCount()-1)
-				return parent::getCount()-$this->_pageSize*$this->_currentPageIndex;
+			if ($this->_currentPageIndex === $this->getPageCount() - 1)
+				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
 		}
@@ -290,11 +290,11 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::getIterator();
 		else
 		{
-			$data=$this->toArray();
+			$data = $this->toArray();
 			return new TListIterator($data);
 		}
 	}
@@ -308,10 +308,10 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::itemAt($index);
 		else
-			return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
 	}
 
 	/**
@@ -320,9 +320,9 @@ 
 	 */
 	public function indexOf($item)
 	{
-		$c=$this->getCount();
-		for($i=0;$i<$c;++$i)
-			if($this->itemAt($i)===$item)
+		$c = $this->getCount();
+		for ($i = 0; $i < $c; ++$i)
+			if ($this->itemAt($i) === $item)
 				return $i;
 		return -1;
 	}
@@ -335,7 +335,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -355,10 +355,10 @@ 
 	 */
 	public function toArray()
 	{
-		$c=$this->getCount();
-		$array=array();
-		for($i=0;$i<$c;++$i)
-			$array[$i]=$this->itemAt($i);
+		$c = $this->getCount();
+		$array = array();
+		for ($i = 0; $i < $c; ++$i)
+			$array[$i] = $this->itemAt($i);
 		return $array;
 	}
 }
@@ -383,7 +383,7 @@ 
 	 */
 	public function __construct($oldPage)
 	{
-		$this->_oldPage=$oldPage;
+		$this->_oldPage = $oldPage;
 	}
 
 	/**
@@ -415,7 +415,7 @@ 
 	private $_pageIndex;
 	private $_offset;
 	private $_limit;
-	private $_data=null;
+	private $_data = null;
 
 	/**
 	 * Constructor.
@@ -423,11 +423,11 @@ 
 	 * @param integer offset of the first item in the new page
 	 * @param integer number of items in the new page desired
 	 */
-	public function __construct($pageIndex,$offset,$limit)
+	public function __construct($pageIndex, $offset, $limit)
 	{
-		$this->_pageIndex=$pageIndex;
-		$this->_offset=$offset;
-		$this->_limit=$limit;
+		$this->_pageIndex = $pageIndex;
+		$this->_offset = $offset;
+		$this->_limit = $limit;
 	}
 
 	/**
@@ -467,7 +467,7 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data=$value;
+		$this->_data = $value;
 	}
 }
 

Braces +50 added lines, -42 removed lines

@@ -111,10 +111,11 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
-			$this->_pageSize=$value;
-		else
-			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
+		if(($value=TPropertyValue::ensureInteger($value))>0) {
+					$this->_pageSize=$value;
+		} else {
+					throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
+		}
 	}
 
 	/**
@@ -131,8 +132,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false)
-			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
+		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false) {
+					throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
+		}
 	}
 
 	/**
@@ -164,8 +166,9 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex===$this->_currentPageIndex)
-			return $pageIndex;
+		if($pageIndex===$this->_currentPageIndex) {
+					return $pageIndex;
+		}
 		if($this->_customPaging)
 		{
 			if($pageIndex>=0 && ($this->_virtualCount<0 || $pageIndex<$this->getPageCount()))
@@ -181,23 +184,22 @@ 
 					$this->_currentPageIndex=$pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
+				} else {
+									return false;
 				}
-				else
-					return false;
+			} else {
+							return false;
 			}
-			else
-				return false;
-		}
-		else
+		} else
 		{
 			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
 			{
 				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
+			} else {
+							return false;
 			}
-			else
-				return false;
 		}
 	}
 
@@ -232,8 +234,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		$this->_virtualCount=$value;
 	}
 
@@ -244,13 +247,14 @@ 
 	{
 		if($this->_customPaging)
 		{
-			if($this->_virtualCount>=0)
-				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
-			else
-				return -1;
+			if($this->_virtualCount>=0) {
+							return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
+			} else {
+							return -1;
+			}
+		} else {
+					return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
 		}
-		else
-			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
 	}
 
 	/**
@@ -274,14 +278,15 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_customPaging)
-			return parent::getCount();
-		else
+		if($this->_customPaging) {
+					return parent::getCount();
+		} else
 		{
-			if($this->_currentPageIndex===$this->getPageCount()-1)
-				return parent::getCount()-$this->_pageSize*$this->_currentPageIndex;
-			else
-				return $this->_pageSize;
+			if($this->_currentPageIndex===$this->getPageCount()-1) {
+							return parent::getCount()-$this->_pageSize*$this->_currentPageIndex;
+			} else {
+							return $this->_pageSize;
+			}
 		}
 	}
 
@@ -290,9 +295,9 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_customPaging)
-			return parent::getIterator();
-		else
+		if($this->_customPaging) {
+					return parent::getIterator();
+		} else
 		{
 			$data=$this->toArray();
 			return new TListIterator($data);
@@ -308,10 +313,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($this->_customPaging)
-			return parent::itemAt($index);
-		else
-			return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+		if($this->_customPaging) {
+					return parent::itemAt($index);
+		} else {
+					return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+		}
 	}
 
 	/**
@@ -321,9 +327,10 @@ 
 	public function indexOf($item)
 	{
 		$c=$this->getCount();
-		for($i=0;$i<$c;++$i)
-			if($this->itemAt($i)===$item)
+		for($i=0;$i<$c;++$i) {
+					if($this->itemAt($i)===$item)
 				return $i;
+		}
 		return -1;
 	}
 
@@ -357,8 +364,9 @@ 
 	{
 		$c=$this->getCount();
 		$array=array();
-		for($i=0;$i<$c;++$i)
-			$array[$i]=$this->itemAt($i);
+		for($i=0;$i<$c;++$i) {
+					$array[$i]=$this->itemAt($i);
+		}
 		return $array;
 	}
 }

framework/Collections/TPriorityList.php

Doc Comments +11 added lines

@@ -113,6 +113,7 @@ 
 	/**
 	 * Gets the number of items at a priority within the list
 	 * @param numeric optional priority at which to count items.  if no parameter, it will be set to the default {@link getDefaultPriority}
+	 * @param integer $priority
 	 * @return integer the number of items in the list at the specified priority
 	 */
 	public function getPriorityCount($priority=null)
@@ -137,6 +138,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)
 	{
@@ -154,6 +156,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param integer The precision of numeric priorities.
+	 * @param integer $value
 	 */
 	protected function setPrecision($value)
 	{
@@ -241,6 +244,7 @@ 
 	 * Returns the item at an index within a priority
 	 * @param integer the index into the list of items at priority
 	 * @param numeric the priority which to index.  no parameter or null will result in the default priority
+	 * @param integer $index
 	 * @return mixed the element at the offset, false if no element is found at the offset
 	 */
 	public function itemAtIndexInPriority($index,$priority=null)
@@ -275,6 +279,7 @@ 
 	 * and then inserts the item at that priority-index.
 	 * @param integer the specified position in the flattened list.
 	 * @param mixed new item to add
+	 * @param integer $index
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
@@ -456,6 +461,7 @@ 
 
 	/**
 	 * @param mixed item
+	 * @param PriorityListItem $item
 	 * @return boolean whether the list contains the item
 	 */
 	public function contains($item)
@@ -590,6 +596,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.
 	 */
@@ -610,6 +617,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.
 	 */
@@ -714,6 +722,8 @@ 
 	 * an item into a priority list doesn't mean the item is at the end of the list.
 	 * @param integer the offset to set element
 	 * @param mixed the element value
+	 * @param null|integer $offset
+	 * @param integer $item
 	 */
 	public function offsetSet($offset,$item)
 	{
@@ -733,6 +743,7 @@ 
 	 * Unsets the element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param mixed the offset to unset element
+	 * @param integer $offset
 	 */
 	public function offsetUnset($offset)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TPriorityList, TPriorityListIterator classes
- *
- * @author Brad Anderson <javalizard@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Collections
- */
+	 * TPriorityList, TPriorityListIterator classes
+	 *
+	 * @author Brad Anderson <javalizard@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Collections
+	 */
 
 /**
  * TPriorityList class

Spacing +174 added lines, -174 removed lines

@@ -50,27 +50,27 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * @var boolean indicates if the _d is currently ordered.
 	 */
-	private $_o=false;
+	private $_o = false;
 	/**
 	 * @var array cached flattened internal data storage
 	 */
-	private $_fd=null;
+	private $_fd = null;
 	/**
 	 * @var integer number of items contain within the list
 	 */
-	private $_c=0;
+	private $_c = 0;
 	/**
 	 * @var numeric the default priority of items without specified priorities
 	 */
-	private $_dp=10;
+	private $_dp = 10;
 	/**
 	 * @var integer the precision of the numeric priorities within this priority list.
 	 */
-	private $_p=8;
+	private $_p = 8;
 
 	/**
 	 * Constructor.
@@ -81,10 +81,10 @@ 
 	 * @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)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -115,13 +115,13 @@ 
 	 * @param numeric optional priority at which to count items.  if no parameter, it will be set to the default {@link getDefaultPriority}
 	 * @return integer the number of items in the list at the specified priority
 	 */
-	public function getPriorityCount($priority=null)
+	public function getPriorityCount($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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]);
 	}
@@ -140,7 +140,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
+		$this->_dp = (string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p=TPropertyValue::ensureInteger($value);
+		$this->_p = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -185,9 +185,9 @@ 
 	 * This orders the priority list internally.
 	 */
 	protected function sortPriorities() {
-		if(!$this->_o) {
-			ksort($this->_d,SORT_NUMERIC);
-			$this->_o=true;
+		if (!$this->_o) {
+			ksort($this->_d, SORT_NUMERIC);
+			$this->_o = true;
 		}
 	}
 
@@ -196,13 +196,13 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
+		if (is_array($this->_fd))
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd=array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		$this->_fd = array();
+		foreach ($this->_d as $priority => $itemsatpriority)
+			$this->_fd = array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -216,11 +216,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
-			$arr=$this->flattenPriorities();
+		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);
 	}
 
 	/**
@@ -228,13 +228,13 @@ 
 	 * @param numeric priority of the items to get.  Defaults to null, filled in with the default priority, if left blank.
 	 * @return array all items at priority in index order, null if there are no items at that priority
 	 */
-	public function itemsAtPriority($priority=null)
+	public function itemsAtPriority($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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;
 	}
 
 	/**
@@ -243,14 +243,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);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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
 			);
 	}
 
@@ -262,12 +262,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));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		return $this->insertAtIndexInPriority($item,false,$priority,true);
+		return $this->insertAtIndexInPriority($item, false, $priority, true);
 	}
 
 	/**
@@ -278,15 +278,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));
+		if ($this->getReadOnly())
+			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);
 	}
 
 	/**
@@ -299,56 +299,56 @@ 
 	 * @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));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if($preserveCache) {
+		if ($preserveCache) {
 			$this->sortPriorities();
-			$cc=0;
-			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+			$cc = 0;
+			foreach ($this->_d as $prioritykey=>$items)
+				if ($prioritykey >= $priority)
 					break;
 				else
-					$cc+=count($items);
-
-			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));
+					$cc += count($items);
+
+			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));
 			} else {
 				$c = $cc;
 				$this->_o = false;
-				$this->_d[$priority]=array($item);
+				$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])) {
-				$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));
+			$c = null;
+			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));
 			} else {
-				$cc=0;
-				$this->_o=false;
-				$this->_d[$priority]=array($item);
+				$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;
+				$this->_fd = null;
 		}
 
 		$this->_c++;
@@ -367,22 +367,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));
+		if ($this->getReadOnly())
+			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);
+			if ($priority !== false) {
+				if ($priority === null)
+					$priority = $this->getDefaultPriority();
+				$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-				if($p[0]!=$priority)
+				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
@@ -398,12 +398,12 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			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);
+		if (($priority = $this->priorityAt($index, true)) !== false)
+			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -414,27 +414,27 @@ 
 	 * @return mixed the removed item.
 	 * @throws TInvalidDataValueException If the item does not exist
 	 */
-	public function removeAtIndexInPriority($index, $priority=null)
+	public function removeAtIndexInPriority($index, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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=$value[0];
+		$value = array_splice($this->_d[$priority], $index, 1);
+		$value = $value[0];
 
-		if(!count($this->_d[$priority]))
+		if (!count($this->_d[$priority]))
 			unset($this->_d[$priority]);
 
 		$this->_c--;
-		$this->_fd=null;
+		$this->_fd = null;
 		return $value;
 	}
 
@@ -443,13 +443,13 @@ 
 	 */
 	public function clear()
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		$d=array_reverse($this->_d,true);
-		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+		$d = array_reverse($this->_d, true);
+		foreach ($this->_d as $priority=>$items) {
+			for ($index = count($items) - 1; $index >= 0; $index--)
+				$this->removeAtIndexInPriority($index, $priority);
 			unset($this->_d[$priority]);
 		}
 	}
@@ -460,7 +460,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -469,7 +469,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;
@@ -484,18 +484,18 @@ 
 	 *   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;
-		foreach($this->_d as $priority=>$items) {
-			if(($index=array_search($item,$items,true))!==false) {
-				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+		foreach ($this->_d as $priority=>$items) {
+			if (($index = array_search($item, $items, true)) !== false) {
+				$absindex += $index;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 			} else
-				$absindex+=count($items);
+				$absindex += count($items);
 		}
 
 		return false;
@@ -510,19 +510,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;
+		$absindex = $index;
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items) {
-			if($index>=($c=count($items)))
-				$index-=$c;
+		foreach ($this->_d as $priority=>$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;
 	}
@@ -537,13 +537,13 @@ 
 	 */
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			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];
 	}
@@ -558,15 +558,15 @@ 
 	 */
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			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;
 	}
 
 	/**
@@ -593,15 +593,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)
+		$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;
 	}
@@ -613,15 +613,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)
+		$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;
 	}
@@ -635,21 +635,21 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+				foreach ($data->itemsAtPriority($priority) as $index=>$item)
+					$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)
+			foreach ($data as $key=>$item)
 				$this->add($item);
-		} else if($data!==null)
+		} else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -663,21 +663,21 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+				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)
+			foreach ($data as $priority=>$item)
 				$this->add($item);
 
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -689,7 +689,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0&&$offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -715,18 +715,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)
+		if ($offset === null)
 			return $this->add($item);
-		if($offset===$this->getCount()) {
-			$priority=$this->priorityAt($offset-1,true);
+		if ($offset === $this->getCount()) {
+			$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]);
 	}
 
 	/**

Braces +151 added lines, -105 removed lines

@@ -84,8 +84,9 @@ 
 	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
 	{
 		parent::__construct();
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
 		$this->setDefaultPriority($defaultPriority);
@@ -117,12 +118,14 @@ 
 	 */
 	public function getPriorityCount($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
-		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
-			return false;
+		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority])) {
+					return false;
+		}
 		return count($this->_d[$priority]);
 	}
 
@@ -196,13 +199,15 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
-			return $this->_fd;
+		if(is_array($this->_fd)) {
+					return $this->_fd;
+		}
 
 		$this->sortPriorities();
 		$this->_fd=array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		}
 		return $this->_fd;
 	}
 
@@ -219,8 +224,9 @@ 
 		if($index>=0&&$index<$this->getCount()) {
 			$arr=$this->flattenPriorities();
 			return $arr[$index];
-		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 	}
 
 	/**
@@ -230,8 +236,9 @@ 
 	 */
 	public function itemsAtPriority($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
 		return isset($this->_d[$priority])?$this->_d[$priority]:null;
@@ -245,8 +252,9 @@ 
 	 */
 	public function itemAtIndexInPriority($index,$priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		return !isset($this->_d[$priority])?false:(
@@ -264,8 +272,9 @@ 
 	 */
 	public function add($item,$priority=null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
 		return $this->insertAtIndexInPriority($item,false,$priority,true);
 	}
@@ -280,13 +289,15 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
-		if(($priority=$this->priorityAt($index,true))!==false)
-			$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
-		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		if(($priority=$this->priorityAt($index,true))!==false) {
+					$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 	}
 
 	/**
@@ -301,21 +312,25 @@ 
 	 */
 	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc=0;
-			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+			foreach($this->_d as $prioritykey=>$items) {
+							if($prioritykey>=$priority)
 					break;
-				else
-					$cc+=count($items);
+			}
+				else {
+									$cc+=count($items);
+				}
 
 			if($index===false&&isset($this->_d[$priority])) {
 				$c=count($this->_d[$priority]);
@@ -330,8 +345,10 @@ 
 				$this->_d[$priority]=array($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,array($item));
+			}
 		} else {
 			$c=null;
 			if($index===false&&isset($this->_d[$priority])) {
@@ -345,10 +362,11 @@ 
 				$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));
-			else
-				$this->_fd=null;
+			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1) {
+							array_splice($this->_fd,$cc,0,array($item));
+			} else {
+							$this->_fd=null;
+			}
 		}
 
 		$this->_c++;
@@ -369,24 +387,27 @@ 
 	 */
 	public function remove($item,$priority=false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
 		if(($p=$this->priorityOf($item,true))!==false)
 		{
 			if($priority!==false) {
-				if($priority===null)
-					$priority=$this->getDefaultPriority();
+				if($priority===null) {
+									$priority=$this->getDefaultPriority();
+				}
 				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
-				if($p[0]!=$priority)
-					throw new TInvalidDataValueException('list_item_inexistent');
+				if($p[0]!=$priority) {
+									throw new TInvalidDataValueException('list_item_inexistent');
+				}
 			}
 			$this->removeAtIndexInPriority($p[1],$p[0]);
 			return $p[2];
+		} else {
+					throw new TInvalidDataValueException('list_item_inexistent');
 		}
-		else
-			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 
 	/**
@@ -398,11 +419,13 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
-		if(($priority=$this->priorityAt($index, true))!==false)
-			return $this->removeAtIndexInPriority($priority[1],$priority[0]);
+		if(($priority=$this->priorityAt($index, true))!==false) {
+					return $this->removeAtIndexInPriority($priority[1],$priority[0]);
+		}
 		throw new TInvalidDataValueException('list_index_invalid',$index);
 	}
 
@@ -416,22 +439,26 @@ 
 	 */
 	public function removeAtIndexInPriority($index, $priority=null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
-		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority]))
-			throw new TInvalidDataValueException('list_item_inexistent');
+		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=$value[0];
 
-		if(!count($this->_d[$priority]))
-			unset($this->_d[$priority]);
+		if(!count($this->_d[$priority])) {
+					unset($this->_d[$priority]);
+		}
 
 		$this->_c--;
 		$this->_fd=null;
@@ -443,13 +470,15 @@ 
 	 */
 	public function clear()
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
 		$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]);
 		}
 	}
@@ -469,10 +498,11 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->flattenPriorities(),true))===false)
-			return -1;
-		else
-			return $index;
+		if(($index=array_search($item,$this->flattenPriorities(),true))===false) {
+					return -1;
+		} else {
+					return $index;
+		}
 	}
 
 	/**
@@ -494,8 +524,9 @@ 
 				$absindex+=$index;
 				return $withindex?array($priority,$index,$absindex,
 						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
-			} else
-				$absindex+=count($items);
+			} else {
+							$absindex+=count($items);
+			}
 		}
 
 		return false;
@@ -512,17 +543,19 @@ 
 	 */
 	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)))
-				$index-=$c;
-			else
-				return $withindex?array($priority,$index,$absindex,
+			if($index>=($c=count($items))) {
+							$index-=$c;
+			} else {
+							return $withindex?array($priority,$index,$absindex,
 						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+			}
 		}
 		return false;
 	}
@@ -537,11 +570,13 @@ 
 	 */
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if(($priority=$this->priorityOf($indexitem,true))===false) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 
 		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
 
@@ -558,11 +593,13 @@ 
 	 */
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if(($priority=$this->priorityOf($indexitem,true))===false) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 
 		$this->insertAtIndexInPriority($item,$priority[1]+1,$priority[0]);
 
@@ -599,8 +636,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
-				break;
+			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority) {
+							break;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -619,8 +657,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
-				continue;
+			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority) {
+							continue;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -637,20 +676,25 @@ 
 	{
 		if($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
-				$this->clear();
+			if($this->getCount()>0) {
+							$this->clear();
+			}
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+				foreach($data->itemsAtPriority($priority) as $index=>$item) {
+									$this->insertAtIndexInPriority($item,$index,$priority);
+				}
 			}
 		} else if(is_array($data)||$data instanceof Traversable) {
-			if($this->getCount()>0)
-				$this->clear();
-			foreach($data as $key=>$item)
-				$this->add($item);
-		} else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
+			if($this->getCount()>0) {
+							$this->clear();
+			}
+			foreach($data as $key=>$item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
+		}
 	}
 
 	/**
@@ -667,18 +711,19 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+				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);
+			foreach($data as $priority=>$item) {
+							$this->add($item);
+			}
 
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
 	/**
@@ -717,8 +762,9 @@ 
 	 */
 	public function offsetSet($offset,$item)
 	{
-		if($offset===null)
-			return $this->add($item);
+		if($offset===null) {
+					return $this->add($item);
+		}
 		if($offset===$this->getCount()) {
 			$priority=$this->priorityAt($offset-1,true);
 			$priority[1]++;

framework/Collections/TPriorityMap.php

Doc Comments +8 added lines, -1 removed lines

@@ -114,6 +114,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -131,6 +132,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)
 	{
@@ -148,6 +150,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param integer The precision of numeric priorities.
+	 * @param integer $value
 	 */
 	protected function setPrecision($value)
 	{
@@ -270,6 +273,8 @@ 
 	 * This method is exactly the same as {@link offsetGet}.
 	 * @param mixed the key
 	 * @param numeric|null the priority.  default: null, filled in with the default priority numeric.
+	 * @param string $key
+	 * @param integer $priority
 	 * @return numeric old priority of the item
 	 */
 	public function setPriorityAt($key,$priority=null)
@@ -338,7 +343,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)
@@ -467,6 +472,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.
 	 */
@@ -487,6 +493,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 +113 added lines, -113 removed lines

@@ -60,31 +60,31 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r=false;
+	private $_r = false;
 	/**
 	 * @var boolean indicates if the _d is currently ordered.
 	 */
-	private $_o=false;
+	private $_o = false;
 	/**
 	 * @var array cached flattened internal data storage
 	 */
-	private $_fd=null;
+	private $_fd = null;
 	/**
 	 * @var integer number of items contain within the map
 	 */
-	private $_c=0;
+	private $_c = 0;
 	/**
 	 * @var numeric the default priority of items without specified priorities
 	 */
-	private $_dp=10;
+	private $_dp = 10;
 	/**
 	 * @var integer the precision of the numeric priorities within this priority list.
 	 */
-	private $_p=8;
+	private $_p = 8;
 
 	/**
 	 * Constructor.
@@ -95,9 +95,9 @@ 
 	 * @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)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -117,7 +117,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp = (string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p=TPropertyValue::ensureInteger($value);
+		$this->_p = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 	 * Orders the priority list internally.
 	 */
 	protected function sortPriorities() {
-		if(!$this->_o) {
+		if (!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
-			$this->_o=true;
+			$this->_o = true;
 		}
 	}
 
@@ -180,12 +180,12 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
+		if (is_array($this->_fd))
 			return $this->_fd;
 
 		$this->sortPriorities();
 		$this->_fd = array();
-		foreach($this->_d as $priority => $itemsatpriority)
+		foreach ($this->_d as $priority => $itemsatpriority)
 			$this->_fd = array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
@@ -214,13 +214,13 @@ 
 	 * it will be set to the default {@link getDefaultPriority}
 	 * @return integer the number of items in the map at the specified priority
 	 */
-	public function getPriorityCount($priority=null)
+	public function getPriorityCount($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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]);
 	}
@@ -252,16 +252,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){
-			$map=$this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+		if ($priority === false) {
+			$map = $this->flattenPriorities();
+			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;
+			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;
 		}
 	}
 
@@ -272,16 +272,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);
-
-		$oldpriority=$this->priorityAt($key);
-		if($oldpriority!==false&&$oldpriority!=$priority) {
-			$value=$this->remove($key,$oldpriority);
-			$this->add($key,$value,$priority);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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);
 		}
 		return $oldpriority;
 	}
@@ -291,13 +291,13 @@ 
 	 * @param numeric priority of the items to get.  Defaults to null, filled in with the default priority, if left blank.
 	 * @return array all items at priority in index order, null if there are no items at that priority
 	 */
-	public function itemsAtPriority($priority=null)
+	public function itemsAtPriority($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$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;
 	}
 
 	/**
@@ -308,8 +308,8 @@ 
 	public function priorityOf($item)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+		foreach ($this->_d as $priority=>$items)
+			if (($index = array_search($item, $items, true)) !== false)
 				return $priority;
 		return false;
 	}
@@ -322,8 +322,8 @@ 
 	public function priorityAt($key)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+		foreach ($this->_d as $priority=>$items)
+			if (array_key_exists($key, $items))
 				return $priority;
 		return false;
 	}
@@ -341,33 +341,33 @@ 
 	 * @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);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+			foreach ($this->_d as $innerpriority=>$items)
+				if (array_key_exists($key, $items))
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
-					if(count($this->_d[$innerpriority])===0)
+					if (count($this->_d[$innerpriority]) === 0)
 						unset($this->_d[$innerpriority]);
 				}
-			if(!isset($this->_d[$priority])) {
-				$this->_d[$priority]=array($key=>$value);
-				$this->_o=false;
+			if (!isset($this->_d[$priority])) {
+				$this->_d[$priority] = array($key=>$value);
+				$this->_o = false;
 			}
 			else
-				$this->_d[$priority][$key]=$value;
+				$this->_d[$priority][$key] = $value;
 			$this->_c++;
-			$this->_fd=null;
+			$this->_fd = null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
 
@@ -383,45 +383,45 @@ 
 	 * @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)
+		if (!$this->_r)
 		{
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
+			if ($priority === null)
+				$priority = $this->getDefaultPriority();
 
-			if($priority===false)
+			if ($priority === false)
 			{
 				$this->sortPriorities();
-				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+				foreach ($this->_d as $priority=>$items)
+					if (array_key_exists($key, $items))
 					{
-						$value=$this->_d[$priority][$key];
+						$value = $this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
-						if(count($this->_d[$priority])===0)
+						if (count($this->_d[$priority]) === 0)
 						{
 							unset($this->_d[$priority]);
-							$this->_o=false;
+							$this->_o = false;
 						}
-						$this->_fd=null;
+						$this->_fd = null;
 						return $value;
 					}
 				return null;
 			}
 			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];
+					$value = $this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
 					$this->_c--;
-					if(count($this->_d[$priority])===0) {
+					if (count($this->_d[$priority]) === 0) {
 						unset($this->_d[$priority]);
-						$this->_o=false;
+						$this->_o = false;
 					}
-					$this->_fd=null;
+					$this->_fd = null;
 					return $value;
 				}
 				else
@@ -429,7 +429,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -437,8 +437,8 @@ 
 	 */
 	public function clear()
 	{
-		foreach($this->_d as $priority=>$items)
-			foreach(array_keys($items) as $key)
+		foreach ($this->_d as $priority=>$items)
+			foreach (array_keys($items) as $key)
 				$this->remove($key);
 	}
 
@@ -448,8 +448,8 @@ 
 	 */
 	public function contains($key)
 	{
-		$map=$this->flattenPriorities();
-		return isset($map[$key])||array_key_exists($key,$map);
+		$map = $this->flattenPriorities();
+		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 
 	/**
@@ -470,15 +470,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)
+		$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;
 	}
@@ -490,15 +490,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)
+		$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;
 	}
@@ -512,24 +512,24 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if($data instanceof TPriorityMap)
+		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);
+			foreach ($data->getPriorities() as $priority) {
+				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)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -542,20 +542,20 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if($data instanceof TPriorityMap)
+		if ($data instanceof TPriorityMap)
 		{
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+				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);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -587,9 +587,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 +84 added lines, -64 removed lines

@@ -97,8 +97,9 @@ 
 	 */
 	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
 		$this->setDefaultPriority($defaultPriority);
@@ -180,13 +181,15 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
-			return $this->_fd;
+		if(is_array($this->_fd)) {
+					return $this->_fd;
+		}
 
 		$this->sortPriorities();
 		$this->_fd = array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		}
 		return $this->_fd;
 	}
 
@@ -216,12 +219,14 @@ 
 	 */
 	public function getPriorityCount($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
-		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority]))
-			return false;
+		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority])) {
+					return false;
+		}
 		return count($this->_d[$priority]);
 	}
 
@@ -258,8 +263,9 @@ 
 			$map=$this->flattenPriorities();
 			return isset($map[$key])?$map[$key]:null;
 		} else {
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
+			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;
 		}
@@ -274,8 +280,9 @@ 
 	 */
 	public function setPriorityAt($key,$priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
 		$oldpriority=$this->priorityAt($key);
@@ -293,8 +300,9 @@ 
 	 */
 	public function itemsAtPriority($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
 		return isset($this->_d[$priority])?$this->_d[$priority]:null;
@@ -308,9 +316,10 @@ 
 	public function priorityOf($item)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+		foreach($this->_d as $priority=>$items) {
+					if(($index=array_search($item,$items,true))!==false)
 				return $priority;
+		}
 		return false;
 	}
 
@@ -322,9 +331,10 @@ 
 	public function priorityAt($key)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+		foreach($this->_d as $priority=>$items) {
+					if(array_key_exists($key,$items))
 				return $priority;
+		}
 		return false;
 	}
 
@@ -343,31 +353,34 @@ 
 	 */
 	public function add($key,$value,$priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 
 		if(!$this->_r)
 		{
-			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+			foreach($this->_d as $innerpriority=>$items) {
+							if(array_key_exists($key,$items))
 				{
 					unset($this->_d[$innerpriority][$key]);
+			}
 					$this->_c--;
-					if(count($this->_d[$innerpriority])===0)
-						unset($this->_d[$innerpriority]);
+					if(count($this->_d[$innerpriority])===0) {
+											unset($this->_d[$innerpriority]);
+					}
 				}
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
+			} else {
+							$this->_d[$priority][$key]=$value;
 			}
-			else
-				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
+		} else {
+					throw new TInvalidOperationException('map_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
 
@@ -387,16 +400,18 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
+			if($priority===null) {
+							$priority=$this->getDefaultPriority();
+			}
 
 			if($priority===false)
 			{
 				$this->sortPriorities();
-				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+				foreach($this->_d as $priority=>$items) {
+									if(array_key_exists($key,$items))
 					{
 						$value=$this->_d[$priority][$key];
+				}
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
 						if(count($this->_d[$priority])===0)
@@ -408,8 +423,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])))
@@ -423,13 +437,13 @@ 
 					}
 					$this->_fd=null;
 					return $value;
+				} else {
+									return null;
 				}
-				else
-					return null;
 			}
+		} else {
+					throw new TInvalidOperationException('map_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 
 	/**
@@ -437,9 +451,10 @@ 
 	 */
 	public function clear()
 	{
-		foreach($this->_d as $priority=>$items)
-			foreach(array_keys($items) as $key)
+		foreach($this->_d as $priority=>$items) {
+					foreach(array_keys($items) as $key)
 				$this->remove($key);
+		}
 	}
 
 	/**
@@ -476,8 +491,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
-				break;
+			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority) {
+							break;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -496,8 +512,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
-				continue;
+			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority) {
+							continue;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -514,23 +531,25 @@ 
 	{
 		if($data instanceof TPriorityMap)
 		{
-			if($this->getCount()>0)
-				$this->clear();
+			if($this->getCount()>0) {
+							$this->clear();
+			}
 			foreach($data->getPriorities() as $priority) {
 				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)
 		{
-			if($this->getCount()>0)
-				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			if($this->getCount()>0) {
+							$this->clear();
+			}
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
 	/**
@@ -546,17 +565,18 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+				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);
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
 	/**

framework/Collections/TQueue.php

Doc Comments +3 added lines

@@ -49,6 +49,7 @@ 
 	 * Constructor.
 	 * Initializes the queue with an array or an iterable object.
 	 * @param array|Iterator the intial data. Default is null, meaning no initialization.
+	 * @param integer[] $data
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
 	public function __construct($data=null)
@@ -97,6 +98,7 @@ 
 
 	/**
 	 * @param mixed the item
+	 * @param integer $item
 	 * @return boolean whether the queue contains the item
 	 */
 	public function contains($item)
@@ -137,6 +139,7 @@ 
 	/**
 	 * Adds an object to the end of the queue.
 	 * @param mixed the item to be appended into the queue
+	 * @param integer $item
 	 */
 	public function enqueue($item)
 	{

Spacing +20 added lines, -20 removed lines

@@ -32,18 +32,18 @@ 
  * @package System.Collections
  * @since 3.1
  */
-class TQueue extends TComponent implements IteratorAggregate,Countable
+class TQueue extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c=0;
+	private $_c = 0;
 
 	/**
 	 * Constructor.
@@ -51,9 +51,9 @@ 
 	 * @param array|Iterator the intial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null)
+	public function __construct($data = null)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 
@@ -73,16 +73,16 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
-				$this->_d[]=$item;
+				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
@@ -91,8 +91,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c=0;
-		$this->_d=array();
+		$this->_c = 0;
+		$this->_d = array();
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true) !== false;
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 			return $this->_d[0];
@@ -125,7 +125,7 @@ 
 	 */
 	public function dequeue()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 		{
@@ -151,7 +151,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -207,9 +207,9 @@ 
 	 */
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

Braces +13 added lines, -11 removed lines

@@ -53,8 +53,9 @@ 
 	 */
 	public function __construct($data=null)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 	}
 
 	/**
@@ -81,9 +82,9 @@ 
 				$this->_d[]=$item;
 				++$this->_c;
 			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('queue_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
 	/**
@@ -112,10 +113,11 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c===0)
-			throw new TInvalidOperationException('queue_empty');
-		else
-			return $this->_d[0];
+		if($this->_c===0) {
+					throw new TInvalidOperationException('queue_empty');
+		} else {
+					return $this->_d[0];
+		}
 	}
 
 	/**
@@ -125,9 +127,9 @@ 
 	 */
 	public function dequeue()
 	{
-		if($this->_c===0)
-			throw new TInvalidOperationException('queue_empty');
-		else
+		if($this->_c===0) {
+					throw new TInvalidOperationException('queue_empty');
+		} else
 		{
 			--$this->_c;
 			return array_shift($this->_d);

framework/Collections/TStack.php

Doc Comments +1 added lines

@@ -46,6 +46,7 @@
 	 * Constructor.
 	 * Initializes the stack with an array or an iterable object.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
+	 * @param integer[] $data
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
 	public function __construct($data=null)

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TStack, TStackIterator classes
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Collections
- */
+	 * TStack, TStackIterator classes
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Collections
+	 */
 
 /**
  * TStack class

Spacing +21 added lines, -21 removed lines

@@ -29,18 +29,18 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TStack extends TComponent implements IteratorAggregate,Countable
+class TStack extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c=0;
+	private $_c = 0;
 
 	/**
 	 * Constructor.
@@ -48,9 +48,9 @@ 
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null)
+	public function __construct($data = null)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 
@@ -70,16 +70,16 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
-				$this->_d[]=$item;
+				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
@@ -88,8 +88,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c=0;
-		$this->_d=array();
+		$this->_c = 0;
+		$this->_d = array();
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true) !== false;
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('stack_empty');
 		else
-			return $this->_d[$this->_c-1];
+			return $this->_d[$this->_c - 1];
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function pop()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 		{
@@ -148,7 +148,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -204,9 +204,9 @@ 
 	 */
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 
 	/**
@@ -215,7 +215,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

Braces +13 added lines, -11 removed lines

@@ -50,8 +50,9 @@ 
 	 */
 	public function __construct($data=null)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 	}
 
 	/**
@@ -78,9 +79,9 @@ 
 				$this->_d[]=$item;
 				++$this->_c;
 			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('stack_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
 	/**
@@ -109,10 +110,11 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c===0)
-			throw new TInvalidOperationException('stack_empty');
-		else
-			return $this->_d[$this->_c-1];
+		if($this->_c===0) {
+					throw new TInvalidOperationException('stack_empty');
+		} else {
+					return $this->_d[$this->_c-1];
+		}
 	}
 
 	/**
@@ -122,9 +124,9 @@ 
 	 */
 	public function pop()
 	{
-		if($this->_c===0)
-			throw new TInvalidOperationException('stack_empty');
-		else
+		if($this->_c===0) {
+					throw new TInvalidOperationException('stack_empty');
+		} else
 		{
 			--$this->_c;
 			return array_pop($this->_d);

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

@@ -87,7 +87,7 @@ 
 	private $_association;
 	private $_sourceTable;
 	private $_foreignTable;
-	private $_association_columns=array();
+	private $_association_columns = array();
 
 	/**
 	* Get the foreign key index values from the results and make calls to the
@@ -99,7 +99,7 @@ 
 		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();
 		$properties = array_values($sourceKeys);
 		$indexValues = $this->getIndexValues($properties, $results);
-		$this->fetchForeignObjects($results, $foreignKeys,$indexValues,$sourceKeys);
+		$this->fetchForeignObjects($results, $foreignKeys, $indexValues, $sourceKeys);
 	}
 
 	/**
@@ -119,16 +119,16 @@ 
 	 */
 	protected function getAssociationTable()
 	{
-		if($this->_association===null)
+		if ($this->_association === null)
 		{
 			$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)
+			if (count($table) > 1)
 			{
 				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
-				$this->_association_columns = preg_split('/\s*[, ]\*/',$columns);
+				$this->_association_columns = preg_split('/\s*[, ]\*/', $columns);
 			}
 			$this->_association = $gateway->getTableInfo($conn, $table[0]);
 		}
@@ -140,7 +140,7 @@ 
 	 */
 	protected function getSourceTable()
 	{
-		if($this->_sourceTable===null)
+		if ($this->_sourceTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
@@ -153,7 +153,7 @@ 
 	 */
 	protected function getForeignTable()
 	{
-		if($this->_foreignTable===null)
+		if ($this->_foreignTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$fkObject = $this->getContext()->getForeignRecordFinder();
@@ -185,20 +185,20 @@ 
 	 * @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);
+		$command = $this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
 		$srcProps = array_keys($sourceKeys);
-		$collections=array();
-		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
+		$collections = array();
+		foreach ($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
+			foreach ($srcProps as $column)
 				unset($row[$column]);
-			$obj = $this->createFkObject($type,$row,$foreignKeys);
+			$obj = $this->createFkObject($type, $row, $foreignKeys);
 			$collections[$hash][] = $obj;
 		}
 		$this->setResultCollection($results, $collections, array_values($sourceKeys));
@@ -210,13 +210,13 @@ 
 	 * @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);
-		if(count($this->_association_columns) > 0)
+		if (count($this->_association_columns) > 0)
 		{
-			$i=0;
-			foreach($foreignKeys as $ref=>$fk)
+			$i = 0;
+			foreach ($foreignKeys as $ref=>$fk)
 				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
 		}
 		return $obj;
@@ -228,13 +228,13 @@ 
 	 * @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);
+		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where=$criteria->getCondition())===null)
-			$where='1=1';
+		if (($where = $criteria->getCondition()) === null)
+			$where = '1=1';
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
 		$parameters = $criteria->getParameters()->toArray();
@@ -243,7 +243,7 @@ 
 		$offset = $criteria->getOffset();
 
 		$builder = $this->getForeignCommandBuilder()->getBuilder();
-		$command = $builder->applyCriterias($sql,$parameters,$ordering,$limit,$offset);
+		$command = $builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 		$this->getCommandBuilder()->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -254,12 +254,12 @@ 
 	 */
 	protected function getSourceColumns($sourceKeys)
 	{
-		$columns=array();
+		$columns = array();
 		$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();
+		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
+		foreach ($columnNames as $name)
+			$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -270,9 +270,9 @@ 
 	 * @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();
+		$refInfo = $this->getAssociationTable();
 		$fkInfo = $this->getForeignTable();
 
 		$refTable = $refInfo->getTableFullName();
@@ -280,10 +280,10 @@ 
 
 		$joins = array();
 		$hasAssociationColumns = count($this->_association_columns) > 0;
-		$i=0;
-		foreach($foreignKeys as $ref=>$fk)
+		$i = 0;
+		foreach ($foreignKeys as $ref=>$fk)
 		{
-			if($hasAssociationColumns)
+			if ($hasAssociationColumns)
 				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
 				$refField = $refInfo->getColumn($ref)->getColumnName();
@@ -291,7 +291,7 @@ 
 			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
 		$joinCondition = implode(' AND ', $joins);
-		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo,array_keys($sourceKeys), $indexValues);
+		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
 		return "INNER JOIN {$refTable} ON ({$joinCondition}) AND {$index}";
 	}
 
@@ -303,12 +303,12 @@ 
 	{
 		$obj = $this->getContext()->getSourceRecord();
 		$fkObjects = &$obj->{$this->getContext()->getProperty()};
-		$success=true;
-		if(($total = count($fkObjects))> 0)
+		$success = true;
+		if (($total = count($fkObjects)) > 0)
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
+			for ($i = 0; $i < $total; $i++)
 				$success = $fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
@@ -324,33 +324,33 @@ 
 		return $this->getAssociationTable()->createCommandBuilder($conn);
 	}
 
-	private function hasAssociationData($builder,$data)
+	private function hasAssociationData($builder, $data)
 	{
-		$condition=array();
+		$condition = array();
 		$table = $this->getAssociationTable();
-		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
-		$command = $builder->createCountCommand(implode(' AND ', $condition),array_values($data));
+		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()));
 		return intval($result) > 0;
 	}
 
-	private function addAssociationData($builder,$data)
+	private function addAssociationData($builder, $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]);
-		$success=true;
-		foreach($fkObjects as $fkObject)
+		$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;
 	}
@@ -360,16 +360,16 @@ 
 		$sourceKeys = $this->findForeignKeys($this->getAssociationTable(), $obj);
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = array();
-		$i=0;
-		foreach($sourceKeys as $name=>$srcKey)
+		$i = 0;
+		foreach ($sourceKeys as $name=>$srcKey)
 			$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 = array();
+		foreach ($foreignKeys as $name=>$fKey)
 			$data[$name] = $fkObject->getColumnValue($fKey);
 		return $data;
 	}

Braces +32 added lines, -22 removed lines

@@ -196,8 +196,9 @@ 
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
-				unset($row[$column]);
+			foreach($srcProps as $column) {
+							unset($row[$column]);
+			}
 			$obj = $this->createFkObject($type,$row,$foreignKeys);
 			$collections[$hash][] = $obj;
 		}
@@ -216,8 +217,9 @@ 
 		if(count($this->_association_columns) > 0)
 		{
 			$i=0;
-			foreach($foreignKeys as $ref=>$fk)
-				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			foreach($foreignKeys as $ref=>$fk) {
+							$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			}
 		}
 		return $obj;
 	}
@@ -233,8 +235,9 @@ 
 		$innerJoin = $this->getAssociationJoin($foreignKeys,$indexValues,$sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where=$criteria->getCondition())===null)
-			$where='1=1';
+		if(($where=$criteria->getCondition())===null) {
+					$where='1=1';
+		}
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
 		$parameters = $criteria->getParameters()->toArray();
@@ -258,8 +261,9 @@ 
 		$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();
+		foreach($columnNames as $name) {
+					$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+		}
 		return implode(', ', $columns);
 	}
 
@@ -283,10 +287,11 @@ 
 		$i=0;
 		foreach($foreignKeys as $ref=>$fk)
 		{
-			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
-			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
+			if($hasAssociationColumns) {
+							$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+			} else {
+							$refField = $refInfo->getColumn($ref)->getColumnName();
+			}
 			$fkField = $fkInfo->getColumn($fk)->getColumnName();
 			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
@@ -308,8 +313,9 @@ 
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			for($i=0;$i<$total;$i++) {
+							$success = $fkObjects[$i]->save() && $success;
+			}
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -328,8 +334,9 @@ 
 	{
 		$condition=array();
 		$table = $this->getAssociationTable();
-		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
+		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()));
 		return intval($result) > 0;
@@ -349,8 +356,9 @@ 
 		foreach($fkObjects as $fkObject)
 		{
 			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys,$fkObject));
-			if(!$this->hasAssociationData($builder,$data))
-				$success = $this->addAssociationData($builder,$data) && $success;
+			if(!$this->hasAssociationData($builder,$data)) {
+							$success = $this->addAssociationData($builder,$data) && $success;
+			}
 		}
 		return $success;
 	}
@@ -361,16 +369,18 @@ 
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = array();
 		$i=0;
-		foreach($sourceKeys as $name=>$srcKey)
-			$data[$name] = $indexValues[0][$i++];
+		foreach($sourceKeys as $name=>$srcKey) {
+					$data[$name] = $indexValues[0][$i++];
+		}
 		return $data;
 	}
 
 	private function getForeignObjectValues($foreignKeys,$fkObject)
 	{
 		$data=array();
-		foreach($foreignKeys as $name=>$fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+		foreach($foreignKeys as $name=>$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 +29 added lines, -29 removed lines

@@ -71,21 +71,21 @@ 
 	 * @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();
+		static $stack = array();
 
-		$results = call_user_func_array(array($this->getSourceRecord(),$method),$args);
+		$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)
+		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)
+		else if ($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
-		else if($results === null || !$validArray)
+		else if ($results === null || !$validArray)
 			$stack = array();
 		return $results;
 	}
@@ -108,24 +108,24 @@ 
 	 * @param TActiveRecord $matchesRecord
 	 * @return array foreign keys with source column names as key and foreign column names as value.
 	 */
-	protected function findForeignKeys($from, $matchesRecord, $loose=false)
+	protected function findForeignKeys($from, $matchesRecord, $loose = false)
 	{
 		$gateway = $matchesRecord->getRecordGateway();
 		$recordTableInfo = $gateway->getRecordTableInfo($matchesRecord);
 		$matchingTableName = strtolower($recordTableInfo->getTableName());
 		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
-		$tableInfo=$from;
-		if($from instanceof TActiveRecord)
+		$tableInfo = $from;
+		if ($from instanceof TActiveRecord)
 			$tableInfo = $gateway->getRecordTableInfo($from);
 		//find first non-empty FK
-		foreach($tableInfo->getForeignKeys() as $fkeys)
+		foreach ($tableInfo->getForeignKeys() as $fkeys)
 		{
 			$fkTable = strtolower($fkeys['table']);
-			if($fkTable===$matchingTableName || $fkTable===$matchingFullTableName)
+			if ($fkTable === $matchingTableName || $fkTable === $matchingFullTableName)
 			{
 				$hasFkField = !$loose && $this->getContext()->hasFkField();
 				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
-				if(!empty($key))
+				if (!empty($key))
 					return $key;
 			}
 		}
@@ -152,9 +152,9 @@ 
 		$matching = array();
 		preg_match_all('/\s*(\S+\.)?([\w-]+)\s*/', $this->getContext()->getFkField(), $matching);
 		$fields = array();
-		foreach($fkeys as $fkName => $field)
+		foreach ($fkeys as $fkName => $field)
 		{
-			if(in_array($fkName, $matching[2]))
+			if (in_array($fkName, $matching[2]))
 				$fields[$fkName] = $field;
 		}
 		return $fields;
@@ -167,9 +167,9 @@ 
 	 */
 	protected function getObjectHash($obj, $properties)
 	{
-		$ids=array();
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		$ids = array();
+		foreach ($properties as $property)
+			$ids[] = is_object($obj) ? (string) $obj->getColumnValue($property) : (string) $obj[$property];
 		return serialize($ids);
 	}
 
@@ -193,13 +193,13 @@ 
 	 */
 	protected function getIndexValues($keys, $results)
 	{
-		if(!is_array($results) && !$results instanceof ArrayAccess)
+		if (!is_array($results) && !$results instanceof ArrayAccess)
 			$results = array($results);
-		$values=array();
-		foreach($results as $result)
+		$values = array();
+		foreach ($results as $result)
 		{
 			$value = array();
-			foreach($keys as $name)
+			foreach ($keys as $name)
 				$value[] = $result->getColumnValue($name);
 			$values[] = $value;
 		}
@@ -213,11 +213,11 @@ 
 	 * @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)
-			$collections[$this->getObjectHash($fkObject, $fields)][]=$fkObject;
+		$collections = array();
+		foreach ($fkObjects as $fkObject)
+			$collections[$this->getObjectHash($fkObject, $fields)][] = $fkObject;
 		$this->setResultCollection($results, $collections, $properties);
 	}
 
@@ -229,9 +229,9 @@ 
 	 */
 	protected function setResultCollection(&$results, &$collections, $properties)
 	{
-		if(is_array($results) || $results instanceof ArrayAccess)
+		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
@@ -248,7 +248,7 @@ 
 	{
 		$hash = $this->getObjectHash($source, $properties);
 		$prop = $this->getContext()->getProperty();
-		$source->$prop=isset($collections[$hash]) ? $collections[$hash] : array();
+		$source->$prop = isset($collections[$hash]) ? $collections[$hash] : array();
 	}
 }
 

Braces +35 added lines, -24 removed lines

@@ -80,13 +80,16 @@ 
 		if($validArray || $results instanceof ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
+			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();
 		}
-		else if($results instanceof TActiveRecordRelation)
-			$stack[] = $this; //call it later
-		else if($results === null || !$validArray)
-			$stack = array();
 		return $results;
 	}
 
@@ -115,8 +118,9 @@ 
 		$matchingTableName = strtolower($recordTableInfo->getTableName());
 		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
 		$tableInfo=$from;
-		if($from instanceof TActiveRecord)
-			$tableInfo = $gateway->getRecordTableInfo($from);
+		if($from instanceof TActiveRecord) {
+					$tableInfo = $gateway->getRecordTableInfo($from);
+		}
 		//find first non-empty FK
 		foreach($tableInfo->getForeignKeys() as $fkeys)
 		{
@@ -125,8 +129,9 @@ 
 			{
 				$hasFkField = !$loose && $this->getContext()->hasFkField();
 				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
-				if(!empty($key))
-					return $key;
+				if(!empty($key)) {
+									return $key;
+				}
 			}
 		}
 
@@ -154,8 +159,9 @@ 
 		$fields = array();
 		foreach($fkeys as $fkName => $field)
 		{
-			if(in_array($fkName, $matching[2]))
-				$fields[$fkName] = $field;
+			if(in_array($fkName, $matching[2])) {
+							$fields[$fkName] = $field;
+			}
 		}
 		return $fields;
 	}
@@ -168,8 +174,9 @@ 
 	protected function getObjectHash($obj, $properties)
 	{
 		$ids=array();
-		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		foreach($properties as $property) {
+					$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+		}
 		return serialize($ids);
 	}
 
@@ -193,14 +200,16 @@ 
 	 */
 	protected function getIndexValues($keys, $results)
 	{
-		if(!is_array($results) && !$results instanceof ArrayAccess)
-			$results = array($results);
+		if(!is_array($results) && !$results instanceof ArrayAccess) {
+					$results = array($results);
+		}
 		$values=array();
 		foreach($results as $result)
 		{
 			$value = array();
-			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
+			foreach($keys as $name) {
+							$value[] = $result->getColumnValue($name);
+			}
 			$values[] = $value;
 		}
 		return $values;
@@ -216,8 +225,9 @@ 
 	protected function populateResult(&$results,$properties,&$fkObjects,$fields)
 	{
 		$collections=array();
-		foreach($fkObjects as $fkObject)
-			$collections[$this->getObjectHash($fkObject, $fields)][]=$fkObject;
+		foreach($fkObjects as $fkObject) {
+					$collections[$this->getObjectHash($fkObject, $fields)][]=$fkObject;
+		}
 		$this->setResultCollection($results, $collections, $properties);
 	}
 
@@ -231,11 +241,12 @@ 
 	{
 		if(is_array($results) || $results instanceof ArrayAccess)
 		{
-			for($i=0,$k=count($results);$i<$k;$i++)
-				$this->setObjectProperty($results[$i], $properties, $collections);
+			for($i=0,$k=count($results);$i<$k;$i++) {
+							$this->setObjectProperty($results[$i], $properties, $collections);
+			}
+		} else {
+					$this->setObjectProperty($results, $properties, $collections);
 		}
-		else
-			$this->setObjectProperty($results, $properties, $collections);
 	}
 
 	/**

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * TActiveRecordRelation class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @version $Id$
- * @package System.Data.ActiveRecord.Relations
- */
+	 * TActiveRecordRelation class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @version $Id$
+	 * @package System.Data.ActiveRecord.Relations
+	 */
 
 /**
  * Load active record relationship context.

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

@@ -30,11 +30,11 @@ 
 	private $_relation; //data from an entry of TActiveRecord::$RELATION
 	private $_fkeys;
 
-	public function __construct($record, $property=null, $relation=null)
+	public function __construct($record, $property = null, $relation = null)
 	{
-		$this->_record=$record;
-		$this->_property=$property;
-		$this->_relation=$relation;
+		$this->_record = $record;
+		$this->_property = $property;
+		$this->_relation = $relation;
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	 */
 	public function hasRecordRelation()
 	{
-		return $this->_relation!==null;
+		return $this->_relation !== null;
 	}
 
 	public function getPropertyValue()
@@ -75,8 +75,8 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys===null)
-			$this->_fkeys=$this->getRelationHandler()->getRelationForeignKeys();
+		if ($this->_fkeys === null)
+			$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
 		return $this->_fkeys;
 	}
 
@@ -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();
 	}
 
 	/**
@@ -166,16 +166,16 @@ 
 	 * @return TActiveRecordRelation record relationship handler instnace.
 	 * @throws TActiveRecordException if property is not defined or missing.
 	 */
-	public function getRelationHandler($criteria=null)
+	public function getRelationHandler($criteria = null)
 	{
-		if(!$this->hasRecordRelation())
+		if (!$this->hasRecordRelation())
 		{
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria===null)
+		if ($criteria === null)
 			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
-		switch($this->getRelationType())
+		switch ($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
 				Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasMany');
@@ -197,19 +197,19 @@ 
 	/**
 	 * @return TActiveRecordRelationCommand
 	 */
-	public function updateAssociatedRecords($updateBelongsTo=false)
+	public function updateAssociatedRecords($updateBelongsTo = false)
 	{
-		$success=true;
-		foreach($this->_record->getRecordRelations() as $data)
+		$success = true;
+		foreach ($this->_record->getRecordRelations() as $data)
 		{
 			list($property, $relation) = $data;
-			$belongsTo = $relation[0]==TActiveRecord::BELONGS_TO;
-			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
+			$belongsTo = $relation[0] == TActiveRecord::BELONGS_TO;
+			if (($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
 				$obj = $this->getSourceRecord();
-				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
+				if (!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
-					$context = new TActiveRecordRelationContext($this->getSourceRecord(),$property,$relation);
+					$context = new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
 					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
 				}
 			}
@@ -219,10 +219,10 @@ 
 
 	protected function isEmptyFkObject($obj)
 	{
-		if(is_object($obj))
+		if (is_object($obj))
 			return $obj instanceof TList ? $obj->count() === 0 : false;
-		else if(is_array($obj))
-			return count($obj)===0;
+		else if (is_array($obj))
+			return count($obj) === 0;
 		else
 			return empty($obj);
 	}

Braces +13 added lines, -10 removed lines

@@ -75,8 +75,9 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys===null)
-			$this->_fkeys=$this->getRelationHandler()->getRelationForeignKeys();
+		if($this->_fkeys===null) {
+					$this->_fkeys=$this->getRelationHandler()->getRelationForeignKeys();
+		}
 		return $this->_fkeys;
 	}
 
@@ -173,8 +174,9 @@ 
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria===null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		if($criteria===null) {
+					$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		}
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -219,12 +221,13 @@ 
 
 	protected function isEmptyFkObject($obj)
 	{
-		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
-		else if(is_array($obj))
-			return count($obj)===0;
-		else
-			return empty($obj);
+		if(is_object($obj)) {
+					return $obj instanceof TList ? $obj->count() === 0 : false;
+		} else if(is_array($obj)) {
+					return count($obj)===0;
+		} else {
+					return empty($obj);
+		}
 	}
 }
 

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

@@ -21,51 +21,51 @@ 
 	{
 		$record->getDbConnection()->setActive(true); //must be connected before retrieving driver name!
 		$driver = $record->getDbConnection()->getDriverName();
-		switch(strtolower($driver))
+		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(
-					'scaffold_invalid_database_driver',$driver);
+					'scaffold_invalid_database_driver', $driver);
 		}
 	}
 
 	public function createScaffoldInput($parent, $item, $column, $record)
 	{
-		$this->_parent=$parent;
+		$this->_parent = $parent;
 		$item->setCustomData($column->getColumnId());
 		$this->createControl($item->_input, $column, $record);
-		if($item->_input->findControl(self::DEFAULT_ID))
+		if ($item->_input->findControl(self::DEFAULT_ID))
 			$this->createControlLabel($item->_label, $column, $record);
 	}
 
 	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);
 	}
 
 	public function loadScaffoldInput($parent, $item, $column, $record)
 	{
-		$this->_parent=$parent;
-		if($this->getIsEnabled($column, $record))
+		$this->_parent = $parent;
+		if ($this->getIsEnabled($column, $record))
 		{
 			$prop = $column->getColumnId();
 			$record->setColumnValue($prop, $this->getControlValue($item->_input, $column, $record));
@@ -81,7 +81,7 @@ 
 	protected function getRecordPropertyValue($column, $record)
 	{
 		$value = $record->getColumnValue($column->getColumnId());
-		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null)
+		if ($column->getDefaultValue() !== TDbTableColumn::UNDEFINED_VALUE && $value === null)
 			return $column->getDefaultValue();
 		else
 			return $value;

Braces +8 added lines, -6 removed lines

@@ -51,8 +51,9 @@ 
 		$this->_parent=$parent;
 		$item->setCustomData($column->getColumnId());
 		$this->createControl($item->_input, $column, $record);
-		if($item->_input->findControl(self::DEFAULT_ID))
-			$this->createControlLabel($item->_label, $column, $record);
+		if($item->_input->findControl(self::DEFAULT_ID)) {
+					$this->createControlLabel($item->_label, $column, $record);
+		}
 	}
 
 	protected function createControlLabel($label, $column, $record)
@@ -81,10 +82,11 @@ 
 	protected function getRecordPropertyValue($column, $record)
 	{
 		$value = $record->getColumnValue($column->getColumnId());
-		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null)
-			return $column->getDefaultValue();
-		else
-			return $value;
+		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null) {
+					return $column->getDefaultValue();
+		} else {
+					return $value;
+		}
 	}
 
 	protected function setRecordPropertyValue($item, $record, $input)