pradosoft / prado

framework/Collections/TPagedListIterator.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		$this->_list = $list;
 		$this->_index = 0;
 		$this->_startIndex = $startIndex;
-		if($startIndex + $count > $list->getCount())
+		if ($startIndex + $count > $list->getCount())
 			$this->_count = $list->getCount() - $startIndex;
 		else
 			$this->_count = $count;

Braces +5 added lines, -4 removed lines

@@ -41,10 +41,11 @@
 		$this->_list = $list;
 		$this->_index = 0;
 		$this->_startIndex = $startIndex;
-		if($startIndex + $count > $list->getCount())
-			$this->_count = $list->getCount() - $startIndex;
-		else
-			$this->_count = $count;
+		if($startIndex + $count > $list->getCount()) {
+					$this->_count = $list->getCount() - $startIndex;
+		} else {
+					$this->_count = $count;
+		}
 	}
 
 	/**

framework/Collections/TPagedMapIterator.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 		$this->_map = $map;
 		$this->_index = 0;
 		$this->_startIndex = $startIndex;
-		if($startIndex + $count > $map->getCount())
+		if ($startIndex + $count > $map->getCount())
 			$this->_count = $map->getCount() - $startIndex;
 		else
 			$this->_count = $count;
@@ -54,7 +54,7 @@ 
 	public function rewind()
 	{
 		$this->_iterator->rewind();
-		for($i = 0;$i < $this->_startIndex;++$i)
+		for ($i = 0; $i < $this->_startIndex; ++$i)
 			$this->_iterator->next();
 		$this->_index = 0;
 	}

Braces +8 added lines, -6 removed lines

@@ -40,10 +40,11 @@ 
 		$this->_map = $map;
 		$this->_index = 0;
 		$this->_startIndex = $startIndex;
-		if($startIndex + $count > $map->getCount())
-			$this->_count = $map->getCount() - $startIndex;
-		else
-			$this->_count = $count;
+		if($startIndex + $count > $map->getCount()) {
+					$this->_count = $map->getCount() - $startIndex;
+		} else {
+					$this->_count = $count;
+		}
 		$this->_iterator = $map->getIterator();
 	}
 
@@ -54,8 +55,9 @@ 
 	public function rewind()
 	{
 		$this->_iterator->rewind();
-		for($i = 0;$i < $this->_startIndex;++$i)
-			$this->_iterator->next();
+		for($i = 0;$i < $this->_startIndex;++$i) {
+					$this->_iterator->next();
+		}
 		$this->_index = 0;
 	}
 

framework/Collections/TMap.php

Spacing +12 added lines, -12 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function __construct($data = null, $readOnly = false)
 	{
-		if($data !== null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 	}
@@ -149,7 +149,7 @@ 
 	 */
 	public function add($key, $value)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 			$this->_d[$key] = $value;
 		else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
@@ -163,9 +163,9 @@ 
 	 */
 	public function remove($key)
 	{
-		if(!$this->_r)
+		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]);
@@ -183,7 +183,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_d) as $key)
+		foreach (array_keys($this->_d) as $key)
 			$this->remove($key);
 	}
 
