pradosoft / prado

framework/Collections/TMap.php

Spacing +13 added lines, -13 removed lines

@@ -42,11 +42,11 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r = false;
+	private $_r=false;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -57,10 +57,10 @@ 
 	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";
 	}
 
 	/**
@@ -70,9 +70,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);
 	}
@@ -90,7 +90,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r = TPropertyValue::ensureBoolean($value);
+		$this->_r=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	public function add($key, $value)
 	{
 		if(!$this->_r)
-			$this->_d[$key] = $value;
+			$this->_d[$key]=$value;
 		else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
@@ -167,7 +167,7 @@ 
 		{
 			if(isset($this->_d[$key]) || array_key_exists($key, $this->_d))
 			{
-				$value = $this->_d[$key];
+				$value=$this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
 			}
@@ -219,7 +219,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -236,7 +236,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/TPagedMapIterator.php

Spacing +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@ 
 	 */
 	public function __construct(TMap $map, $startIndex, $count)
 	{
-		$this->_map = $map;
-		$this->_index = 0;
-		$this->_startIndex = $startIndex;
+		$this->_map=$map;
+		$this->_index=0;
+		$this->_startIndex=$startIndex;
 		if($startIndex + $count > $map->getCount())
-			$this->_count = $map->getCount() - $startIndex;
+			$this->_count=$map->getCount() - $startIndex;
 		else
-			$this->_count = $count;
-		$this->_iterator = $map->getIterator();
+			$this->_count=$count;
+		$this->_iterator=$map->getIterator();
 	}
 
 	/**
@@ -54,9 +54,9 @@ 
 	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;
+		$this->_index=0;
 	}
 
 	/**

framework/Collections/TQueueIterator.php

Spacing +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
 	 */
 	public function __construct(&$data)
 	{
-		$this->_d = &$data;
-		$this->_i = 0;
-		$this->_c = count($this->_d);
+		$this->_d=&$data;
+		$this->_i=0;
+		$this->_c=count($this->_d);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_i = 0;
+		$this->_i=0;
 	}
 
 	/**

framework/Collections/TPagedListFetchDataEventParameter.php

Spacing +4 added lines, -4 removed lines

@@ -41,9 +41,9 @@ 
 	 */
 	public function __construct($pageIndex, $offset, $limit)
 	{
-		$this->_pageIndex = $pageIndex;
-		$this->_offset = $offset;
-		$this->_limit = $limit;
+		$this->_pageIndex=$pageIndex;
+		$this->_offset=$offset;
+		$this->_limit=$limit;
 	}
 
 	/**
@@ -83,6 +83,6 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data = $value;
+		$this->_data=$value;
 	}
 }
\ No newline at end of file

framework/Collections/TPagedList.php

Spacing +31 added lines, -31 removed lines

@@ -63,26 +63,26 @@ 
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_customPaging = false;
+	private $_customPaging=false;
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize = 10;
+	private $_pageSize=10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex = -1;
+	private $_currentPageIndex=-1;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount = -1;
+	private $_virtualCount=-1;
 
 	/**
 	 * Constructor.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
 	 */
-	public function __construct($data = null, $readOnly = false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		parent::__construct($data, true);
 	}
@@ -100,7 +100,7 @@ 
 	 */
 	public function setCustomPaging($value)
 	{
-		$this->_customPaging = TPropertyValue::ensureBoolean($value);
+		$this->_customPaging=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_pageSize = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
+			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
 	}
@@ -136,7 +136,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
+		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false)
 			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
 	}
 
@@ -169,21 +169,21 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex === $this->_currentPageIndex)
+		if($pageIndex===$this->_currentPageIndex)
 			return $pageIndex;
 		if($this->_customPaging)
 		{
 			if($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param = new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
+				$param=new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
-				if(($data = $param->getData()) !== null)
+				if(($data=$param->getData())!==null)
 				{
 					$this->setReadOnly(false);
 					$this->copyFrom($data);
 					$this->setReadOnly(true);
-					$oldPage = $this->_currentPageIndex;
-					$this->_currentPageIndex = $pageIndex;
+					$oldPage=$this->_currentPageIndex;
+					$this->_currentPageIndex=$pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
 				}
@@ -197,7 +197,7 @@ 
 		{
 			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
-				$this->_currentPageIndex = $pageIndex;
+				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
 			}
@@ -237,9 +237,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
-		$this->_virtualCount = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
+		$this->_virtualCount=$value;
 	}
 
 	/**
@@ -250,12 +250,12 @@ 
 		if($this->_customPaging)
 		{
 			if($this->_virtualCount >= 0)
-				return (int)(($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		return $this->_currentPageIndex === 0;
+		return $this->_currentPageIndex===0;
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex === $this->getPageCount() - 1;
+		return $this->_currentPageIndex===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex === $this->getPageCount() - 1)
+			if($this->_currentPageIndex===$this->getPageCount() - 1)
 				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
@@ -299,7 +299,7 @@ 
 			return parent::getIterator();
 		else
 		{
-			$data = $this->toArray();
+			$data=$this->toArray();
 			return new \ArrayIterator($data);
 		}
 	}
@@ -325,9 +325,9 @@ 
 	 */
 	public function indexOf($item)
 	{
-		$c = $this->getCount();
-		for($i = 0;$i < $c;++$i)
-			if($this->itemAt($i) === $item)
+		$c=$this->getCount();
+		for($i=0; $i < $c; ++$i)
+			if($this->itemAt($i)===$item)
 				return $i;
 		return -1;
 	}
@@ -360,10 +360,10 @@ 
 	 */
 	public function toArray()
 	{
-		$c = $this->getCount();
-		$array = [];
-		for($i = 0;$i < $c;++$i)
-			$array[$i] = $this->itemAt($i);
+		$c=$this->getCount();
+		$array=[];
+		for($i=0; $i < $c; ++$i)
+			$array[$i]=$this->itemAt($i);
 		return $array;
 	}
 }
