pradosoft / prado

framework/Data/SqlMap/Configuration/TSimpleDynamicParser.php

Spacing +7 added lines, -7 removed lines

@@ -19,8 +19,8 @@ 
  */
 class TSimpleDynamicParser
 {
-	const PARAMETER_TOKEN_REGEXP = '/\$([^\$]+)\$/';
-	const DYNAMIC_TOKEN = '`!`';
+	const PARAMETER_TOKEN_REGEXP='/\$([^\$]+)\$/';
+	const DYNAMIC_TOKEN='`!`';
 
 	/**
 	 * Parse the sql text for dynamic place holders of the form $name$.
@@ -29,13 +29,13 @@ 
 	 */
 	public function parse($sqlText)
 	{
-		$matches = array();
-		$mappings = array();
+		$matches=array();
+		$mappings=array();
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
-		for($i = 0, $k=count($matches[1]); $i<$k; $i++)
+		for($i=0, $k=count($matches[1]); $i < $k; $i++)
 		{
-			$mappings[] = $matches[1][$i];
-			$sqlText = str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);
+			$mappings[]=$matches[1][$i];
+			$sqlText=str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);
 		}
 		return array('sql'=>$sqlText, 'parameters'=>$mappings);
 	}

framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Regular expression for parsing inline parameter maps.
 	 */
-	const PARAMETER_TOKEN_REGEXP = '/#([^#]+)#/';
+	const PARAMETER_TOKEN_REGEXP='/#([^#]+)#/';
 
 	/**
 	 * Parse the sql text for inline parameters.
@@ -35,14 +35,14 @@ 
 	 */
 	public function parse($sqlText, $scope)
 	{
-		$matches = array();
-		$mappings = array();
+		$matches=array();
+		$mappings=array();
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
 
-		for($i = 0, $k=count($matches[1]); $i<$k; $i++)
+		for($i=0, $k=count($matches[1]); $i < $k; $i++)
 		{
-			$mappings[] = $this->parseMapping($matches[1][$i], $scope);
-			$sqlText = str_replace($matches[0][$i], '?', $sqlText);
+			$mappings[]=$this->parseMapping($matches[1][$i], $scope);
+			$sqlText=str_replace($matches[0][$i], '?', $sqlText);
 		}
 		return array('sql'=>$sqlText, 'parameters'=>$mappings);
 	}
@@ -55,13 +55,13 @@ 
 	 */
 	protected function parseMapping($token, $scope)
 	{
-		$mapping = new TParameterProperty;
-		$properties = explode(',', $token);
+		$mapping=new TParameterProperty;
+		$properties=explode(',', $token);
 		$mapping->setProperty(trim(array_shift($properties)));
 		foreach($properties as $property)
 		{
-			$prop = explode('=',$property);
-			$name = trim($prop[0]); $value=trim($prop[1]);
+			$prop=explode('=', $property);
+			$name=trim($prop[0]); $value=trim($prop[1]);
 			if($mapping->canSetProperty($name))
 				$mapping->{'set'.$name}($value);
 			else

framework/Data/TDbCommand.php

Braces +6 added lines, -12 removed lines

@@ -109,8 +109,7 @@ 
 			try
 			{
 				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
 			}
@@ -186,11 +185,9 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
-			}
-			else
+			} else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -223,8 +220,7 @@ 
 			else
 				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -250,8 +246,7 @@ 
 			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -279,8 +274,7 @@ 
 				return stream_get_contents($result);
 			else
 				return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}

Spacing +12 added lines, -12 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param TDbConnection the database connection
 	 * @param string the SQL statement to be executed
 	 */
-	public function __construct(TDbConnection $connection,$text)
+	public function __construct(TDbConnection $connection, $text)
 	{
 		$this->_connection=$connection;
 		$this->setText($text);
@@ -56,7 +56,7 @@ 
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0TDbCommand\0_statement"));
+		return array_diff(parent::__sleep(), array("\0TDbCommand\0_statement"));
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 			}
 			catch(Exception $e)
 			{
-				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
+				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
 		}
 	}
@@ -142,11 +142,11 @@ 
 	{
 		$this->prepare();
 		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
+			$this->_statement->bindParam($name, $value);
 		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
+			$this->_statement->bindParam($name, $value, $dataType);
 		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+			$this->_statement->bindParam($name, $value, $dataType, $length);
 	}
 
 	/**
@@ -163,9 +163,9 @@ 
 	{
 		$this->prepare();
 		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
+			$this->_statement->bindValue($name, $value);
 		else
-			$this->_statement->bindValue($name,$value,$dataType);
+			$this->_statement->bindValue($name, $value, $dataType);
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -226,7 +226,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -253,7 +253,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -282,7 +282,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 

Doc Comments +2 added lines, -1 removed lines

@@ -165,6 +165,7 @@ 
 	 * placeholders, this will be the 1-indexed position of the parameter.
 	 * @param mixed The value to bind to the parameter
 	 * @param int SQL data type of the parameter
+	 * @param string $name
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
 	 */
 	public function bindValue($name, $value, $dataType=null)
