pradosoft / prado

framework/Collections/TStack.php

Spacing +12 added lines, -12 removed lines

@@ -40,12 +40,12 @@ 
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c = 0;
+	private $_c=0;
 
 	/**
 	 * Constructor.
@@ -53,9 +53,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);
 	}
 
@@ -80,11 +80,11 @@ 
 			$this->clear();
 			foreach($data as $item)
 			{
-				$this->_d[] = $item;
+				$this->_d[]=$item;
 				++$this->_c;
 			}
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
@@ -93,8 +93,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c = 0;
-		$this->_d = [];
+		$this->_c=0;
+		$this->_d=[];
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item, $this->_d, true) !== false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c === 0)
+		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 			return $this->_d[$this->_c - 1];
@@ -127,7 +127,7 @@ 
 	 */
 	public function pop()
 	{
-		if($this->_c === 0)
+		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 		{
@@ -143,7 +143,7 @@ 
 	public function push($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**

framework/Collections/TPriorityMap.php

Spacing +70 added lines, -70 removed lines

@@ -65,15 +65,15 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * @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
 	 */
@@ -81,15 +81,15 @@ 
 	/**
 	 * @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.
@@ -100,9 +100,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);
@@ -122,7 +122,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r = TPropertyValue::ensureBoolean($value);
+		$this->_r=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p = TPropertyValue::ensureInteger($value);
+		$this->_p=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	protected function sortPriorities() {
 		if(!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
-			$this->_o = true;
+			$this->_o=true;
 		}
 	}
 
@@ -189,9 +189,9 @@ 
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd = [];
+		$this->_fd=[];
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -219,11 +219,11 @@ 
 	 * 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]))
 			return false;
@@ -257,16 +257,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;
 		}
 	}
 
@@ -277,15 +277,15 @@ 
 	 * @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);
+		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);
+		$oldpriority=$this->priorityAt($key);
+		if($oldpriority!==false && $oldpriority!=$priority) {
+			$value=$this->remove($key, $oldpriority);
 			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
@@ -296,13 +296,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;
 	}
 
 	/**
@@ -314,7 +314,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;
 	}
@@ -346,11 +346,11 @@ 
 	 * @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)
 		{
@@ -359,17 +359,17 @@ 
 				{
 					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] = [$key => $value];
-				$this->_o = false;
+				$this->_d[$priority]=[$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));
@@ -388,45 +388,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($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))
 					{
-						$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);
+				$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
@@ -453,7 +453,7 @@ 
 	 */
 	public function contains($key)
 	{
-		$map = $this->flattenPriorities();
+		$map=$this->flattenPriorities();
 		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 
@@ -475,15 +475,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 = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -495,15 +495,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 = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -534,7 +534,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -560,7 +560,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TListItemCollection.php

Spacing +19 added lines, -19 removed lines

@@ -35,9 +35,9 @@ 
 	 * If -1, the item will be appended to the end.
 	 * @return TListItem list item object
 	 */
-	public function createListItem($index = -1)
+	public function createListItem($index=-1)
 	{
-		$item = $this->createNewListItem();
+		$item=$this->createNewListItem();
 		if($index < 0)
 			$this->add($item);
 		else
@@ -48,10 +48,10 @@ 
 	/**
 	 * @return TListItem new item.
 	 */
-	protected function createNewListItem($text = null)
+	protected function createNewListItem($text=null)
 	{
-		$item = new TListItem;
-		if($text !== null)
+		$item=new TListItem;
+		if($text!==null)
 			$item->setText($text);
 		return $item;
 	}
@@ -66,7 +66,7 @@ 
 	public function insertAt($index, $item)
 	{
 		if(is_string($item))
-			$item = $this->createNewListItem($item);
+			$item=$this->createNewListItem($item);
 		if(!($item instanceof TListItem))
 			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
 		parent::insertAt($index, $item);
@@ -78,13 +78,13 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByValue($value, $includeDisabled = true)
+	public function findIndexByValue($value, $includeDisabled=true)
 	{
-		$value = TPropertyValue::ensureString($value);
-		$index = 0;
+		$value=TPropertyValue::ensureString($value);
+		$index=0;
 		foreach($this as $item)
 		{
-			if($item->getValue() === $value && ($includeDisabled || $item->getEnabled()))
+			if($item->getValue()===$value && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -97,13 +97,13 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByText($text, $includeDisabled = true)
+	public function findIndexByText($text, $includeDisabled=true)
 	{
-		$text = TPropertyValue::ensureString($text);
-		$index = 0;
+		$text=TPropertyValue::ensureString($text);
+		$index=0;
 		foreach($this as $item)
 		{
-			if($item->getText() === $text && ($includeDisabled || $item->getEnabled()))
+			if($item->getText()===$text && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -116,9 +116,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByValue($value, $includeDisabled = true)
+	public function findItemByValue($value, $includeDisabled=true)
 	{
-		if(($index = $this->findIndexByValue($value, $includeDisabled)) >= 0)
+		if(($index=$this->findIndexByValue($value, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -130,9 +130,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByText($text, $includeDisabled = true)
+	public function findItemByText($text, $includeDisabled=true)
 	{
-		if(($index = $this->findIndexByText($text, $includeDisabled)) >= 0)
+		if(($index=$this->findIndexByText($text, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -146,7 +146,7 @@ 
 	public function loadState($state)
 	{
 		$this->clear();
-		if($state !== null)
+		if($state!==null)
 			$this->copyFrom($state);
 	}
 

framework/Collections/TPagedListIterator.php

Spacing +6 added lines, -6 removed lines

@@ -38,13 +38,13 @@ 
 	 */
 	public function __construct(TList $list, $startIndex, $count)
 	{
-		$this->_list = $list;
-		$this->_index = 0;
-		$this->_startIndex = $startIndex;
+		$this->_list=$list;
+		$this->_index=0;
+		$this->_startIndex=$startIndex;
 		if($startIndex + $count > $list->getCount())
-			$this->_count = $list->getCount() - $startIndex;
+			$this->_count=$list->getCount() - $startIndex;
 		else
-			$this->_count = $count;
+			$this->_count=$count;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_index = 0;
+		$this->_index=0;
 	}
 
 	/**

framework/Collections/TPagedDataSource.php

Spacing +26 added lines, -26 removed lines

@@ -41,23 +41,23 @@ 
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize = 10;
+	private $_pageSize=10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex = 0;
+	private $_currentPageIndex=0;
 	/**
 	 * @var boolean whether to allow paging
 	 */
-	private $_allowPaging = false;
+	private $_allowPaging=false;
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_allowCustomPaging = false;
+	private $_allowCustomPaging=false;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount = 0;
+	private $_virtualCount=0;
 
 	/**
 	 * @return mixed original data source. Defaults to null.
@@ -75,13 +75,13 @@ 
 		if(!($value instanceof TMap) && !($value instanceof TList))
 		{
 			if(is_array($value))
-				$value = new TMap($value);
+				$value=new TMap($value);
 			elseif($value instanceof \Traversable)
-				$value = new TList($value);
-			elseif($value !== null)
+				$value=new TList($value);
+			elseif($value!==null)
 				throw new TInvalidDataTypeException('pageddatasource_datasource_invalid');
 		}
-		$this->_dataSource = $value;
+		$this->_dataSource=$value;
 	}
 
 	/**
@@ -97,8 +97,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('pageddatasource_pagesize_invalid');
 	}
@@ -116,9 +116,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
-		$this->_currentPageIndex = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=0;
+		$this->_currentPageIndex=$value;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	public function setAllowPaging($value)
 	{
-		$this->_allowPaging = TPropertyValue::ensureBoolean($value);
+		$this->_allowPaging=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setAllowCustomPaging($value)
 	{
-		$this->_allowCustomPaging = TPropertyValue::ensureBoolean($value);
+		$this->_allowCustomPaging=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -166,8 +166,8 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) >= 0)
-			$this->_virtualCount = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) >= 0)
+			$this->_virtualCount=$value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_virtualitemcount_invalid');
 	}
@@ -177,7 +177,7 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_dataSource === null)
+		if($this->_dataSource===null)
 			return 0;
 		if(!$this->_allowPaging)
 			return $this->getDataSourceCount();
@@ -201,12 +201,12 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_dataSource === null)
+		if($this->_dataSource===null)
 			return 0;
-		$count = $this->getDataSourceCount();
+		$count=$this->getDataSourceCount();
 		if(!$this->_allowPaging || $count <= 0)
 			return 1;
-		return (int)(($count + $this->_pageSize - 1) / $this->_pageSize);
+		return (int) (($count + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -215,7 +215,7 @@ 
 	public function getIsFirstPage()
 	{
 		if($this->_allowPaging)
-			return $this->_currentPageIndex === 0;
+			return $this->_currentPageIndex===0;
 		else
 			return true;
 	}
@@ -226,7 +226,7 @@ 
 	public function getIsLastPage()
 	{
 		if($this->_allowPaging)
-			return $this->_currentPageIndex === $this->getPageCount() - 1;
+			return $this->_currentPageIndex===$this->getPageCount() - 1;
 		else
 			return true;
 	}
@@ -237,7 +237,7 @@ 
 	 */
 	public function getFirstIndexInPage()
 	{
-		if($this->_dataSource !== null && $this->_allowPaging && !$this->_allowCustomPaging)
+		if($this->_dataSource!==null && $this->_allowPaging && !$this->_allowCustomPaging)
 			return $this->_currentPageIndex * $this->_pageSize;
 		else
 			return 0;
@@ -248,7 +248,7 @@ 
 	 */
 	public function getDataSourceCount()
 	{
-		if($this->_dataSource === null)
+		if($this->_dataSource===null)
 			return 0;
 		elseif($this->_allowCustomPaging)
 			return $this->_virtualCount;

framework/Collections/TPriorityList.php

Spacing +98 added lines, -98 removed lines

@@ -57,11 +57,11 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * @var boolean indicates if the _d is currently ordered.
 	 */
-	private $_o = false;
+	private $_o=false;
 	/**
 	 * @var array cached flattened internal data storage
 	 */
@@ -69,15 +69,15 @@ 
 	/**
 	 * @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.
@@ -88,10 +88,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);
@@ -122,11 +122,11 @@ 
 	 * @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]))
 			return false;
@@ -147,7 +147,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p = TPropertyValue::ensureInteger($value);
+		$this->_p=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	protected function sortPriorities() {
 		if(!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
-			$this->_o = true;
+			$this->_o=true;
 		}
 	}
 
@@ -207,9 +207,9 @@ 
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd = [];
+		$this->_fd=[];
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -224,7 +224,7 @@ 
 	public function itemAt($index)
 	{
 		if($index >= 0 && $index < $this->getCount()) {
-			$arr = $this->flattenPriorities();
+			$arr=$this->flattenPriorities();
 			return $arr[$index];
 		} else
 			throw new TInvalidDataValueException('list_index_invalid', $index);
@@ -235,13 +235,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;
 	}
 
 	/**
@@ -250,14 +250,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
 			);
 	}
 
@@ -269,7 +269,7 @@ 
 	 * @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));
@@ -290,7 +290,7 @@ 
 		if($this->getReadOnly())
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority = $this->priorityAt($index, true)) !== false)
+		if(($priority=$this->priorityAt($index, true))!==false)
 			$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		else
 			throw new TInvalidDataValueException('list_index_invalid', $index);
@@ -306,56 +306,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($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) {
 			$this->sortPriorities();
-			$cc = 0;
+			$cc=0;
 			foreach($this->_d as $prioritykey => $items)
 				if($prioritykey >= $priority)
 					break;
 				else
-					$cc += count($items);
+					$cc+=count($items);
 
-			if($index === false && isset($this->_d[$priority])) {
-				$c = count($this->_d[$priority]);
-				$c += $cc;
-				$this->_d[$priority][] = $item;
+			if($index===false && isset($this->_d[$priority])) {
+				$c=count($this->_d[$priority]);
+				$c+=$cc;
+				$this->_d[$priority][]=$item;
 			} elseif(isset($this->_d[$priority])) {
-				$c = $index + $cc;
+				$c=$index + $cc;
 				array_splice($this->_d[$priority], $index, 0, [$item]);
 			} else {
-				$c = $cc;
-				$this->_o = false;
-				$this->_d[$priority] = [$item];
+				$c=$cc;
+				$this->_o=false;
+				$this->_d[$priority]=[$item];
 			}
 
 			if($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
 				array_splice($this->_fd, $c, 0, [$item]);
 		} else {
-			$c = null;
-			if($index === false && isset($this->_d[$priority])) {
-				$cc = count($this->_d[$priority]);
-				$this->_d[$priority][] = $item;
+			$c=null;
+			if($index===false && isset($this->_d[$priority])) {
+				$cc=count($this->_d[$priority]);
+				$this->_d[$priority][]=$item;
 			} elseif(isset($this->_d[$priority])) {
-				$cc = $index;
+				$cc=$index;
 				array_splice($this->_d[$priority], $index, 0, [$item]);
 			} else {
-				$cc = 0;
-				$this->_o = false;
-				$this->_d[$priority] = [$item];
+				$cc=0;
+				$this->_o=false;
+				$this->_d[$priority]=[$item];
 			}
-			if($this->_fd && is_array($this->_fd) && count($this->_d) == 1)
+			if($this->_fd && is_array($this->_fd) && count($this->_d)==1)
 				array_splice($this->_fd, $cc, 0, [$item]);
 			else
-				$this->_fd = null;
+				$this->_fd=null;
 		}
 
 		$this->_c++;
@@ -374,19 +374,19 @@ 
 	 * @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(($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]);
@@ -408,7 +408,7 @@ 
 		if($this->getReadOnly())
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority = $this->priorityAt($index, true)) !== false)
+		if(($priority=$this->priorityAt($index, true))!==false)
 			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
 		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
@@ -421,27 +421,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($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]))
 			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]))
 			unset($this->_d[$priority]);
 
 		$this->_c--;
-		$this->_fd = null;
+		$this->_fd=null;
 		return $value;
 	}
 
@@ -454,7 +454,7 @@ 
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		foreach($this->_d as $priority => $items) {
-			for($index = count($items) - 1;$index >= 0;$index--)
+			for($index=count($items) - 1; $index >= 0; $index--)
 				$this->removeAtIndexInPriority($index, $priority);
 			unset($this->_d[$priority]);
 		}
@@ -475,7 +475,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index = array_search($item, $this->flattenPriorities(), true)) === false)
+		if(($index=array_search($item, $this->flattenPriorities(), true))===false)
 			return -1;
 		else
 			return $index;
@@ -490,18 +490,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;
+		$absindex=0;
 		foreach($this->_d as $priority => $items) {
-			if(($index = array_search($item, $items, true)) !== false) {
-				$absindex += $index;
-				return $withindex?[$priority,$index,$absindex,
-						'priority' => $priority,'index' => $index,'absindex' => $absindex]:$priority;
+			if(($index=array_search($item, $items, true))!==false) {
+				$absindex+=$index;
+				return $withindex ? [$priority, $index, $absindex,
+						'priority' => $priority, 'index' => $index, 'absindex' => $absindex] : $priority;
 			} else
-				$absindex += count($items);
+				$absindex+=count($items);
 		}
 
 		return false;
@@ -516,19 +516,19 @@ 
 	 *   if withindex is true, an array is returned of [0 => $priority, 1 => $priorityIndex, 2 => flattenedIndex,
 	 * 'priority' => $priority, 'index' => $priorityIndex, 'absindex' => flattenedIndex]
 	 */
-	public function priorityAt($index, $withindex = false)
+	public function priorityAt($index, $withindex=false)
 	{
 		if($index < 0 || $index >= $this->getCount())
 			throw new TInvalidDataValueException('list_index_invalid', $index);
 
-		$absindex = $index;
+		$absindex=$index;
 		$this->sortPriorities();
 		foreach($this->_d as $priority => $items) {
-			if($index >= ($c = count($items)))
-				$index -= $c;
+			if($index >= ($c=count($items)))
+				$index-=$c;
 			else
-				return $withindex?[$priority,$index,$absindex,
-						'priority' => $priority,'index' => $index,'absindex' => $absindex]:$priority;
+				return $withindex ? [$priority, $index, $absindex,
+						'priority' => $priority, 'index' => $index, 'absindex' => $absindex] : $priority;
 		}
 		return false;
 	}
@@ -546,7 +546,7 @@ 
 		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]);
@@ -567,7 +567,7 @@ 
 		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]);
@@ -599,15 +599,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are below a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayBelowPriority($priority, $inclusive = false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
-		$items = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -619,15 +619,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are above a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayAbovePriority($priority, $inclusive = true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
-		$items = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -655,7 +655,7 @@ 
 				$this->clear();
 			foreach($data as $key => $item)
 				$this->add($item);
-		} elseif($data !== null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -683,7 +683,7 @@ 
 				$this->add($item);
 
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -723,13 +723,13 @@ 
 	 */
 	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);
+			$priority=$this->priorityAt($offset, true);
 			$this->removeAtIndexInPriority($priority[1], $priority[0]);
 		}
 		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);

framework/Collections/TPagedListPageChangedEventParameter.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 */
 	public function __construct($oldPage)
 	{
-		$this->_oldPage = $oldPage;
+		$this->_oldPage=$oldPage;
 	}
 
 	/**

framework/Collections/TList.php

Spacing +18 added lines, -18 removed lines

@@ -47,16 +47,16 @@ 
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c = 0;
+	private $_c=0;
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r = false;
+	private $_r=false;
 
 	/**
 	 * Constructor.
@@ -65,9 +65,9 @@ 
 	 * @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)
+		if($data!==null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 	}
@@ -85,7 +85,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r = TPropertyValue::ensureBoolean($value);
+		$this->_r=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index === $this->_c)
-				$this->_d[$this->_c++] = $item;
+			if($index===$this->_c)
+				$this->_d[$this->_c++]=$item;
 			elseif($index >= 0 && $index < $this->_c)
 			{
 				array_splice($this->_d, $index, 0, [$item]);
@@ -183,7 +183,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($item)) >= 0)
+			if(($index=$this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -209,11 +209,11 @@ 
 			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
-				if($index === $this->_c)
+				if($index===$this->_c)
 					return array_pop($this->_d);
 				else
 				{
-					$item = $this->_d[$index];
+					$item=$this->_d[$index];
 					array_splice($this->_d, $index, 1);
 					return $item;
 				}
@@ -231,7 +231,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i = $this->_c - 1;$i >= 0;--$i)
+		for($i=$this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -250,7 +250,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index = array_search($item, $this->_d, true)) === false)
+		if(($index=array_search($item, $this->_d, true))===false)
 			return -1;
 		else
 			return $index;
@@ -269,7 +269,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index, $item);
@@ -293,7 +293,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index + 1, $item);
@@ -327,7 +327,7 @@ 
 			foreach($data as $item)
 				$this->add($item);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -344,7 +344,7 @@ 
 			foreach($data as $item)
 				$this->add($item);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -379,7 +379,7 @@ 
 	 */
 	public function offsetSet($offset, $item)
 	{
-		if($offset === null || $offset === $this->_c)
+		if($offset===null || $offset===$this->_c)
 			$this->insertAt($this->_c, $item);
 		else
 		{

framework/Collections/TDummyDataSource.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	public function __construct($count)
 	{
-		$this->_count = $count;
+		$this->_count=$count;
 	}
 
 	/**