pradosoft / prado

framework/Collections/TMap.php

Doc Comments +2 added lines

@@ -80,6 +80,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -220,6 +221,7 @@ 
 	 * Merges iterable data into the map.
 	 * Existing data in the map will be kept and overwritten if the keys are the same.
 	 * @param mixed the data to be merged with, must be an array or object implementing Traversable
+	 * @param TMap $data
 	 * @throws TInvalidDataTypeException If data is neither an array nor an iterator.
 	 */
 	public function mergeWith($data)

Spacing +17 added lines, -17 removed lines

@@ -30,7 +30,7 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TMap extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	/**
 	 * @var array internal data storage
@@ -50,10 +50,10 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_d===array())
-			$exprops[] = "\0TMap\0_d";
-		if ($this->_r===false)
-			$exprops[] = "\0TMap\0_r";
+		if($this->_d===array())
+			$exprops[]="\0TMap\0_d";
+		if($this->_r===false)
+			$exprops[]="\0TMap\0_r";
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -93,7 +93,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -140,12 +140,12 @@ 
 	 * @param mixed value
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		if(!$this->_r)
 			$this->_d[$key]=$value;
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(isset($this->_d[$key]) || array_key_exists($key,$this->_d))
+			if(isset($this->_d[$key]) || array_key_exists($key, $this->_d))
 			{
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
@@ -168,7 +168,7 @@ 
 				return null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_d[$key]) || array_key_exists($key,$this->_d);
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
 	}
 
 	/**
@@ -207,10 +207,10 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -227,7 +227,7 @@ 
 		if(is_array($data) || $data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -261,9 +261,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 +4 added lines, -8 removed lines

@@ -163,11 +163,9 @@ 
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
-			}
-			else
+			} else
 				return null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 
@@ -211,8 +209,7 @@ 
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -228,8 +225,7 @@ 
 		{
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TPagedList.php

Doc Comments +4 added lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setCustomPaging($value)
 	{
@@ -139,6 +140,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 +153,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)
 	{
@@ -380,6 +383,7 @@ 
 	/**
 	 * Constructor.
 	 * @param integer old page index
+	 * @param integer $oldPage
 	 */
 	public function __construct($oldPage)
 	{

Spacing +22 added lines, -22 removed lines

@@ -77,9 +77,9 @@ 
 	 * @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);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
 			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_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);
 	}
 
 	/**
@@ -168,9 +168,9 @@ 
 			return $pageIndex;
 		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)
 				{
@@ -190,7 +190,7 @@ 
 		}
 		else
 		{
-			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
+			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
 				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
@@ -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,7 +232,7 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		$this->_virtualCount=$value;
 	}
@@ -244,13 +244,13 @@ 
 	{
 		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);
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex===$this->getPageCount()-1;
+		return $this->_currentPageIndex===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -278,8 +278,8 @@ 
 			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;
 		}
@@ -311,7 +311,7 @@ 
 		if($this->_customPaging)
 			return parent::itemAt($index);
 		else
-			return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	public function indexOf($item)
 	{
 		$c=$this->getCount();
-		for($i=0;$i<$c;++$i)
+		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());
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	{
 		$c=$this->getCount();
 		$array=array();
-		for($i=0;$i<$c;++$i)
+		for($i=0; $i < $c; ++$i)
 			$array[$i]=$this->itemAt($i);
 		return $array;
 	}
@@ -423,7 +423,7 @@ 
 	 * @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;

Braces +5 added lines, -10 removed lines

@@ -181,22 +181,18 @@ 
 					$this->_currentPageIndex=$pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
-				}
-				else
+				} else
 					return false;
-			}
-			else
+			} else
 				return false;
-		}
-		else
+		} else
 		{
 			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
 			{
 				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
-			}
-			else
+			} else
 				return false;
 		}
 	}
@@ -248,8 +244,7 @@ 
 				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
 			else
 				return -1;
-		}
-		else
+		} else
 			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
 	}
 

framework/Collections/TPriorityList.php

Doc Comments +4 added lines

@@ -137,6 +137,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 +155,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param integer The precision of numeric priorities.
+	 * @param integer $value
 	 */
 	protected function setPrecision($value)
 	{
@@ -590,6 +592,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 +613,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 +90 added lines, -90 removed lines

@@ -81,7 +81,7 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and is neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
 		parent::__construct();
 		if($data!==null)
@@ -119,7 +119,7 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
@@ -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);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 */
 	protected function sortPriorities() {
 		if(!$this->_o) {
-			ksort($this->_d,SORT_NUMERIC);
+			ksort($this->_d, SORT_NUMERIC);
 			$this->_o=true;
 		}
 	}