@@ -212,14 +212,14 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || $data instanceof Traversable)
+		if (is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount() > 0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key => $value)
+			foreach ($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -231,12 +231,12 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if(is_array($data) || $data instanceof Traversable)
+		if (is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $key => $value)
+			foreach ($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

Braces +34 added lines, -26 removed lines

@@ -57,10 +57,12 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_d === [])
-			$exprops[] = "\0Prado\Collections\TMap\0_d";
-		if ($this->_r === false)
-			$exprops[] = "\0Prado\Collections\TMap\0_r";
+		if ($this->_d === []) {
+					$exprops[] = "\0Prado\Collections\TMap\0_d";
+		}
+		if ($this->_r === false) {
+					$exprops[] = "\0Prado\Collections\TMap\0_r";
+		}
 	}
 
 	/**
@@ -72,8 +74,9 @@ 
 	 */
 	public function __construct($data = null, $readOnly = false)
 	{
-		if($data !== null)
-			$this->copyFrom($data);
+		if($data !== null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 	}
 
@@ -149,10 +152,11 @@ 
 	 */
 	public function add($key, $value)
 	{
-		if(!$this->_r)
-			$this->_d[$key] = $value;
-		else
-			throw new TInvalidOperationException('map_readonly', get_class($this));
+		if(!$this->_r) {
+					$this->_d[$key] = $value;
+		} else {
+					throw new TInvalidOperationException('map_readonly', get_class($this));
+		}
 	}
 
 	/**
@@ -170,12 +174,12 @@ 
 				$value = $this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
+			} else {
+							return null;
 			}
-			else
-				return null;
+		} else {
+					throw new TInvalidOperationException('map_readonly', get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -183,8 +187,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_d) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_d) as $key) {
+					$this->remove($key);
+		}
 	}
 
 	/**
@@ -214,13 +219,15 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount() > 0)
-				$this->clear();
-			foreach($data as $key => $value)
-				$this->add($key, $value);
+			if($this->getCount() > 0) {
+							$this->clear();
+			}
+			foreach($data as $key => $value) {
+							$this->add($key, $value);
+			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
 	/**
@@ -233,11 +240,12 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $key => $value)
-				$this->add($key, $value);
+			foreach($data as $key => $value) {
+							$this->add($key, $value);
+			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
 	/**

framework/Collections/TListItemCollection.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
 	public function createListItem($index = -1)
 	{
 		$item = $this->createNewListItem();
-		if($index < 0)
+		if ($index < 0)
 			$this->add($item);
 		else
 			$this->insertAt($index, $item);
@@ -51,7 +51,7 @@ 
 	protected function createNewListItem($text = null)
 	{
 		$item = new TListItem;
-		if($text !== null)
+		if ($text !== null)
 			$item->setText($text);
 		return $item;
 	}
@@ -65,9 +65,9 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if(is_string($item))
+		if (is_string($item))
 			$item = $this->createNewListItem($item);
-		if(!($item instanceof TListItem))
+		if (!($item instanceof TListItem))
 			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
 		parent::insertAt($index, $item);
 	}
@@ -82,9 +82,9 @@ 
 	{
 		$value = TPropertyValue::ensureString($value);
 		$index = 0;
-		foreach($this as $item)
+		foreach ($this as $item)
 		{
-			if($item->getValue() === $value && ($includeDisabled || $item->getEnabled()))
+			if ($item->getValue() === $value && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -101,9 +101,9 @@ 
 	{
 		$text = TPropertyValue::ensureString($text);
 		$index = 0;
-		foreach($this as $item)
+		foreach ($this as $item)
 		{
-			if($item->getText() === $text && ($includeDisabled || $item->getEnabled()))
+			if ($item->getText() === $text && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -118,7 +118,7 @@ 
 	 */
 	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;
@@ -132,7 +132,7 @@ 
 	 */
 	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);
 	}
 

Braces +33 added lines, -24 removed lines

@@ -38,10 +38,11 @@ 
 	public function createListItem($index = -1)
 	{
 		$item = $this->createNewListItem();
-		if($index < 0)
-			$this->add($item);
-		else
-			$this->insertAt($index, $item);
+		if($index < 0) {
+					$this->add($item);
+		} else {
+					$this->insertAt($index, $item);
+		}
 		return $item;
 	}
 
@@ -51,8 +52,9 @@ 
 	protected function createNewListItem($text = null)
 	{
 		$item = new TListItem;
-		if($text !== null)
-			$item->setText($text);
+		if($text !== null) {
+					$item->setText($text);
+		}
 		return $item;
 	}
 
@@ -65,10 +67,12 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if(is_string($item))
-			$item = $this->createNewListItem($item);
-		if(!($item instanceof TListItem))
-			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
+		if(is_string($item)) {
+					$item = $this->createNewListItem($item);
+		}
+		if(!($item instanceof TListItem)) {
+					throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
+		}
 		parent::insertAt($index, $item);
 	}
 
@@ -84,8 +88,9 @@ 
 		$index = 0;
 		foreach($this as $item)
 		{
-			if($item->getValue() === $value && ($includeDisabled || $item->getEnabled()))
-				return $index;
+			if($item->getValue() === $value && ($includeDisabled || $item->getEnabled())) {
+							return $index;
+			}
 			$index++;
 		}
 		return -1;
@@ -103,8 +108,9 @@ 
 		$index = 0;
 		foreach($this as $item)
 		{
-			if($item->getText() === $text && ($includeDisabled || $item->getEnabled()))
-				return $index;
+			if($item->getText() === $text && ($includeDisabled || $item->getEnabled())) {
+							return $index;
+			}
 			$index++;
 		}
 		return -1;