@@ -269,7 +270,7 @@ 
 	 * Executes the SQL statement and returns the value of the first column in the first row of data.
 	 * This is a convenient method of {@link query} when only a single scalar
 	 * value is needed (e.g. obtaining the count of the records).
-	 * @return mixed the value of the first column in the first row of the query result. False is returned if there is no value.
+	 * @return string the value of the first column in the first row of the query result. False is returned if there is no value.
 	 * @throws TDbException execution failed
 	 */
 	public function queryScalar()

framework/Caching/TAPCCache.php

Spacing +6 added lines, -6 removed lines

@@ -56,10 +56,10 @@ 
 		if(!extension_loaded('apc'))
 			throw new TConfigurationException('apccache_extension_required');
 
-		if(ini_get('apc.enabled') == false)
+		if(ini_get('apc.enabled')==false)
 			throw new TConfigurationException('apccache_extension_not_enabled');
 
-		if(substr(php_sapi_name(), 0, 3) === 'cli' and ini_get('apc.enable_cli') == false)
+		if(substr(php_sapi_name(), 0, 3)==='cli' and ini_get('apc.enable_cli')==false)
 			throw new TConfigurationException('apccache_extension_not_enabled_cli');
 
 		parent::init($config);
@@ -85,9 +85,9 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
-		return apc_store($key,$value,$expire);
+		return apc_store($key, $value, $expire);
 	}
 
 	/**
@@ -99,9 +99,9 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
-		return apc_add($key,$value,$expire);
+		return apc_add($key, $value, $expire);
 	}
 
 	/**

framework/Caching/TMemCache.php

Spacing +22 added lines, -22 removed lines

@@ -104,17 +104,17 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
+    private $_persistence=true;
     /**
      * @var integer number of buckets to create for this server which in turn control its
      * probability of it being selected. The probability is relative to the total weight
      * of all servers.
      */
-    private $_weight = 1;
+    private $_weight=1;
 
-    private $_timeout = 360;
+    private $_timeout=360;
 
-    private $_retryInterval = 15;
+    private $_retryInterval=15;
 	/**
 	* @var integer Controls the minimum value length before attempting to compress automatically.
 	*/
@@ -125,9 +125,9 @@ 
 	*/
     private $_minSavings=0.0;
 
-    private $_status = true;
+    private $_status=true;
 
-    private $_failureCallback = null;
+    private $_failureCallback=null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -168,26 +168,26 @@ 
 		if(!extension_loaded('memcached') && $this->_useMemcached)
 			throw new TConfigurationException('memcached_extension_required');
 		
-		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
+		$this->_cache=$this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
         {
             foreach($this->_servers as $server)
             {
                 Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+                if($this->_cache->addServer($server['Host'], $server['Port'], $server['Persistent'],
+                    $server['Weight'], $server['Timeout'], $server['RetryInterval'])===false)
+                    throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
             }
         }
         else
         {
             Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+            if($this->_cache->addServer($this->_host, $this->_port)===false)
+                throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
         }
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+            $this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
@@ -210,8 +210,8 @@ 
         			throw new TConfigurationException('memcache_serverport_required');
         		if(!is_numeric($port))
         		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
+        		$server=array('Host'=>$host, 'Port'=>$port, 'Weight'=>1, 'Timeout'=>1800, 'RetryInterval'=>15, 'Persistent'=>true);
+        		$checks=array(
         		    'Weight'=>'memcache_serverweight_invalid',
         		    'Timeout'=>'memcache_servertimeout_invalid',
         		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
@@ -224,7 +224,7 @@ 
         		    else if($value!==null)
         		        throw new TConfigurationException($exception);
         		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+        		$server['Persistent']=TPropertyValue::ensureBoolean($properties->remove('Persistent'));
     			$this->_servers[]=$server;
     		}
 	    }
@@ -350,12 +350,12 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
 		if($this->_useMemcached) {
-			return $this->_cache->set($key,$value,$expire);
+			return $this->_cache->set($key, $value, $expire);
 		} else {
-			return $this->_cache->set($key,$value,0,$expire);
+			return $this->_cache->set($key, $value, 0, $expire);
 		}
 	}
 