@@ -202,7 +202,7 @@ 
 		$this->sortPriorities();
 		$this->_fd=array();
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -216,11 +216,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
+		if($index >= 0 && $index < $this->getCount()) {
 			$arr=$this->flattenPriorities();
 			return $arr[$index];
 		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -232,9 +232,9 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -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);
+		$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));
+			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));
+			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,54 +299,54 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
+	public function insertAtIndexInPriority($item, $index=false, $priority=null, $preserveCache=false)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc=0;
 			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+				if($prioritykey >= $priority)
 					break;
 				else
 					$cc+=count($items);
 
-			if($index===false&&isset($this->_d[$priority])) {
+			if($index===false && isset($this->_d[$priority])) {
 				$c=count($this->_d[$priority]);
 				$c+=$cc;
 				$this->_d[$priority][]=$item;
 			} else if(isset($this->_d[$priority])) {
-				$c=$index+$cc;
-				array_splice($this->_d[$priority],$index,0,array($item));
+				$c=$index + $cc;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
-				$c = $cc;
-				$this->_o = false;
+				$c=$cc;
+				$this->_o=false;
 				$this->_d[$priority]=array($item);
 			}
 
-			if($this->_fd&&is_array($this->_fd)) // if there is a flattened array cache
-				array_splice($this->_fd,$c,0,array($item));
+			if($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
+				array_splice($this->_fd, $c, 0, array($item));
 		} else {
 			$c=null;
-			if($index===false&&isset($this->_d[$priority])) {
+			if($index===false && isset($this->_d[$priority])) {
 				$cc=count($this->_d[$priority]);
 				$this->_d[$priority][]=$item;
 			} else if(isset($this->_d[$priority])) {
 				$cc=$index;
-				array_splice($this->_d[$priority],$index,0,array($item));
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
 				$cc=0;
 				$this->_o=false;
 				$this->_d[$priority]=array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
-				array_splice($this->_fd,$cc,0,array($item));
+			if($this->_fd && is_array($this->_fd) && count($this->_d)==1)
+				array_splice($this->_fd, $cc, 0, array($item));
 			else
 				$this->_fd=null;
 		}
@@ -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));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($p=$this->priorityOf($item,true))!==false)
+		if(($p=$this->priorityOf($item, true))!==false)
 		{
 			if($priority!==false) {
 				if($priority===null)
 					$priority=$this->getDefaultPriority();
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 				if($p[0]!=$priority)
 					throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			$this->removeAtIndexInPriority($p[1],$p[0]);
+			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
 		}
 		else
@@ -399,11 +399,11 @@ 
 	public function removeAt($index)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		if(($priority=$this->priorityAt($index, true))!==false)
-			return $this->removeAtIndexInPriority($priority[1],$priority[0]);
-		throw new TInvalidDataValueException('list_index_invalid',$index);
+			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -417,17 +417,17 @@ 
 	public function removeAtIndexInPriority($index, $priority=null)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority]))