@@ -118,10 +124,11 @@ 
 	 */
 	public function findItemByValue($value, $includeDisabled = true)
 	{
-		if(($index = $this->findIndexByValue($value, $includeDisabled)) >= 0)
-			return $this->itemAt($index);
-		else
-			return null;
+		if(($index = $this->findIndexByValue($value, $includeDisabled)) >= 0) {
+					return $this->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -132,10 +139,11 @@ 
 	 */
 	public function findItemByText($text, $includeDisabled = true)
 	{
-		if(($index = $this->findIndexByText($text, $includeDisabled)) >= 0)
-			return $this->itemAt($index);
-		else
-			return null;
+		if(($index = $this->findIndexByText($text, $includeDisabled)) >= 0) {
+					return $this->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -146,8 +154,9 @@ 
 	public function loadState($state)
 	{
 		$this->clear();
-		if($state !== null)
-			$this->copyFrom($state);
+		if($state !== null) {
+					$this->copyFrom($state);
+		}
 	}
 
 	/**

framework/Collections/TPriorityList.php

Spacing +81 added lines, -81 removed lines

@@ -91,7 +91,7 @@ 
 	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);
@@ -124,11 +124,11 @@ 
 	 */
 	public function getPriorityCount($priority = null)
 	{
-		if($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(!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]);
 	}
@@ -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);
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 * This orders the priority list internally.
 	 */
 	protected function sortPriorities() {
-		if(!$this->_o) {
+		if (!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
 			$this->_o = true;
 		}
@@ -203,12 +203,12 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
+		if (is_array($this->_fd))
 			return $this->_fd;
 
 		$this->sortPriorities();
 		$this->_fd = [];
-		foreach($this->_d as $priority => $itemsatpriority)
+		foreach ($this->_d as $priority => $itemsatpriority)
 			$this->_fd = array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
@@ -223,7 +223,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index >= 0 && $index < $this->getCount()) {
+		if ($index >= 0 && $index < $this->getCount()) {
 			$arr = $this->flattenPriorities();
 			return $arr[$index];
 		} else
@@ -237,11 +237,11 @@ 
 	 */
 	public function itemsAtPriority($priority = null)
 	{
-		if($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])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -252,12 +252,12 @@ 
 	 */
 	public function itemAtIndexInPriority($index, $priority = null)
 	{
-		if($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
 			);
 	}
 
@@ -271,7 +271,7 @@ 
 	 */
 	public function add($item, $priority = null)
 	{
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
 		return $this->insertAtIndexInPriority($item, false, $priority, true);
@@ -287,10 +287,10 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($this->getReadOnly())
+		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);
@@ -308,27 +308,27 @@ 
 	 */
 	public function insertAtIndexInPriority($item, $index = false, $priority = null, $preserveCache = false)
 	{
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if($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($preserveCache) {
+		if ($preserveCache) {
 			$this->sortPriorities();
 			$cc = 0;
-			foreach($this->_d as $prioritykey => $items)
-				if($prioritykey >= $priority)
+			foreach ($this->_d as $prioritykey => $items)
+				if ($prioritykey >= $priority)
 					break;
 				else
 					$cc += count($items);
 
-			if($index === false && isset($this->_d[$priority])) {
+			if ($index === false && isset($this->_d[$priority])) {
 				$c = count($this->_d[$priority]);
 				$c += $cc;
 				$this->_d[$priority][] = $item;
-			} elseif(isset($this->_d[$priority])) {
+			} elseif (isset($this->_d[$priority])) {
 				$c = $index + $cc;
 				array_splice($this->_d[$priority], $index, 0, [$item]);
 			} else {
@@ -337,14 +337,14 @@ 
 				$this->_d[$priority] = [$item];
 			}
 
-			if($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
+			if ($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
 				array_splice($this->_fd, $c, 0, [$item]);
 		} else {
 			$c = null;
-			if($index === false && isset($this->_d[$priority])) {
+			if ($index === false && isset($this->_d[$priority])) {
 				$cc = count($this->_d[$priority]);
 				$this->_d[$priority][] = $item;
-			} elseif(isset($this->_d[$priority])) {
+			} elseif (isset($this->_d[$priority])) {
 				$cc = $index;
 				array_splice($this->_d[$priority], $index, 0, [$item]);
 			} else {
@@ -352,7 +352,7 @@ 
 				$this->_o = false;
 				$this->_d[$priority] = [$item];
 			}
-			if($this->_fd && is_array($this->_fd) && count($this->_d) == 1)
+			if ($this->_fd && is_array($this->_fd) && count($this->_d) == 1)
 				array_splice($this->_fd, $cc, 0, [$item]);
 			else
 				$this->_fd = null;
@@ -376,17 +376,17 @@ 
 	 */
 	public function remove($item, $priority = false)
 	{
-		if($this->getReadOnly())
+		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)
+			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)
+				if ($p[0] != $priority)
 					throw new TInvalidDataValueException('list_item_inexistent');
 			}
 			$this->removeAtIndexInPriority($p[1], $p[0]);
@@ -405,10 +405,10 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
+		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);
 	}
@@ -423,21 +423,21 @@ 
 	 */
 	public function removeAtIndexInPriority($index, $priority = null)
 	{
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if($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(!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
+		if (!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
 			throw new TInvalidDataValueException('list_item_inexistent');
 
 		// $value is an array of elements removed, only one
 		$value = array_splice($this->_d[$priority], $index, 1);
 		$value = $value[0];
 
-		if(!count($this->_d[$priority]))
+		if (!count($this->_d[$priority]))
 			unset($this->_d[$priority]);
 
 		$this->_c--;
@@ -450,11 +450,11 @@ 
 	 */
 	public function clear()
 	{
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		foreach($this->_d as $priority => $items) {
-			for($index = count($items) - 1;$index >= 0;$index--)
+		foreach ($this->_d as $priority => $items) {
+			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;
@@ -495,11 +495,11 @@ 
 		$this->sortPriorities();
 
 		$absindex = 0;
-		foreach($this->_d as $priority => $items) {
-			if(($index = array_search($item, $items, true)) !== false) {
+		foreach ($this->_d as $priority => $items) {
+			if (($index = array_search($item, $items, true)) !== false) {
 				$absindex += $index;
-				return $withindex?[$priority,$index,$absindex,
-						'priority' => $priority,'index' => $index,'absindex' => $absindex]:$priority;
+				return $withindex ? [$priority, $index, $absindex,
+						'priority' => $priority, 'index' => $index, 'absindex' => $absindex] : $priority;
 			} else
 				$absindex += count($items);
 		}
@@ -518,17 +518,17 @@ 
 	 */
 	public function priorityAt($index, $withindex = false)
 	{
-		if($index < 0 || $index >= $this->getCount())
+		if ($index < 0 || $index >= $this->getCount())
 			throw new TInvalidDataValueException('list_index_invalid', $index);
 
 		$absindex = $index;
 		$this->sortPriorities();
-		foreach($this->_d as $priority => $items) {
-			if($index >= ($c = count($items)))
+		foreach ($this->_d as $priority => $items) {
+			if ($index >= ($c = count($items)))
 				$index -= $c;
 			else
-				return $withindex?[$priority,$index,$absindex,
-						'priority' => $priority,'index' => $index,'absindex' => $absindex]:$priority;
+				return $withindex ? [$priority, $index, $absindex,
+						'priority' => $priority, 'index' => $index, 'absindex' => $absindex] : $priority;
 		}
 		return false;
 	}
@@ -543,10 +543,10 @@ 
 	 */
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
+		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]);
@@ -564,10 +564,10 @@ 
 	 */
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
+		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]);
@@ -603,9 +603,9 @@ 
 	{
 		$this->sortPriorities();
 		$items = [];
-		foreach($this->_d as $itemspriority => $itemsatpriority)
+		foreach ($this->_d as $itemspriority => $itemsatpriority)
 		{
-			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
+			if ((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
 			$items = array_merge($items, $itemsatpriority);
 		}
@@ -623,9 +623,9 @@ 
 	{
 		$this->sortPriorities();
 		$items = [];
-		foreach($this->_d as $itemspriority => $itemsatpriority)
+		foreach ($this->_d as $itemspriority => $itemsatpriority)
 		{
-			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
+			if ((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
 			$items = array_merge($items, $itemsatpriority);
 		}
@@ -641,21 +641,21 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			if($this->getCount() > 0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index => $item)
+				foreach ($data->itemsAtPriority($priority) as $index => $item)
 					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} elseif(is_array($data) || $data instanceof \Traversable) {
-			if($this->getCount() > 0)
+		} elseif (is_array($data) || $data instanceof \Traversable) {
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key => $item)
+			foreach ($data as $key => $item)
 				$this->add($item);
-		} elseif($data !== null)
+		} elseif ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -669,21 +669,21 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index => $item)
+				foreach ($data->itemsAtPriority($priority) as $index => $item)
 					$this->insertAtIndexInPriority($item, false, $priority);
 			}
 		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		elseif (is_array($data) || $data instanceof \Traversable)
 		{
-			foreach($data as $priority => $item)
+			foreach ($data as $priority => $item)
 				$this->add($item);
 
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -723,9 +723,9 @@ 
 	 */
 	public function offsetSet($offset, $item)
 	{
-		if($offset === null)
+		if ($offset === null)
 			return $this->add($item);
-		if($offset === $this->getCount()) {
+		if ($offset === $this->getCount()) {
 			$priority = $this->priorityAt($offset - 1, true);
 			$priority[1]++;
 		} else {

Braces +151 added lines, -105 removed lines

@@ -91,8 +91,9 @@ 
 	public function __construct($data = null, $readOnly = false, $defaultPriority = 10, $precision = 8)
 	{
 		parent::__construct();
-		if($data !== null)
-			$this->copyFrom($data);
+		if($data !== null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
 		$this->setDefaultPriority($defaultPriority);
@@ -124,12 +125,14 @@ 
 	 */
 	public function getPriorityCount($priority = null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
+		if($priority === null) {
+					$priority = $this->getDefaultPriority();
+		}
 		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
-			return false;
+		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority])) {
+					return false;
+		}
 		return count($this->_d[$priority]);
 	}
 
@@ -203,13 +206,15 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
-			return $this->_fd;
+		if(is_array($this->_fd)) {
+					return $this->_fd;
+		}
 
 		$this->sortPriorities();
 		$this->_fd = [];
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		}
 		return $this->_fd;
 	}
 
@@ -226,8 +231,9 @@ 
 		if($index >= 0 && $index < $this->getCount()) {
 			$arr = $this->flattenPriorities();
 			return $arr[$index];
-		} else
-			throw new TInvalidDataValueException('list_index_invalid', $index);
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid', $index);
+		}
 	}
 
 	/**
@@ -237,8 +243,9 @@ 
 	 */
 	public function itemsAtPriority($priority = null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
+		if($priority === null) {
+					$priority = $this->getDefaultPriority();
+		}
 		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		return isset($this->_d[$priority])?$this->_d[$priority]:null;
@@ -252,8 +259,9 @@ 
 	 */
 	public function itemAtIndexInPriority($index, $priority = null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
+		if($priority === null) {
+					$priority = $this->getDefaultPriority();
+		}
 		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		return !isset($this->_d[$priority])?false:(
@@ -271,8 +279,9 @@ 
 	 */
 	public function add($item, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
 		return $this->insertAtIndexInPriority($item, false, $priority, true);
 	}
@@ -287,13 +296,15 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
-		if(($priority = $this->priorityAt($index, true)) !== false)
-			$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
-		else
-			throw new TInvalidDataValueException('list_index_invalid', $index);
+		if(($priority = $this->priorityAt($index, true)) !== false) {
+					$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid', $index);
+		}
 	}
 
 	/**
@@ -308,21 +319,25 @@ 
 	 */
 	public function insertAtIndexInPriority($item, $index = false, $priority = null, $preserveCache = false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
+		if($priority === null) {
+					$priority = $this->getDefaultPriority();
+		}
 		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc = 0;
-			foreach($this->_d as $prioritykey => $items)
-				if($prioritykey >= $priority)
+			foreach($this->_d as $prioritykey => $items) {
+							if($prioritykey >= $priority)
 					break;
-				else
-					$cc += count($items);
+			}
+				else {
+									$cc += count($items);
+				}
 
 			if($index === false && isset($this->_d[$priority])) {
 				$c = count($this->_d[$priority]);
@@ -337,8 +352,10 @@ 
 				$this->_d[$priority] = [$item];
 			}
 
-			if($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
+			if($this->_fd && is_array($this->_fd)) {
+				// if there is a flattened array cache
 				array_splice($this->_fd, $c, 0, [$item]);
+			}
 		} else {
 			$c = null;
 			if($index === false && isset($this->_d[$priority])) {
@@ -352,10 +369,11 @@ 
 				$this->_o = false;
 				$this->_d[$priority] = [$item];
 			}
-			if($this->_fd && is_array($this->_fd) && count($this->_d) == 1)
-				array_splice($this->_fd, $cc, 0, [$item]);
-			else
-				$this->_fd = null;
+			if($this->_fd && is_array($this->_fd) && count($this->_d) == 1) {
+							array_splice($this->_fd, $cc, 0, [$item]);
+			} else {
+							$this->_fd = null;
+			}
 		}
 
 		$this->_c++;
@@ -376,24 +394,27 @@ 
 	 */
 	public function remove($item, $priority = false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
 		if(($p = $this->priorityOf($item, true)) !== false)
 		{
 			if($priority !== false) {
-				if($priority === null)
-					$priority = $this->getDefaultPriority();
+				if($priority === null) {
+									$priority = $this->getDefaultPriority();
+				}
 				$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-				if($p[0] != $priority)
-					throw new TInvalidDataValueException('list_item_inexistent');
+				if($p[0] != $priority) {
+									throw new TInvalidDataValueException('list_item_inexistent');
+				}
 			}
 			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
+		} else {
+					throw new TInvalidDataValueException('list_item_inexistent');
 		}
-		else
-			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 
 	/**
@@ -405,11 +426,13 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
-		if(($priority = $this->priorityAt($index, true)) !== false)
-			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		if(($priority = $this->priorityAt($index, true)) !== false) {
+					return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		}
 		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
@@ -423,22 +446,26 @@ 
 	 */
 	public function removeAtIndexInPriority($index, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
+		if($priority === null) {
+					$priority = $this->getDefaultPriority();
+		}
 		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if(!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority])) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 
 		// $value is an array of elements removed, only one
 		$value = array_splice($this->_d[$priority], $index, 1);
 		$value = $value[0];
 
-		if(!count($this->_d[$priority]))
-			unset($this->_d[$priority]);
+		if(!count($this->_d[$priority])) {
+					unset($this->_d[$priority]);
+		}
 
 		$this->_c--;
 		$this->_fd = null;
@@ -450,12 +477,14 @@ 
 	 */
 	public function clear()
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
 		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]);
 		}
 	}
@@ -475,10 +504,11 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index = array_search($item, $this->flattenPriorities(), true)) === false)
-			return -1;
-		else
-			return $index;
+		if(($index = array_search($item, $this->flattenPriorities(), true)) === false) {
+					return -1;
+		} else {
+					return $index;
+		}
 	}
 
 	/**
@@ -500,8 +530,9 @@ 
 				$absindex += $index;
 				return $withindex?[$priority,$index,$absindex,
 						'priority' => $priority,'index' => $index,'absindex' => $absindex]:$priority;
-			} else
-				$absindex += count($items);
+			} else {
+							$absindex += count($items);
+			}
 		}
 
 		return false;
@@ -518,17 +549,19 @@ 
 	 */
 	public function priorityAt($index, $withindex = false)
 	{
-		if($index < 0 || $index >= $this->getCount())
-			throw new TInvalidDataValueException('list_index_invalid', $index);
+		if($index < 0 || $index >= $this->getCount()) {
+					throw new TInvalidDataValueException('list_index_invalid', $index);
+		}
 
 		$absindex = $index;
 		$this->sortPriorities();
 		foreach($this->_d as $priority => $items) {
-			if($index >= ($c = count($items)))
-				$index -= $c;
-			else
-				return $withindex?[$priority,$index,$absindex,
+			if($index >= ($c = count($items))) {
+							$index -= $c;
+			} else {
+							return $withindex?[$priority,$index,$absindex,
 						'priority' => $priority,'index' => $index,'absindex' => $absindex]:$priority;
+			}
 		}
 		return false;
 	}
@@ -543,11 +576,13 @@ 
 	 */
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
-		if(($priority = $this->priorityOf($indexitem, true)) === false)
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if(($priority = $this->priorityOf($indexitem, true)) === false) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 
 		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 
@@ -564,11 +599,13 @@ 
 	 */
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
+		}
 
-		if(($priority = $this->priorityOf($indexitem, true)) === false)
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if(($priority = $this->priorityOf($indexitem, true)) === false) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 
 		$this->insertAtIndexInPriority($item, $priority[1] + 1, $priority[0]);
 
@@ -605,8 +642,9 @@ 
 		$items = [];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
-			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
-				break;
+			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority) {
+							break;
+			}
 			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
@@ -625,8 +663,9 @@ 
 		$items = [];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
-			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
-				continue;
+			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority) {
+							continue;
+			}
 			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
@@ -643,20 +682,25 @@ 
 	{
 		if($data instanceof TPriorityList)
 		{
-			if($this->getCount() > 0)
-				$this->clear();
+			if($this->getCount() > 0) {
+							$this->clear();
+			}
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index => $item)
-					$this->insertAtIndexInPriority($item, $index, $priority);
+				foreach($data->itemsAtPriority($priority) as $index => $item) {
+									$this->insertAtIndexInPriority($item, $index, $priority);
+				}
 			}
 		} elseif(is_array($data) || $data instanceof \Traversable) {
-			if($this->getCount() > 0)
-				$this->clear();
-			foreach($data as $key => $item)
-				$this->add($item);
-		} elseif($data !== null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
+			if($this->getCount() > 0) {
+							$this->clear();
+			}
+			foreach($data as $key => $item) {
+							$this->add($item);
+			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
+		}
 	}
 
 	/**
@@ -673,18 +717,19 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index => $item)
-					$this->insertAtIndexInPriority($item, false, $priority);
+				foreach($data->itemsAtPriority($priority) as $index => $item) {
+									$this->insertAtIndexInPriority($item, false, $priority);
+				}
 			}
-		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		} elseif(is_array($data) || $data instanceof \Traversable)
 		{
-			foreach($data as $priority => $item)
-				$this->add($item);
+			foreach($data as $priority => $item) {
+							$this->add($item);
+			}
 
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
 	/**
@@ -723,8 +768,9 @@ 
 	 */
 	public function offsetSet($offset, $item)
 	{
-		if($offset === null)
-			return $this->add($item);
+		if($offset === null) {
+					return $this->add($item);
+		}
 		if($offset === $this->getCount()) {
 			$priority = $this->priorityAt($offset - 1, true);
 			$priority[1]++;

framework/Collections/TQueue.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function __construct($data = null)
 	{
-		if($data !== null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 
@@ -76,16 +76,16 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof \Traversable))
+		if (is_array($data) || ($data instanceof \Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
 				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
@@ -115,7 +115,7 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c === 0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 			return $this->_d[0];
@@ -128,7 +128,7 @@ 
 	 */
 	public function dequeue()
 	{
-		if($this->_c === 0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 		{

Braces +13 added lines, -11 removed lines

@@ -56,8 +56,9 @@ 
 	 */
 	public function __construct($data = null)
 	{
-		if($data !== null)
-			$this->copyFrom($data);
+		if($data !== null) {
+					$this->copyFrom($data);
+		}
 	}
 
 	/**
@@ -84,9 +85,9 @@ 
 				$this->_d[] = $item;
 				++$this->_c;
 			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('queue_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
 	/**
@@ -115,10 +116,11 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c === 0)
-			throw new TInvalidOperationException('queue_empty');
-		else
-			return $this->_d[0];
+		if($this->_c === 0) {
+					throw new TInvalidOperationException('queue_empty');
+		} else {
+					return $this->_d[0];
+		}
 	}
 
 	/**
@@ -128,9 +130,9 @@ 
 	 */
 	public function dequeue()
 	{
-		if($this->_c === 0)
-			throw new TInvalidOperationException('queue_empty');
-		else
+		if($this->_c === 0) {
+					throw new TInvalidOperationException('queue_empty');
+		} else
 		{
 			--$this->_c;
 			return array_shift($this->_d);

framework/Collections/TStack.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function __construct($data = null)
 	{
-		if($data !== null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 
@@ -75,16 +75,16 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof \Traversable))
+		if (is_array($data) || ($data instanceof \Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
 				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
@@ -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
 		{

Braces +13 added lines, -11 removed lines

@@ -55,8 +55,9 @@ 
 	 */
 	public function __construct($data = null)
 	{
-		if($data !== null)
-			$this->copyFrom($data);
+		if($data !== null) {
+					$this->copyFrom($data);
+		}
 	}
 
 	/**
@@ -83,9 +84,9 @@ 
 				$this->_d[] = $item;
 				++$this->_c;
 			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('stack_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
 	/**
@@ -114,10 +115,11 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c === 0)
-			throw new TInvalidOperationException('stack_empty');
-		else
-			return $this->_d[$this->_c - 1];
+		if($this->_c === 0) {
+					throw new TInvalidOperationException('stack_empty');
+		} else {
+					return $this->_d[$this->_c - 1];
+		}
 	}
 
 	/**
@@ -127,9 +129,9 @@ 
 	 */
 	public function pop()
 	{
-		if($this->_c === 0)
-			throw new TInvalidOperationException('stack_empty');
-		else
+		if($this->_c === 0) {
+					throw new TInvalidOperationException('stack_empty');
+		} else
 		{
 			--$this->_c;
 			return array_pop($this->_d);

framework/Collections/TAttributeCollection.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key), $value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

Braces +3 added lines, -2 removed lines

@@ -52,8 +52,9 @@
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_caseSensitive === false)
-			$exprops[] = "\0Prado\Collections\TAttributeCollection\0_caseSensitive";
+		if ($this->_caseSensitive === false) {
+					$exprops[] = "\0Prado\Collections\TAttributeCollection\0_caseSensitive";
+		}
 	}
 
 	/**

framework/Collections/TPagedDataSource.php

Spacing +20 added lines, -20 removed lines

@@ -72,13 +72,13 @@ 
 	 */
 	public function setDataSource($value)
 	{
-		if(!($value instanceof TMap) && !($value instanceof TList))
+		if (!($value instanceof TMap) && !($value instanceof TList))
 		{
-			if(is_array($value))
+			if (is_array($value))
 				$value = new TMap($value);
-			elseif($value instanceof \Traversable)
+			elseif ($value instanceof \Traversable)
 				$value = new TList($value);
-			elseif($value !== null)
+			elseif ($value !== null)
 				throw new TInvalidDataTypeException('pageddatasource_datasource_invalid');
 		}
 		$this->_dataSource = $value;
@@ -97,7 +97,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
+		if (($value = TPropertyValue::ensureInteger($value)) > 0)
 			$this->_pageSize = $value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_pagesize_invalid');
@@ -116,7 +116,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = 0;
 		$this->_currentPageIndex = $value;
 	}
@@ -166,7 +166,7 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) >= 0)
+		if (($value = TPropertyValue::ensureInteger($value)) >= 0)
 			$this->_virtualCount = $value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_virtualitemcount_invalid');
@@ -177,11 +177,11 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_dataSource === null)
+		if ($this->_dataSource === null)
 			return 0;
-		if(!$this->_allowPaging)
+		if (!$this->_allowPaging)
 			return $this->getDataSourceCount();
-		if(!$this->_allowCustomPaging && $this->getIsLastPage())
+		if (!$this->_allowCustomPaging && $this->getIsLastPage())
 			return $this->getDataSourceCount() - $this->getFirstIndexInPage();
 		return $this->_pageSize;
 	}
@@ -201,12 +201,12 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_dataSource === null)
+		if ($this->_dataSource === null)
 			return 0;
 		$count = $this->getDataSourceCount();
-		if(!$this->_allowPaging || $count <= 0)
+		if (!$this->_allowPaging || $count <= 0)
 			return 1;
-		return (int)(($count + $this->_pageSize - 1) / $this->_pageSize);
+		return (int) (($count + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		if($this->_allowPaging)
+		if ($this->_allowPaging)
 			return $this->_currentPageIndex === 0;
 		else
 			return true;
@@ -225,7 +225,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		if($this->_allowPaging)
+		if ($this->_allowPaging)
 			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,9 +248,9 @@ 
 	 */
 	public function getDataSourceCount()
 	{
-		if($this->_dataSource === null)
+		if ($this->_dataSource === null)
 			return 0;
-		elseif($this->_allowCustomPaging)
+		elseif ($this->_allowCustomPaging)
 			return $this->_virtualCount;
 		else
 			return $this->_dataSource->getCount();
@@ -261,9 +261,9 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_dataSource instanceof TList)
+		if ($this->_dataSource instanceof TList)
 			return new TPagedListIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
-		elseif($this->_dataSource instanceof TMap)
+		elseif ($this->_dataSource instanceof TMap)
 			return new TPagedMapIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
 		else
 			return null;

Braces +64 added lines, -50 removed lines

@@ -74,12 +74,13 @@ 
 	{
 		if(!($value instanceof TMap) && !($value instanceof TList))
 		{
-			if(is_array($value))
-				$value = new TMap($value);
-			elseif($value instanceof \Traversable)
-				$value = new TList($value);
-			elseif($value !== null)
-				throw new TInvalidDataTypeException('pageddatasource_datasource_invalid');
+			if(is_array($value)) {
+							$value = new TMap($value);
+			} elseif($value instanceof \Traversable) {
+							$value = new TList($value);
+			} elseif($value !== null) {
+							throw new TInvalidDataTypeException('pageddatasource_datasource_invalid');
+			}
 		}
 		$this->_dataSource = $value;
 	}
@@ -97,10 +98,11 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_pageSize = $value;
-		else
-			throw new TInvalidDataValueException('pageddatasource_pagesize_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) > 0) {
+					$this->_pageSize = $value;
+		} else {
+					throw new TInvalidDataValueException('pageddatasource_pagesize_invalid');
+		}
 	}
 
 	/**
@@ -116,8 +118,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = 0;
+		}
 		$this->_currentPageIndex = $value;
 	}
 
@@ -166,10 +169,11 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) >= 0)
-			$this->_virtualCount = $value;
-		else
-			throw new TInvalidDataValueException('pageddatasource_virtualitemcount_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) >= 0) {
+					$this->_virtualCount = $value;
+		} else {
+					throw new TInvalidDataValueException('pageddatasource_virtualitemcount_invalid');
+		}
 	}
 
 	/**
@@ -177,12 +181,15 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_dataSource === null)
-			return 0;
-		if(!$this->_allowPaging)
-			return $this->getDataSourceCount();
-		if(!$this->_allowCustomPaging && $this->getIsLastPage())
-			return $this->getDataSourceCount() - $this->getFirstIndexInPage();
+		if($this->_dataSource === null) {
+					return 0;
+		}
+		if(!$this->_allowPaging) {
+					return $this->getDataSourceCount();
+		}
+		if(!$this->_allowCustomPaging && $this->getIsLastPage()) {
+					return $this->getDataSourceCount() - $this->getFirstIndexInPage();
+		}
 		return $this->_pageSize;
 	}
 
@@ -201,11 +208,13 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_dataSource === null)
-			return 0;
+		if($this->_dataSource === null) {
+					return 0;
+		}
 		$count = $this->getDataSourceCount();
-		if(!$this->_allowPaging || $count <= 0)
-			return 1;
+		if(!$this->_allowPaging || $count <= 0) {
+					return 1;
+		}
 		return (int)(($count + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
@@ -214,10 +223,11 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		if($this->_allowPaging)
-			return $this->_currentPageIndex === 0;
-		else
-			return true;
+		if($this->_allowPaging) {
+					return $this->_currentPageIndex === 0;
+		} else {
+					return true;
+		}
 	}
 
 	/**
@@ -225,10 +235,11 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		if($this->_allowPaging)
-			return $this->_currentPageIndex === $this->getPageCount() - 1;
-		else
-			return true;
+		if($this->_allowPaging) {
+					return $this->_currentPageIndex === $this->getPageCount() - 1;
+		} else {
+					return true;
+		}
 	}
 
 	/**
@@ -237,10 +248,11 @@ 
 	 */
 	public function getFirstIndexInPage()
 	{
-		if($this->_dataSource !== null && $this->_allowPaging && !$this->_allowCustomPaging)
-			return $this->_currentPageIndex * $this->_pageSize;
-		else
-			return 0;
+		if($this->_dataSource !== null && $this->_allowPaging && !$this->_allowCustomPaging) {
+					return $this->_currentPageIndex * $this->_pageSize;
+		} else {
+					return 0;
+		}
 	}
 
 	/**
@@ -248,12 +260,13 @@ 
 	 */
 	public function getDataSourceCount()
 	{
-		if($this->_dataSource === null)
-			return 0;
-		elseif($this->_allowCustomPaging)
-			return $this->_virtualCount;
-		else
-			return $this->_dataSource->getCount();
+		if($this->_dataSource === null) {
+					return 0;
+		} elseif($this->_allowCustomPaging) {
+					return $this->_virtualCount;
+		} else {
+					return $this->_dataSource->getCount();
+		}
 	}
 
 	/**
@@ -261,11 +274,12 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_dataSource instanceof TList)
-			return new TPagedListIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
-		elseif($this->_dataSource instanceof TMap)
-			return new TPagedMapIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
-		else
-			return null;
+		if($this->_dataSource instanceof TList) {
+					return new TPagedListIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
+		} elseif($this->_dataSource instanceof TMap) {
+					return new TPagedMapIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
+		} else {
+					return null;
+		}
 	}
 }
\ No newline at end of file