@@ -368,12 +368,12 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
 		if($this->_useMemcached) {
-			$this->_cache->add($key,$value,$expire);
+			$this->_cache->add($key, $value, $expire);
 		} else {
-			return $this->_cache->add($key,$value,0,$expire);
+			return $this->_cache->add($key, $value, 0, $expire);
 		}
 	}
 

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         	if (!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
-        }
-        else
+        } else
         	throw new Exception('Please provide a database for message'.
         						' translation.');
        return $conn;

Indentation +62 added lines, -62 removed lines

@@ -111,30 +111,30 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
-    /**
-     * @var integer number of buckets to create for this server which in turn control its
-     * probability of it being selected. The probability is relative to the total weight
-     * of all servers.
-     */
-    private $_weight = 1;
+	private $_persistence = true;
+	/**
+	 * @var integer number of buckets to create for this server which in turn control its
+	 * probability of it being selected. The probability is relative to the total weight
+	 * of all servers.
+	 */
+	private $_weight = 1;
 
-    private $_timeout = 360;
+	private $_timeout = 360;
 
-    private $_retryInterval = 15;
+	private $_retryInterval = 15;
 	/**
-	* @var integer Controls the minimum value length before attempting to compress automatically.
-	*/
-    private $_threshold=0;
+	 * @var integer Controls the minimum value length before attempting to compress automatically.
+	 */
+	private $_threshold=0;
 
 	/**
-	* @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
-	*/
-    private $_minSavings=0.0;
+	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
+	 */
+	private $_minSavings=0.0;
 
-    private $_status = true;
+	private $_status = true;
 
-    private $_failureCallback = null;
+	private $_failureCallback = null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -178,63 +178,63 @@ 
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
-        {
-            foreach($this->_servers as $server)
-            {
-                Prado::trace('Adding server '.$server['Host'].' from serverlist', '\Prado\Caching\TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
-            }
-        }
-        else
-        {
-            Prado::trace('Adding server '.$this->_host, '\Prado\Caching\TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
-        }
+		{
+			foreach($this->_servers as $server)
+			{
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', '\Prado\Caching\TMemCache');
+				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+					$server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
+					throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+			}
+		}
+		else
+		{
+			Prado::trace('Adding server '.$this->_host, '\Prado\Caching\TMemCache');
+			if($this->_cache->addServer($this->_host,$this->_port)===false)
+				throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+		}
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+			$this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
 
-    /**
+	/**
 	 * Loads configuration from an XML element
 	 * @param TXmlElement configuration node
 	 * @throws TConfigurationException if log route class or type is not specified
 	 */
 	private function loadConfig($xml)
 	{
-	    if($xml instanceof TXmlElement)
+		if($xml instanceof TXmlElement)
 		{
-    		foreach($xml->getElementsByTagName('server') as $serverConfig)
-    		{
-    			$properties=$serverConfig->getAttributes();
-    			if(($host=$properties->remove('Host'))===null)
-    				throw new TConfigurationException('memcache_serverhost_required');
-    			if(($port=$properties->remove('Port'))===null)
-        			throw new TConfigurationException('memcache_serverport_required');
-        		if(!is_numeric($port))
-        		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
-        		    'Weight'=>'memcache_serverweight_invalid',
-        		    'Timeout'=>'memcache_servertimeout_invalid',
-        		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
-        		);
-        		foreach($checks as $property=>$exception)
-        		{
-        		    $value=$properties->remove($property);
-        		    if($value!==null && is_numeric($value))
-        		        $server[$property]=$value;
-        		    else if($value!==null)
-        		        throw new TConfigurationException($exception);
-        		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
-    			$this->_servers[]=$server;
-    		}
-	    }
+			foreach($xml->getElementsByTagName('server') as $serverConfig)
+			{
+				$properties=$serverConfig->getAttributes();
+				if(($host=$properties->remove('Host'))===null)
+					throw new TConfigurationException('memcache_serverhost_required');
+				if(($port=$properties->remove('Port'))===null)
+					throw new TConfigurationException('memcache_serverport_required');
+				if(!is_numeric($port))
+					throw new TConfigurationException('memcache_serverport_invalid');
+				$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
+				$checks = array(
+					'Weight'=>'memcache_serverweight_invalid',
+					'Timeout'=>'memcache_servertimeout_invalid',
+					'RetryInterval'=>'memcach_serverretryinterval_invalid'
+				);
+				foreach($checks as $property=>$exception)
+				{
+					$value=$properties->remove($property);
+					if($value!==null && is_numeric($value))
+						$server[$property]=$value;
+					else if($value!==null)
+						throw new TConfigurationException($exception);
+				}
+				$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
+			}
+		}
 	}
 
 	/**

framework/Caching/TXCache.php

Spacing +7 added lines, -7 removed lines

@@ -52,8 +52,8 @@ 
 		if(!function_exists('xcache_isset'))
 			throw new TConfigurationException('xcache_extension_required');
 
-		$enabled = (int)ini_get('xcache.cacher') !== 0;
-		$var_size = (int)ini_get('xcache.var_size');
+		$enabled=(int) ini_get('xcache.cacher')!==0;
+		$var_size=(int) ini_get('xcache.var_size');
 
 		if(!($enabled && $var_size > 0))
 			throw new TConfigurationException('xcache_extension_not_enabled');
@@ -81,9 +81,9 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
-		return xcache_set($key,$value,$expire);
+		return xcache_set($key, $value, $expire);
 	}
 
 	/**
@@ -95,9 +95,9 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
-		return !xcache_isset($key) ? $this->setValue($key,$value,$expire) : false;
+		return !xcache_isset($key) ? $this->setValue($key, $value, $expire) : false;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function flush()
 	{
-		for($i=0, $max=xcache_count(XC_TYPE_VAR); $i<$max; $i++)
+		for($i=0, $max=xcache_count(XC_TYPE_VAR); $i < $max; $i++)
 		{
 			if(xcache_clear_cache(XC_TYPE_VAR, $i)===false)
 				return false;

framework/Collections/TPagedList.php

Braces +5 added lines, -10 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -81,9 +81,9 @@ 
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
-		parent::__construct($data,true);
+		parent::__construct($data, true);
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
 			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
@@ -146,7 +146,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function onFetchData($param)
 	{
-		$this->raiseEvent('OnFetchData',$this,$param);
+		$this->raiseEvent('OnFetchData', $this, $param);
 	}
 
 	/**
@@ -172,9 +172,9 @@ 
 			return $pageIndex;
 		if($this->_customPaging)
 		{
-			if($pageIndex>=0 && ($this->_virtualCount<0 || $pageIndex<$this->getPageCount()))
+			if($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param=new TPagedListFetchDataEventParameter($pageIndex,$this->_pageSize*$pageIndex,$this->_pageSize);
+				$param=new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
 				if(($data=$param->getData())!==null)
 				{
@@ -194,7 +194,7 @@ 
 		}
 		else
 		{
-			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
+			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
 				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
@@ -211,7 +211,7 @@ 
 	 */
 	public function nextPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex+1);