+		if(!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
 			throw new TInvalidDataValueException('list_item_inexistent');
 
 		// $value is an array of elements removed, only one
-		$value=array_splice($this->_d[$priority],$index,1);
+		$value=array_splice($this->_d[$priority], $index, 1);
 		$value=$value[0];
 
 		if(!count($this->_d[$priority]))
@@ -444,12 +444,12 @@ 
 	public function clear()
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		$d=array_reverse($this->_d,true);
+		$d=array_reverse($this->_d, true);
 		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+			for($index=count($items) - 1; $index >= 0; $index--)
+				$this->removeAtIndexInPriority($index, $priority);
 			unset($this->_d[$priority]);
 		}
 	}
@@ -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,16 +484,16 @@ 
 	 *   if withindex is true, an array is returned of [0 => $priority, 1 => $priorityIndex, 2 => flattenedIndex,
 	 * 'priority' => $priority, 'index' => $priorityIndex, 'absindex' => flattenedIndex]
 	 */
-	public function priorityOf($item,$withindex = false)
+	public function priorityOf($item, $withindex=false)
 	{
 		$this->sortPriorities();
 
-		$absindex = 0;
+		$absindex=0;
 		foreach($this->_d as $priority=>$items) {
-			if(($index=array_search($item,$items,true))!==false) {
+			if(($index=array_search($item, $items, true))!==false) {
 				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 			} else
 				$absindex+=count($items);
 		}
@@ -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;
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items) {
-			if($index>=($c=count($items)))
+			if($index >= ($c=count($items)))
 				$index-=$c;
 			else
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 		}
 		return false;
 	}
@@ -538,12 +538,12 @@ 
 	public function insertBefore($indexitem, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if(($priority=$this->priorityOf($indexitem, true))===false)
 			throw new TInvalidDataValueException('list_item_inexistent');
 
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 
 		return $priority[2];
 	}
@@ -559,14 +559,14 @@ 
 	public function insertAfter($indexitem, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if(($priority=$this->priorityOf($indexitem, true))===false)
 			throw new TInvalidDataValueException('list_item_inexistent');
 
-		$this->insertAtIndexInPriority($item,$priority[1]+1,$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1] + 1, $priority[0]);
 