\ No newline at end of file

framework/Collections/TAttributeCollection.php

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
  */
 class TAttributeCollection extends TMap
 {
-	private $_caseSensitive = false;
+	private $_caseSensitive=false;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -52,8 +52,8 @@ 
 	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";
 	}
 
 	/**
@@ -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);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -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));
 	}
 
 	/**

framework/Collections/TQueue.php

Spacing +12 added lines, -12 removed lines

@@ -41,12 +41,12 @@ 
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c = 0;
+	private $_c=0;
 
 	/**
 	 * Constructor.
@@ -54,9 +54,9 @@ 
 	 * @param array|Iterator the intial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data = null)
+	public function __construct($data=null)
 	{
-		if($data !== null)
+		if($data!==null)
 			$this->copyFrom($data);
 	}
 
@@ -81,11 +81,11 @@ 
 			$this->clear();
 			foreach($data as $item)
 			{
-				$this->_d[] = $item;
+				$this->_d[]=$item;
 				++$this->_c;
 			}
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
@@ -94,8 +94,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c = 0;
-		$this->_d = [];
+		$this->_c=0;
+		$this->_d=[];
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item, $this->_d, true) !== false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -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
 		{
@@ -144,7 +144,7 @@ 
 	public function enqueue($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**

framework/TPropertyValue.php

Spacing +21 added lines, -21 removed lines

@@ -62,10 +62,10 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value, 'true') == 0 || $value != 0;
+		if(is_string($value))
+			return strcasecmp($value, 'true')==0 || $value!=0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -77,12 +77,12 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
+		if(TJavaScript::isJsLiteral($value))
 			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
+		if(is_bool($value))
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -118,18 +118,18 @@ 
 	{
 		if(is_string($value))
 		{
-			$value = trim($value);
-			$len = strlen($value);
-			if ($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
+			$value=trim($value);
+			$len=strlen($value);
+			if($len >= 2 && $value[0]=='(' && $value[$len - 1]==')')
 			{
-				eval('$array=array' . $value . ';');
+				eval('$array=array'.$value.';');
 				return $array;
 			}
 			else
-				return $len > 0?[$value]:[];
+				return $len > 0 ? [$value] : [];
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -160,11 +160,11 @@ 
 	 */
 	public static function ensureEnum($value, $enums)
 	{
-		static $types = [];
-		if(func_num_args() === 2 && is_string($enums))
+		static $types=[];
+		if(func_num_args()===2 && is_string($enums))
 		{
 			if(!isset($types[$enums]))
-				$types[$enums] = new \ReflectionClass($enums);
+				$types[$enums]=new \ReflectionClass($enums);
 			if($types[$enums]->hasConstant($value))
 				return $value;
 			else
@@ -174,7 +174,7 @@ 
 		}
 		elseif(!is_array($enums))
 		{
-			$enums = func_get_args();
+			$enums=func_get_args();
 			array_shift($enums);
 		}
 		if(in_array($value, $enums, true))
@@ -190,6 +190,6 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ?null:$value;
 	}
 }
\ No newline at end of file

framework/TApplicationStatePersister.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Name of the value stored in cache
 	 */
-	const CACHE_NAME = 'prado:appstate';
+	const CACHE_NAME='prado:appstate';
 
 	/**
 	 * Initializes module.
@@ -43,7 +43,7 @@ 
 	 */
 	protected function getStateFilePath()
 	{
-		return $this->getApplication()->getRuntimePath() . '/global.cache';
+		return $this->getApplication()->getRuntimePath().'/global.cache';
 	}
 
 	/**
@@ -52,11 +52,11 @@ 
 	 */
 	public function load()
 	{
-		if(($cache = $this->getApplication()->getCache()) !== null && ($value = $cache->get(self::CACHE_NAME)) !== false)
+		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
 			return unserialize($value);
 		else
 		{
-			if(($content = @file_get_contents($this->getStateFilePath())) !== false)
+			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
 				return unserialize($content);
 			else
 				return null;
@@ -69,18 +69,18 @@ 
 	 */
 	public function save($state)
 	{
-		$content = serialize($state);
-		$saveFile = true;
-		if(($cache = $this->getApplication()->getCache()) !== null)
+		$content=serialize($state);
+		$saveFile=true;
+		if(($cache=$this->getApplication()->getCache())!==null)
 		{
-			if($cache->get(self::CACHE_NAME) === $content)
-				$saveFile = false;
+			if($cache->get(self::CACHE_NAME)===$content)
+				$saveFile=false;
 			else
 				$cache->set(self::CACHE_NAME, $content);
 		}
 		if($saveFile)
 		{
-			$fileName = $this->getStateFilePath();
+			$fileName=$this->getStateFilePath();
 			file_put_contents($fileName, $content, LOCK_EX);
 		}
 	}