+		return $this->gotoPage($this->_currentPageIndex + 1);
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	 */
 	public function previousPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex-1);
+		return $this->gotoPage($this->_currentPageIndex - 1);
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		$this->_virtualCount=$value;
 	}
@@ -248,13 +248,13 @@ 
 	{
 		if($this->_customPaging)
 		{
-			if($this->_virtualCount>=0)
-				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
+			if($this->_virtualCount >= 0)
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex===$this->getPageCount()-1;
+		return $this->_currentPageIndex===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -282,8 +282,8 @@ 
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex===$this->getPageCount()-1)
-				return parent::getCount()-$this->_pageSize*$this->_currentPageIndex;
+			if($this->_currentPageIndex===$this->getPageCount() - 1)
+				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
 		}
@@ -315,7 +315,7 @@ 
 		if($this->_customPaging)
 			return parent::itemAt($index);
 		else
-			return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
 	}
 
 	/**
@@ -325,7 +325,7 @@ 
 	public function indexOf($item)
 	{
 		$c=$this->getCount();
-		for($i=0;$i<$c;++$i)
+		for($i=0; $i < $c; ++$i)
 			if($this->itemAt($i)===$item)
 				return $i;
 		return -1;
@@ -339,7 +339,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -361,7 +361,7 @@ 
 	{
 		$c=$this->getCount();
 		$array=array();
-		for($i=0;$i<$c;++$i)
+		for($i=0; $i < $c; ++$i)
 			$array[$i]=$this->itemAt($i);
 		return $array;
 	}

Doc Comments +4 added lines, -1 removed lines

@@ -96,6 +96,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setCustomPaging($value)
 	{
@@ -143,6 +144,7 @@ 
 	 * Raises <b>OnPageIndexChanged</b> event.
 	 * This event is raised each time when the list changes to a different page.
 	 * @param TPagedListPageChangedEventParameter event parameter
+	 * @param TPagedListPageChangedEventParameter|null $param
 	 */
 	public function onPageIndexChanged($param)
 	{
@@ -155,6 +157,7 @@ 
 	 * and needs the new page of data. This event can only be raised when
 	 * {@link setCustomPaging CustomPaging} is true.
 	 * @param TPagedListFetchDataEventParameter event parameter
+	 * @param TPagedListFetchDataEventParameter $param
 	 */
 	public function onFetchData($param)
 	{
@@ -290,7 +293,7 @@ 
 	}
 
 	/**
-	 * @return Iterator iterator
+	 * @return \ArrayIterator iterator
 	 */
 	public function getIterator()
 	{

framework/Collections/TMap.php

Braces +4 added lines, -8 removed lines

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

Doc Comments +2 added lines, -1 removed lines

@@ -86,6 +86,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -95,7 +96,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{

Spacing +16 added lines, -16 removed lines

@@ -56,10 +56,10 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_d===array())
-			$exprops[] = "\0TMap\0_d";
-		if ($this->_r===false)
-			$exprops[] = "\0TMap\0_r";
+		if($this->_d===array())
+			$exprops[]="\0TMap\0_d";
+		if($this->_r===false)
+			$exprops[]="\0TMap\0_r";
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -99,7 +99,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->_d );
+		return new \ArrayIterator($this->_d);
 	}
 
 	/**
@@ -146,12 +146,12 @@ 
 	 * @param mixed value
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		if(!$this->_r)
 			$this->_d[$key]=$value;
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(isset($this->_d[$key]) || array_key_exists($key,$this->_d))
+			if(isset($this->_d[$key]) || array_key_exists($key, $this->_d))
 			{
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
@@ -174,7 +174,7 @@ 
 				return null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_d[$key]) || array_key_exists($key,$this->_d);
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
 	}
 
 	/**
@@ -213,10 +213,10 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -233,7 +233,7 @@ 
 		if(is_array($data) || $data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -267,9 +267,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**

framework/Collections/TList.php

Braces +10 added lines, -20 removed lines

@@ -155,11 +155,9 @@ 
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -180,11 +178,9 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_item_inexistent');
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -210,11 +206,9 @@ 
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -268,8 +262,7 @@ 
 			$this->insertAt($index, $item);
 
 			return $index;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -292,8 +285,7 @@ 
 			$this->insertAt($index + 1, $item);
 
 			return $index + 1;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -319,8 +311,7 @@ 
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -336,8 +327,7 @@ 
 		{
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 

Doc Comments +4 added lines, -2 removed lines

@@ -81,6 +81,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -90,7 +91,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{
@@ -283,7 +284,7 @@ 
 	 * Finds the base item.  If found, the item is inserted after it.
 	 * @param mixed the base item which comes before the second parameter when added to the list
 	 * @param mixed the item
-	 * @return int the index where the item is inserted
+	 * @return double the index where the item is inserted
 	 * @throws TInvalidDataValueException if the base item is not within this list
 	 * @throws TInvalidOperationException if the list is read-only
 	 * @since 3.2a
@@ -334,6 +335,7 @@ 
 	 * Merges iterable data into the map.
 	 * New data will be appended to the end of the existing data.
 	 * @param mixed the data to be merged with, must be an array or object implementing Traversable
+	 * @param \Prado\Web\UI\WebControls\TDataGridColumnCollection|null $data
 	 * @throws TInvalidDataTypeException If data is neither an array nor an iterator.
 	 */
 	public function mergeWith($data)