-		return $priority[2]+1;
+		return $priority[2] + 1;
 	}
 
 	/**
@@ -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)
 		{
-			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)
 		{
-			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;
 	}
@@ -637,15 +637,15 @@ 
 	{
 		if($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} else if(is_array($data)||$data instanceof Traversable) {
-			if($this->getCount()>0)
+		} else if(is_array($data) || $data instanceof Traversable) {
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$item)
 				$this->add($item);
@@ -668,10 +668,10 @@ 
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+					$this->insertAtIndexInPriority($item, false, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if(is_array($data) || $data instanceof Traversable)
 		{
 			foreach($data as $priority=>$item)
 				$this->add($item);
@@ -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)
 			return $this->add($item);
 		if($offset===$this->getCount()) {
-			$priority=$this->priorityAt($offset-1,true);
+			$priority=$this->priorityAt($offset - 1, true);
 			$priority[1]++;
 		} else {
-			$priority=$this->priorityAt($offset,true);
-			$this->removeAtIndexInPriority($priority[1],$priority[0]);
+			$priority=$this->priorityAt($offset, true);
+			$this->removeAtIndexInPriority($priority[1], $priority[0]);
 		}
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 	}
 
 	/**

Braces +3 added lines, -6 removed lines

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

framework/Collections/TPriorityMap.php

Doc Comments +4 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)
 	{
@@ -338,7 +341,7 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 * @param numeric|null priority, default: null, filled in with default priority
-	 * @return numeric priority at which the pair was added
+	 * @return string priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
 	public function add($key,$value,$priority=null)

Spacing +46 added lines, -46 removed lines

@@ -95,7 +95,7 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -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);
 	}
 
 	/**
@@ -184,9 +184,9 @@ 
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd = array();
+		$this->_fd=array();
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -218,9 +218,9 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority]))
+		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
 	}
@@ -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){
+		if($priority===false) {
 			$map=$this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+			return isset($map[$key]) ? $map[$key] : null;
 		} else {
 			if($priority===null)
 				$priority=$this->getDefaultPriority();
-			$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-			return (isset($this->_d[$priority])&&isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
+			$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key])) ? $this->_d[$priority][$key] : null;
 		}
 	}
 
@@ -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);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		$oldpriority=$this->priorityAt($key);
-		if($oldpriority!==false&&$oldpriority!=$priority) {
-			$value=$this->remove($key,$oldpriority);
-			$this->add($key,$value,$priority);
+		if($oldpriority!==false && $oldpriority!=$priority) {
+			$value=$this->remove($key, $oldpriority);
+			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
 	}
@@ -295,9 +295,9 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+			if(($index=array_search($item, $items, true))!==false)
 				return $priority;
 		return false;
 	}
@@ -323,7 +323,7 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+			if(array_key_exists($key, $items))
 				return $priority;
 		return false;
 	}
@@ -341,16 +341,16 @@ 
 	 * @return numeric priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key,$value,$priority=null)
+	public function add($key, $value, $priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!$this->_r)
 		{
 			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+				if(array_key_exists($key, $items))
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
@@ -367,7 +367,7 @@ 
 			$this->_fd=null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
 
@@ -383,7 +383,7 @@ 
 	 * @return mixed the removed value, null if no such key exists.
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function remove($key,$priority=false)
+	public function remove($key, $priority=false)
 	{
 		if(!$this->_r)
 		{
@@ -394,7 +394,7 @@ 
 			{
 				$this->sortPriorities();
 				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+					if(array_key_exists($key, $items))
 					{
 						$value=$this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
@@ -411,8 +411,8 @@ 
 			}
 			else
 			{
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
 				{
 					$value=$this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
@@ -429,7 +429,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	public function contains($key)
 	{
 		$map=$this->flattenPriorities();
-		return isset($map[$key])||array_key_exists($key,$map);
+		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 
 	/**
@@ -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)
 		{
-			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)
 		{
-			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;
 	}
@@ -514,20 +514,20 @@ 
 	{
 		if($data instanceof TPriorityMap)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data->getPriorities() as $priority) {
 				foreach($data->itemsAtPriority($priority) as $key => $value) {
-					$this->add($key,$value,$priority);
+					$this->add($key, $value, $priority);
 				}
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -547,13 +547,13 @@ 
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+					$this->add($key, $value, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if(is_array($data) || $data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -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 +9 added lines, -18 removed lines

@@ -360,13 +360,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
@@ -408,8 +406,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,12 +420,10 @@ 
 					}
 					$this->_fd=null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 
@@ -521,15 +516,13 @@ 
 					$this->add($key,$value,$priority);
 				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
 			if($this->getCount()>0)
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -549,13 +542,11 @@ 
 				foreach($data->itemsAtPriority($priority) as $key => $value)
 					$this->add($key,$value,$priority);
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Data/ActiveRecord/TActiveRecordManager.php

Doc Comments +4 added lines

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

Spacing +9 added lines, -9 removed lines

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

framework/Data/DataGateway/TTableGateway.php

Doc Comments +8 added lines, -3 removed lines

@@ -100,6 +100,7 @@ 
 
 	/**
 	 * @param TDbTableInfo table or view information.
+	 * @param TDbTableInfo $tableInfo
 	 */
 	protected function setTableInfo($tableInfo)
 	{
@@ -110,6 +111,7 @@ 
 	/**
 	 * Sets up the command builder for the given table.
 	 * @param string table or view name.
+	 * @param string $tableName
 	 */
 	protected function setTableName($tableName)
 	{
@@ -185,7 +187,7 @@ 
 	 * Execute arbituary sql command with binding parameters.
 	 * @param string SQL query string.
 	 * @param array binding parameters, positional or named.
-	 * @return array query results.
+	 * @return TDbDataReader query results.
 	 */
 	public function findBySql($sql, $parameters=array())
 	{
@@ -222,6 +224,7 @@ 
 	 *
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return array matching record object.
 	 */
 	public function find($criteria, $parameters=array())
@@ -235,6 +238,7 @@ 
 	 * Accepts same parameters as find(), but returns TDbDataReader instead.
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return TDbDataReader matching records.
 	 */
 	public function findAll($criteria=null, $parameters=array())
@@ -297,6 +301,7 @@ 
 	 * </code>
 	 * @param string delete condition.
 	 * @param array condition parameters.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return integer number of records deleted.
 	 */
 	public function deleteAll($criteria, $parameters=array())
@@ -385,7 +390,7 @@ 
 	 * Inserts a new record into the table. Each array key must
 	 * correspond to a column name in the table unless a null value is permitted.
 	 * @param array new record data.
-	 * @return mixed last insert id if one column contains a serial or sequence,
+	 * @return string|boolean last insert id if one column contains a serial or sequence,
 	 * otherwise true if command executes successfully and affected 1 or more rows.
 	 */
 	public function insert($data)
@@ -394,7 +399,7 @@ 
 	}
 
 	/**
-	 * @return mixed last insert id, null if none is found.
+	 * @return string|null last insert id, null if none is found.
 	 */
 	public function getLastInsertId()
 	{

Braces +1 added lines, -2 removed lines

@@ -416,8 +416,7 @@
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			throw new TDbException('dbtablegateway_invalid_criteria');

Spacing +38 added lines, -38 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param string|TDbTableInfo table or view name or table information.
 	 * @param TDbConnection database connection.
 	 */
-	public function __construct($table,$connection)
+	public function __construct($table, $connection)
 	{
 		$this->_connection=$connection;
 		if(is_string($table))
@@ -103,7 +103,7 @@ 
 	 */
 	protected function setTableInfo($tableInfo)
 	{
-		$builder = $tableInfo->createCommandBuilder($this->getDbConnection());
+		$builder=$tableInfo->createCommandBuilder($this->getDbConnection());
 		$this->initCommandBuilder($builder);
 	}
 
@@ -114,7 +114,7 @@ 
 	protected function setTableName($tableName)
 	{
 		Prado::using('System.Data.Common.TDbMetaData');
-		$meta = TDbMetaData::getInstance($this->getDbConnection());
+		$meta=TDbMetaData::getInstance($this->getDbConnection());
 		$this->initCommandBuilder($meta->createCommandBuilder($tableName));
 	}
 
@@ -133,9 +133,9 @@ 
 	 */
 	protected function initCommandBuilder($builder)
 	{
-		$this->_command = new TDataGatewayCommand($builder);
-		$this->_command->OnCreateCommand[] = array($this, 'onCreateCommand');
-		$this->_command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
+		$this->_command=new TDataGatewayCommand($builder);
+		$this->_command->OnCreateCommand[]=array($this, 'onCreateCommand');
+		$this->_command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
 	}
 
 	/**
@@ -189,8 +189,8 @@ 
 	 */
 	public function findBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findBySql($criteria);
 	}
 
@@ -202,8 +202,8 @@ 
 	 */
 	public function findAllBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findAllBySql($criteria);
 	}
 
@@ -226,8 +226,8 @@ 
 	 */
 	public function find($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->find($criteria);
 	}
 
@@ -239,9 +239,9 @@ 
 	 */
 	public function findAll($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -260,7 +260,7 @@ 
 	public function findByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
 
@@ -284,7 +284,7 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
 
@@ -301,8 +301,8 @@ 
 	 */
 	public function deleteAll($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->delete($criteria);
 	}
 
@@ -332,7 +332,7 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
 
@@ -342,7 +342,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 
@@ -352,11 +352,11 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria=null,$parameters=array())
+	public function count($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -376,8 +376,8 @@ 
 	 */
 	public function update($data, $criteria, $parameters=array())
 	{
-		$args = func_num_args() > 2 ? array_slice(func_get_args(),2) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->update($data, $criteria);
 	}
 
@@ -414,8 +414,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -452,21 +452,21 @@ 
 	 * @return mixed single record if method name starts with "findBy", 0 or more records
 	 * if method name starts with "findAllBy"
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
-		$delete =false;
-		if($findOne = substr(strtolower($method),0,6)==='findby')
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(substr(strtolower($method),0,9)==='findallby')
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete = substr(strtolower($method),0,8)==='deleteby')
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete = substr(strtolower($method),0,11)==='deleteallby')
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		$delete=false;
+		if($findOne=substr(strtolower($method), 0, 6)==='findby')
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		else if(substr(strtolower($method), 0, 9)==='findallby')
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		else if($delete=substr(strtolower($method), 0, 8)==='deleteby')
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		else if($delete=substr(strtolower($method), 0, 11)==='deleteallby')
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 			return null;
 
-		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getCommand()->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else

framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php

Doc Comments +5 added lines, -2 removed lines

@@ -129,6 +129,7 @@ 
 	/**
 	 * Register a mapped statement that will trigger a cache flush.
 	 * @param TMappedStatement mapped statement that may flush the cache.
+	 * @param IMappedStatement $mappedStatement
 	 */
 	public function registerTriggerStatement($mappedStatement)
 	{
@@ -145,6 +146,7 @@ 
 
 	/**
 	 * @param TSqlMapCacheKey|string cache key
+	 * @param string $key
 	 * @return mixed cached value.
 	 */
 	public function get($key)
@@ -163,6 +165,7 @@ 
 	/**
 	 * @param TSqlMapCacheKey|string cache key
 	 * @param mixed value to be cached.
+	 * @param string $key
 	 */
 	public function set($key, $value)
 	{
@@ -174,7 +177,7 @@ 
 	}
 
 	/**
-	 * @return float cache hit ratio.
+	 * @return integer cache hit ratio.
 	 */
 	public function getHitRatio()
 	{
@@ -223,7 +226,7 @@ 
 	}
 
 	/**
-	 * @param string serialized object
+	 * @param string string object
 	 * @return string crc32 hash of the serialized object.
 	 */
 	protected function generateKey($string)

Spacing +21 added lines, -21 removed lines

@@ -33,18 +33,18 @@ 
 class TSqlMapCacheModel extends TComponent
 {
 	private $_cache;
-	private $_hits = 0;
-	private $_requests = 0;
+	private $_hits=0;
+	private $_requests=0;
 	private $_id;
 	private $_implementation=TSqlMapCacheTypes::Basic;
-	private $_properties = array();
-	private $_flushInterval = 0;
+	private $_properties=array();
+	private $_flushInterval=0;
 
-	private static $_cacheTypes = array();
+	private static $_cacheTypes=array();
 
 	public static function registerCacheType($type, $className)
 	{
-		self::$_cacheTypes[$type] = $className;
+		self::$_cacheTypes[$type]=$className;
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -76,10 +76,10 @@ 
 	 */
 	public function setImplementation($value)
 	{
-		if (isset(self::$_cacheTypes[$value]))
-			$this->_implementation = $value;
+		if(isset(self::$_cacheTypes[$value]))
+			$this->_implementation=$value;
 		else
-			$this->_implementation = TPropertyValue::ensureEnum($value,'TSqlMapCacheTypes');
+			$this->_implementation=TPropertyValue::ensureEnum($value, 'TSqlMapCacheTypes');
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	public function initialize($cache=null)
 	{
 		if($cache===null)
-			$this->_cache= Prado::createComponent($this->getImplementationClass(), $this);
+			$this->_cache=Prado::createComponent($this->getImplementationClass(), $this);
 		else
 			$this->_cache=$cache;
 	}
@@ -115,10 +115,10 @@ 
 	 */
 	public function getImplementationClass()
 	{
-		$implementation = $this->_implementation;
-		if (isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
+		$implementation=$this->_implementation;
+		if(isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation];
 
-		switch(TPropertyValue::ensureEnum($implementation,'TSqlMapCacheTypes'))
+		switch(TPropertyValue::ensureEnum($implementation, 'TSqlMapCacheTypes'))
 		{
 			case TSqlMapCacheTypes::FIFO: return 'TSqlMapFifoCache';
 			case TSqlMapCacheTypes::LRU : return 'TSqlMapLruCache';
@@ -132,7 +132,7 @@ 
 	 */
 	public function registerTriggerStatement($mappedStatement)
 	{
-		$mappedStatement->attachEventHandler('OnExecuteQuery',array($this, 'flush'));
+		$mappedStatement->attachEventHandler('OnExecuteQuery', array($this, 'flush'));
 	}
 
 	/**
@@ -150,10 +150,10 @@ 
 	public function get($key)
 	{
 		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+			$key=$key->getHash();
 
 		//if flush ?
-		$value = $this->_cache->get($key);
+		$value=$this->_cache->get($key);
 		$this->_requests++;
 		if($value!==null)
 			$this->_hits++;
@@ -167,7 +167,7 @@ 
 	public function set($key, $value)
 	{
 		if($key instanceof TSqlMapCacheKey)
-			$key = $key->getHash();
+			$key=$key->getHash();
 
 		if($value!==null)
 			$this->_cache->set($key, $value, $this->_flushInterval);
@@ -178,7 +178,7 @@ 
 	 */
 	public function getHitRatio()
 	{
-		if($this->_requests != 0)
+		if($this->_requests!=0)
 			return $this->_hits / $this->_requests;
 		else
 			return 0;
@@ -219,7 +219,7 @@ 
 	 */
 	public function __construct($object)
 	{
-		$this->_key = $this->generateKey(serialize($object));
+		$this->_key=$this->generateKey(serialize($object));
 	}
 
 	/**
@@ -228,7 +228,7 @@ 
 	 */
 	protected function generateKey($string)
 	{
-		return sprintf('%x',crc32($string));
+		return sprintf('%x', crc32($string));
 	}
 
 	/**

framework/Data/SqlMap/DataMapper/TSqlMapCache.php

Doc Comments +3 added lines

@@ -205,6 +205,9 @@
 		return $keyList;
 	}
 
+	/**
+	 * @param TList $keyList
+	 */
 	protected function setKeyList($keyList)
 	{
 		$this->getCache()->set($this->getKeyListId(), $keyList);

Spacing +22 added lines, -22 removed lines

@@ -22,8 +22,8 @@ 
 {
 	protected $_keyList;
 	protected $_cache;
-	protected $_cacheSize = 100;
-	protected $_cacheModel = null;
+	protected $_cacheSize=100;
+	protected $_cacheModel=null;
 
 	/**
 	 * Create a new cache with limited cache size.
@@ -31,8 +31,8 @@ 
 	 */
 	public function __construct($cacheModel=null)
 	{
-		$this->_cache = new TMap;
-		$this->_keyList = new TList;
+		$this->_cache=new TMap;
+		$this->_keyList=new TList;
 		$this->_cacheModel=$cacheModel;
 	}
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function setCacheSize($value)
 	{
-		$this->_cacheSize=TPropertyValue::ensureInteger($value,100);
+		$this->_cacheSize=TPropertyValue::ensureInteger($value, 100);
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 */
 	public function delete($key)
 	{
-		$object = $this->get($key);
+		$object=$this->get($key);
 		$this->_cache->remove($key);
 		$this->_keyList->remove($key);
 		return $object;
@@ -76,7 +76,7 @@ 
 	/**
 	 * @throws TSqlMapException not implemented.
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
 		throw new TSqlMapException('sqlmap_use_set_to_store_cache');
 	}
@@ -106,13 +106,13 @@ 
 	 * @param string cache key
 	 * @param mixed value to cache.
 	 */
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire=0, $dependency=null)
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
 		if($this->_keyList->getCount() > $this->_cacheSize)
 		{
-			$oldestKey = $this->_keyList->removeAt(0);
+			$oldestKey=$this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);
 		}
 	}
@@ -147,13 +147,13 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param mixed the value to be cached
 	 */
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire=0, $dependency=null)
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
 		if($this->_keyList->getCount() > $this->_cacheSize)
 		{
-			$oldestKey = $this->_keyList->removeAt(0);
+			$oldestKey=$this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);
 		}
 	}
@@ -187,7 +187,7 @@ 
 	protected function getKeyListId()
 	{
 		$id='keyList';
-		if ($this->_cacheModel instanceof TSqlMapCacheModel)
+		if($this->_cacheModel instanceof TSqlMapCacheModel)
 				$id.='_'.$this->_cacheModel->getId();
 		return $id;
 	}
@@ -197,7 +197,7 @@ 
 	 */
 	protected function getKeyList()
 	{
-		if (($keyList=$this->getCache()->get($this->getKeyListId()))===false)
+		if(($keyList=$this->getCache()->get($this->getKeyListId()))===false)
 		{
 			$keyList=new TList();
 			$this->getCache()->set($this->getKeyListId(), $keyList);
@@ -228,7 +228,7 @@ 
 	{
 		$keyList=$this->getKeyList();
 		$cache=$this->getCache();
-		foreach ($keyList as $key)
+		foreach($keyList as $key)
 		{
 			$cache->delete($key);
 		}
@@ -241,18 +241,18 @@ 
 	 */
 	public function get($key)
 	{
-		$result = $this->getCache()->get($key);
-		if ($result === false)
+		$result=$this->getCache()->get($key);
+		if($result===false)
 		{
 			// if the key has not been found in cache (e.g expired), remove from keylist
 			$keyList=$this->getKeyList();
-			if ($keyList->contains($key))
+			if($keyList->contains($key))
 			{
 				$keyList->remove($key);
 				$this->setKeyList($keyList);
 			}
 		}
-		return $result === false ? null : $result;
+		return $result===false ? null : $result;
 	}
 
 	/**
@@ -260,11 +260,11 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param mixed the value to be cached
 	 */
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire=0, $dependency=null)
 	{
-		$this->getCache()->set($key, $value, $expire,$dependency);
+		$this->getCache()->set($key, $value, $expire, $dependency);
 		$keyList=$this->getKeyList();
-		if (!$keyList->contains($key))
+		if(!$keyList->contains($key))
 		{
 			$keyList->add($key);
 			$this->setKeyList($keyList);
@@ -282,7 +282,7 @@ 
 	/**
 	 * @throws TSqlMapException not implemented.
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
 		throw new TSqlMapException('sqlmap_use_set_to_store_cache');
 	}

framework/Data/SqlMap/TSqlMapGateway.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 	 */
 	private $_manager;
 
+	/**
+	 * @param TSqlMapManager $manager
+	 */
 	public function __construct($manager)
 	{
 		$this->_manager=$manager;

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function queryForObject($statementName, $parameter=null, $result=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
 	}
 
@@ -88,8 +88,8 @@ 
 	 */
 	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return $statement->executeQueryForList($this->getDbConnection(),$parameter, $result, $skip, $max);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
+		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
 	}
 
@@ -125,7 +125,7 @@ 
 	 */
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, null, $page);
 	}
 
@@ -144,10 +144,10 @@ 
 	 * @param integer The number of the page to initially load into the list.
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
-	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
+	public function queryForPagedListWithRowDelegate($statementName, $delegate, $parameter=null, $pageSize=10, $page=0)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate,$page);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
+		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 */
 	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
 	}
 
@@ -184,7 +184,7 @@ 
 	 */
 	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
 	}
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function insert($statementName, $parameter=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
 	}
 
@@ -225,7 +225,7 @@ 
 	 */
 	public function update($statementName, $parameter=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
 	}