Spacing +29 added lines, -29 removed lines

@@ -64,7 +64,7 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -94,7 +94,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->_d );
+		return new \ArrayIterator($this->_d);
 	}
 
 	/**
@@ -124,10 +124,10 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 */
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
 
 	/**
@@ -151,22 +151,22 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(!$this->_r)
 		{
 			if($index===$this->_c)
 				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			else if($index >= 0 && $index < $this->_c)
 			{
-				array_splice($this->_d,$index,0,array($item));
+				array_splice($this->_d, $index, 0, array($item));
 				$this->_c++;
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if(($index=$this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -191,7 +191,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
 				if($index===$this->_c)
@@ -213,15 +213,15 @@ 
 				else
 				{
 					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					array_splice($this->_d, $index, 1);
 					return $item;
 				}
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for($i=$this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -240,7 +240,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -249,7 +249,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;
@@ -268,7 +268,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);
@@ -276,7 +276,7 @@ 
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -292,7 +292,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);
@@ -300,7 +300,7 @@ 
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	{
 		if(is_array($data) || ($data instanceof \Traversable))
 		{
-			if($this->_c>0)
+			if($this->_c > 0)
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
@@ -355,7 +355,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 
 	/**
@@ -376,14 +376,14 @@ 
 	 * @param integer the offset to set item
 	 * @param mixed the item value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}