pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TCallbackClientSide class file
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TCallbackClientSide class file
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * TCallbackClientSide class.

Doc Comments +4 added lines, -3 removed lines

@@ -199,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -217,7 +217,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -261,6 +261,7 @@ 
 	 * update. This will automatically set HasPrority to true.
 	 * @param boolean true enables the callback response to update the
 	 * viewstate.
+	 * @param boolean $value
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
@@ -269,7 +270,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +3 added lines, -3 removed lines

@@ -252,7 +252,7 @@ 
 	public function setHasPriority($value)
 	{
 		// mimic the old behavior
-		if(!$value)
+		if (!$value)
 			$this->setEnablePageStateUpdate(false);
 	}
 
@@ -275,7 +275,7 @@ 
 	public function getEnablePageStateUpdate()
 	{
 		$option = $this->getOption('EnablePageStateUpdate');
-		return ($option===null) ? true : $option;
+		return ($option === null) ? true : $option;
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
+		if ($value instanceof TControl)
 			$value = $value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}

Braces +6 added lines, -4 removed lines

@@ -252,8 +252,9 @@ 
 	public function setHasPriority($value)
 	{
 		// mimic the old behavior
-		if(!$value)
-			$this->setEnablePageStateUpdate(false);
+		if(!$value) {
+					$this->setEnablePageStateUpdate(false);
+		}
 	}
 
 	/**
@@ -291,8 +292,9 @@ 
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+		if($value instanceof TControl) {
+					$value = $value->getUniqueID();
+		}
 		$this->setOption('EventTarget', $value);
 	}
 

framework/Collections/TMap.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TMap, TMapIterator classes
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Collections
- */
+	 * TMap, TMapIterator classes
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Collections
+	 */
 
 /**
  * TMap class

Spacing +30 added lines, -30 removed lines

@@ -30,16 +30,16 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TMap extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * @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
@@ -50,9 +50,9 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_d===array())
+		if ($this->_d === array())
 			$exprops[] = "\0TMap\0_d";
-		if ($this->_r===false)
+		if ($this->_r === false)
 			$exprops[] = "\0TMap\0_r";
 	}
 
@@ -63,9 +63,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);
 	}
@@ -83,7 +83,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -140,12 +140,12 @@ 
 	 * @param mixed value
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		if(!$this->_r)
-			$this->_d[$key]=$value;
+		if (!$this->_r)
+			$this->_d[$key] = $value;
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -156,11 +156,11 @@ 
 	 */
 	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];
+				$value = $this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
 			}
@@ -168,7 +168,7 @@ 
 				return null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_d) as $key)
+		foreach (array_keys($this->_d) as $key)
 			$this->remove($key);
 	}
 
@@ -186,7 +186,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_d[$key]) || array_key_exists($key,$this->_d);
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
 	}
 
 	/**
@@ -205,14 +205,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)
-				$this->add($key,$value);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -224,12 +224,12 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if(is_array($data) || $data instanceof Traversable)
+		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);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -261,9 +261,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**

framework/Util/TCallChain.php

Spacing +22 added lines, -22 removed lines

@@ -21,19 +21,19 @@ 
 	/**
 	 *	@var {@link ArrayIterator} for moving through the chained method calls
 	 */
-	private $_iterator=null;
+	private $_iterator = null;
 
 	/**
 	 *	@var string the method name of the call chain
 	 */
-	private $_method=null;
+	private $_method = null;
 
 	/**
 	 * This initializes the list and the name of the method to be called
 	 *	@param string the name of the function call
 	 */
 	public function __construct($method) {
-		$this->_method=$method;
+		$this->_method = $method;
 		parent::__construct();
 	}
 
@@ -44,9 +44,9 @@ 
 	 *			the object and method name as string
 	 *  @param array The array of arguments to the function call chain
 	 */
-	public function addCall($method,$args)
+	public function addCall($method, $args)
 	{
-		$this->add(array($method,$args));
+		$this->add(array($method, $args));
 	}
 
 	/**
@@ -90,26 +90,26 @@ 
 	 */
 	public function call()
 	{
-		$args=func_get_args();
-		if($this->getCount()===0)
-			return isset($args[0])?$args[0]:null;
+		$args = func_get_args();
+		if ($this->getCount() === 0)
+			return isset($args[0]) ? $args[0] : null;
 
-		if(!$this->_iterator)
+		if (!$this->_iterator)
 		{
-			$chain_array=array_reverse($this->toArray());
-			$this->_iterator=new ArrayIterator($chain_array);
+			$chain_array = array_reverse($this->toArray());
+			$this->_iterator = new ArrayIterator($chain_array);
 		}
-		if($this->_iterator->valid())
+		if ($this->_iterator->valid())
 			do {
-				$handler=$this->_iterator->current();
+				$handler = $this->_iterator->current();
 				$this->_iterator->next();
-				if(is_array($handler[0])&&$handler[0][0] instanceof IClassBehavior)
-					array_splice($handler[1],1,count($args),$args);
+				if (is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
+					array_splice($handler[1], 1, count($args), $args);
 				else
-					array_splice($handler[1],0,count($args),$args);
-				$handler[1][]=$this;
-				$result=call_user_func_array($handler[0],$handler[1]);
-			} while($this->_iterator->valid());
+					array_splice($handler[1], 0, count($args), $args);
+				$handler[1][] = $this;
+				$result = call_user_func_array($handler[0], $handler[1]);
+			} while ($this->_iterator->valid());
 		else
 			$result = $args[0];
 		return $result;
@@ -137,10 +137,10 @@ 
 	 * @param string method name of the unspecified object method
 	 * @param array arguments to the unspecified object method
 	 */
-	public function __dycall($method,$args)
+	public function __dycall($method, $args)
 	{
-		if($this->_method==$method)
-			return call_user_func_array(array($this,'call'),$args);
+		if ($this->_method == $method)
+			return call_user_func_array(array($this, 'call'), $args);
 		return null;
 	}
 }
\ No newline at end of file

framework/I18N/core/TCache_Lite.php

Indentation +567 added lines, -567 removed lines

@@ -46,575 +46,575 @@
 class TCache_Lite
 {
 
-    // --- Private properties ---
-
-    /**
-    * Directory where to put the cache files
-    * (make sure to add a trailing slash)
-    *
-    * @var string $_cacheDir
-    */
-    protected $_cacheDir = '/tmp/';
-
-    /**
-    * Enable / disable caching
-    *
-    * (can be very usefull for the debug of cached scripts)
-    *
-    * @var boolean $_caching
-    */
-    protected $_caching = true;
-
-    /**
-    * Cache lifetime (in seconds)
-    *
-    * @var int $_lifeTime
-    */
-    protected $_lifeTime = 3600;
-
-    /**
-    * Enable / disable fileLocking
-    *
-    * (can avoid cache corruption under bad circumstances)
-    *
-    * @var boolean $_fileLocking
-    */
-    protected $_fileLocking = true;
-
-    /**
-    * Timestamp of the last valid cache
-    *
-    * @var int $_refreshTime
-    */
-    protected $_refreshTime;
-
-    /**
-    * File name (with path)
-    *
-    * @var string $_file
-    */
-    protected $_file;
-
-    /**
-    * Enable / disable write control (the cache is read just after writing
-    * to detect corrupt entries)
-    *
-    * Enable write control will lightly slow the cache writing but not the
-    * cache reading. Write control can detect some corrupt cache files but
-    * maybe it's not a perfect control
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_writeControl = true;
-
-    /**
-    * Enable / disable read control
-    *
-    * If enabled, a control key is embeded in cache file and this key is
-    * compared with the one calculated after the reading.
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_readControl = true;
-
-    /**
-    * Type of read control (only if read control is enabled)
-    *
-    * Available values are :
-    * 'md5' for a md5 hash control (best but slowest)
-    * 'crc32' for a crc32 hash control (lightly less safe but faster,
-    * better choice)
-    * 'strlen' for a length only test (fastest)
-    *
-    * @var boolean $_readControlType
-    */
-    protected $_readControlType = 'crc32';
-
-    /**
-    * Current cache id
-    *
-    * @var string $_id
-    */
-    protected $_id;
-
-    /**
-    * Current cache group
-    *
-    * @var string $_group
-    */
-    protected $_group;
-
-    /**
-    * Enable / Disable "Memory Caching"
-    *
-    * NB : There is no lifetime for memory caching !
-    *
-    * @var boolean $_memoryCaching
-    */
-    protected $_memoryCaching = false;
-
-    /**
-    * Enable / Disable "Only Memory Caching"
-    * (be carefull, memory caching is "beta quality")
-    *
-    * @var boolean $_onlyMemoryCaching
-    */
-    protected $_onlyMemoryCaching = false;
-
-    /**
-    * Memory caching array
-    *
-    * @var array $_memoryCachingArray
-    */
-    protected $_memoryCachingArray = array();
-
-    /**
-    * Memory caching counter
-    *
-    * @var int $memoryCachingCounter
-    */
-    protected $_memoryCachingCounter = 0;
-
-    /**
-    * Memory caching limit
-    *
-    * @var int $memoryCachingLimit
-    */
-    protected $_memoryCachingLimit = 1000;
-
-    /**
-    * File Name protection
-    *
-    * if set to true, you can use any cache id or group name
-    * if set to false, it can be faster but cache ids and group names
-    * will be used directly in cache file names so be carefull with
-    * special characters...
-    *
-    * @var boolean $fileNameProtection
-    */
-    protected $_fileNameProtection = true;
-
-    /**
-    * Enable / disable automatic serialization
-    *
-    * it can be used to save directly datas which aren't strings
-    * (but it's slower)
-    *
-    * @var boolean $_serialize
-    */
-    protected $_automaticSerialization = false;
-
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. Available options are :
-    * $options = array(
-    * 'cacheDir' => directory where to put the cache files (string),
-    * 'caching' => enable / disable caching (boolean),
-    * 'lifeTime' => cache lifetime in seconds (int),
-    * 'fileLocking' => enable / disable fileLocking (boolean),
-    * 'writeControl' => enable / disable write control (boolean),
-    * 'readControl' => enable / disable read control (boolean),
-    * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
-    * 'memoryCaching' => enable / disable memory caching (boolean),
-    * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
-    * 'memoryCachingLimit' => max nbr of records in memory caching (int),
-    * 'fileNameProtection' => enable / disable file name protection (boolean),
-    * 'automaticSerialization' => enable / disable serialization (boolean)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function TCache_Lite($options = array(null))
-    {
-        $availableOptions = array(	'automaticSerialization',
-        							'fileNameProtection',
-        							'memoryCaching',
-        							'onlyMemoryCaching',
-        							'memoryCachingLimit',
-        							'cacheDir',
-        							'caching',
-        							'lifeTime',
-        							'fileLocking',
-        							'writeControl',
-        							'readControl',
-        							'readControlType');
-        foreach($options as $key => $value) {
-            if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
-            }
-        }
-        $this->_refreshTime = time() - $this->_lifeTime;
+	// --- Private properties ---
+
+	/**
+	 * Directory where to put the cache files
+	 * (make sure to add a trailing slash)
+	 *
+	 * @var string $_cacheDir
+	 */
+	protected $_cacheDir = '/tmp/';
+
+	/**
+	 * Enable / disable caching
+	 *
+	 * (can be very usefull for the debug of cached scripts)
+	 *
+	 * @var boolean $_caching
+	 */
+	protected $_caching = true;
+
+	/**
+	 * Cache lifetime (in seconds)
+	 *
+	 * @var int $_lifeTime
+	 */
+	protected $_lifeTime = 3600;
+
+	/**
+	 * Enable / disable fileLocking
+	 *
+	 * (can avoid cache corruption under bad circumstances)
+	 *
+	 * @var boolean $_fileLocking
+	 */
+	protected $_fileLocking = true;
+
+	/**
+	 * Timestamp of the last valid cache
+	 *
+	 * @var int $_refreshTime
+	 */
+	protected $_refreshTime;
+
+	/**
+	 * File name (with path)
+	 *
+	 * @var string $_file
+	 */
+	protected $_file;
+
+	/**
+	 * Enable / disable write control (the cache is read just after writing
+	 * to detect corrupt entries)
+	 *
+	 * Enable write control will lightly slow the cache writing but not the
+	 * cache reading. Write control can detect some corrupt cache files but
+	 * maybe it's not a perfect control
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_writeControl = true;
+
+	/**
+	 * Enable / disable read control
+	 *
+	 * If enabled, a control key is embeded in cache file and this key is
+	 * compared with the one calculated after the reading.
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_readControl = true;
+
+	/**
+	 * Type of read control (only if read control is enabled)
+	 *
+	 * Available values are :
+	 * 'md5' for a md5 hash control (best but slowest)
+	 * 'crc32' for a crc32 hash control (lightly less safe but faster,
+	 * better choice)
+	 * 'strlen' for a length only test (fastest)
+	 *
+	 * @var boolean $_readControlType
+	 */
+	protected $_readControlType = 'crc32';
+
+	/**
+	 * Current cache id
+	 *
+	 * @var string $_id
+	 */
+	protected $_id;
+
+	/**
+	 * Current cache group
+	 *
+	 * @var string $_group
+	 */
+	protected $_group;
+
+	/**
+	 * Enable / Disable "Memory Caching"
+	 *
+	 * NB : There is no lifetime for memory caching !
+	 *
+	 * @var boolean $_memoryCaching
+	 */
+	protected $_memoryCaching = false;
+
+	/**
+	 * Enable / Disable "Only Memory Caching"
+	 * (be carefull, memory caching is "beta quality")
+	 *
+	 * @var boolean $_onlyMemoryCaching
+	 */
+	protected $_onlyMemoryCaching = false;
+
+	/**
+	 * Memory caching array
+	 *
+	 * @var array $_memoryCachingArray
+	 */
+	protected $_memoryCachingArray = array();
+
+	/**
+	 * Memory caching counter
+	 *
+	 * @var int $memoryCachingCounter
+	 */
+	protected $_memoryCachingCounter = 0;
+
+	/**
+	 * Memory caching limit
+	 *
+	 * @var int $memoryCachingLimit
+	 */
+	protected $_memoryCachingLimit = 1000;
+
+	/**
+	 * File Name protection
+	 *
+	 * if set to true, you can use any cache id or group name
+	 * if set to false, it can be faster but cache ids and group names
+	 * will be used directly in cache file names so be carefull with
+	 * special characters...
+	 *
+	 * @var boolean $fileNameProtection
+	 */
+	protected $_fileNameProtection = true;
+
+	/**
+	 * Enable / disable automatic serialization
+	 *
+	 * it can be used to save directly datas which aren't strings
+	 * (but it's slower)
+	 *
+	 * @var boolean $_serialize
+	 */
+	protected $_automaticSerialization = false;
+
+	// --- Public methods ---
+
+	/**
+	 * Constructor
+	 *
+	 * $options is an assoc. Available options are :
+	 * $options = array(
+	 * 'cacheDir' => directory where to put the cache files (string),
+	 * 'caching' => enable / disable caching (boolean),
+	 * 'lifeTime' => cache lifetime in seconds (int),
+	 * 'fileLocking' => enable / disable fileLocking (boolean),
+	 * 'writeControl' => enable / disable write control (boolean),
+	 * 'readControl' => enable / disable read control (boolean),
+	 * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
+	 * 'memoryCaching' => enable / disable memory caching (boolean),
+	 * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
+	 * 'memoryCachingLimit' => max nbr of records in memory caching (int),
+	 * 'fileNameProtection' => enable / disable file name protection (boolean),
+	 * 'automaticSerialization' => enable / disable serialization (boolean)
+	 * );
+	 *
+	 * @param array $options options
+	 * @access public
+	 */
+	function TCache_Lite($options = array(null))
+	{
+		$availableOptions = array(	'automaticSerialization',
+									'fileNameProtection',
+									'memoryCaching',
+									'onlyMemoryCaching',
+									'memoryCachingLimit',
+									'cacheDir',
+									'caching',
+									'lifeTime',
+									'fileLocking',
+									'writeControl',
+									'readControl',
+									'readControlType');
+		foreach($options as $key => $value) {
+			if(in_array($key, $availableOptions)) {
+				$property = '_'.$key;
+				$this->$property = $value;
+			}
+		}
+		$this->_refreshTime = time() - $this->_lifeTime;
 	}
 
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache
-    * validity won't be tested
-    * @return string data of the cache (or false if no cache available)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
-            $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
-                        return unserialize(
-                        			$this->_memoryCachingArray[$this->_file]);
-                    } else {
-                        return $this->_memoryCachingArray[$this->_file];
-                    }
-                } else {
-                    if ($this->_onlyMemoryCaching) {
-                        return false;
-                    }
-                }
-            }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
-                }
-            } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
-                }
-            }
-            if (($data) and ($this->_memoryCaching)) {
-                $this->_memoryCacheAdd($this->_file, $data);
-            }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
-            }
-            return $data;
-        }
-        return false;
-    }
-
-    /**
-    * Save some data in a cache file
-    *
-    * @param string $data data to put in cache (can be another type than strings
-    * if automaticSerialization is on)
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function save($data, $id = null, $group = 'default')
-    {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
-            }
-            if (isset($id)) {
-                $this->_setFileName($id, $group);
-            }
-            if ($this->_memoryCaching) {
-                $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
-                    return true;
-                }
-            }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return $this->_write($data);
-            }
-        }
-        return false;
-    }
-
-    /**
-    * Remove a cache file
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function remove($id, $group = 'default')
-    {
-        $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
-            $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-    * Clean the cache
-    *
-    * if no group is specified all cache files will be destroyed
-    * else only cache files of the specified group will be destroyed
-    *
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function clean($group = false)
-    {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
-        } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
-        }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
-                    unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
-                    		$this->_memoryCachingCounter - 1;
-                }
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if (!($dh = opendir($this->_cacheDir))) {
-            $this->raiseError('TCache_Lite : Unable to open cache directory !');
-            return false;
-        }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
-             $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-	    /**
-    * Set a new life time
-    *
-    * @param int $newLifeTime new life time (in seconds)
-    * @access public
-    */
-    function setLifeTime($newLifeTime)
-    {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function saveMemoryCachingState($id, $group = 'default')
-    {
-        if ($this->_caching) {
-            $array = array(
-                'counter' => $this->_memoryCachingCounter,
-                'array' => $this->_memoryCachingState
-            );
-            $data = serialize($array);
-            $this->save($data, $id, $group);
-        }
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
-    {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
-            {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
-            }
-        }
-    }
-
-    /**
-    * Return the cache last modification time
-    *
-    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
-    *
-    * @return int last modification time
-    */
-    function lastModified() {
-        return filemtime($this->cache->_file);
-    }
-
-    /**
-    * Trigger a PEAR error
-    *
-    * To improve performances, the PEAR.php file is included dynamically.
-    * The file is so included only when an error is triggered. So, in most
-    * cases, the file isn't included and perfs are much better.
-    *
-    * @param string $msg error message
-    * @param int $code error code
-    * @access public
-    */
-    function raiseError($msg, $code)
-    {
-       throw new Exception($msg);
-    }
-
-    // --- Private methods ---
-
-    /**
-    *
-    * @access private
-    */
-    function _memoryCacheAdd($id, $data)
-    {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
-            unset($this->_memoryCachingArray[$key]);
-        } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
-        }
-    }
-
-    /**
-    * Make a file name (with path)
-    *
-    * @param string $id cache id
-    * @param string $group name of the group
-    * @access private
-    */
-    function _setFileName($id, $group)
-    {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
-            						.md5($id));
-        } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
-        }
-    }
-
-    function getCacheFile()
-    {
-    	return $this->_file;
-    }
-
-    /**
-    * Read the cache file and return the content
-    *
-    * @return string content of the cache file
-    * @access private
-    */
-    function _read()
-    {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
-        	// because the filesize can be cached by PHP itself...
-            clearstatcache();
-            $length = @filesize($this->_file);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            }
-            $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                }
-            }
-            return $data;
-        }
-        $this->raiseError('Cache_Lite : Unable to read cache !', -2);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if ok
-    * @access private
-    */
-    function _write($data)
-    {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
-                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-            }
-            $len = strlen($data);
-            @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            return true;
-        }
-        $this->raiseError('Cache_Lite : Unable to write cache !', -1);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file and control it just after to avoid
-    * corrupted cache entries
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if the test is ok
-    * @access private
-    */
-    function _writeAndControl($data)
-    {
-        $this->_write($data);
-        $dataRead = $this->_read($data);
-        return ($dataRead==$data);
-    }
-
-    /**
-    * Make a control key with the string containing datas
-    *
-    * @param string $data data
-    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
-    * @return string control key
-    * @access private
-    */
-    function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
-        }
-    }
+	/**
+	 * Test if a cache is available and (if yes) return it
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $doNotTestCacheValidity if set to true, the cache
+	 * validity won't be tested
+	 * @return string data of the cache (or false if no cache available)
+	 * @access public
+	 */
+	function get($id, $group = 'default', $doNotTestCacheValidity = false)
+	{
+		$this->_id = $id;
+		$this->_group = $group;
+		$data = false;
+		if ($this->_caching) {
+			$this->_setFileName($id, $group);
+			if ($this->_memoryCaching) {
+				if (isset($this->_memoryCachingArray[$this->_file])) {
+					if ($this->_automaticSerialization) {
+						return unserialize(
+									$this->_memoryCachingArray[$this->_file]);
+					} else {
+						return $this->_memoryCachingArray[$this->_file];
+					}
+				} else {
+					if ($this->_onlyMemoryCaching) {
+						return false;
+					}
+				}
+			}
+			if ($doNotTestCacheValidity) {
+				if (file_exists($this->_file)) {
+					$data = $this->_read();
+				}
+			} else {
+				if (@filemtime($this->_file) > $this->_refreshTime) {
+					$data = $this->_read();
+				}
+			}
+			if (($data) and ($this->_memoryCaching)) {
+				$this->_memoryCacheAdd($this->_file, $data);
+			}
+			if ($this->_automaticSerialization && is_string($data)) {
+				$data = unserialize($data);
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Save some data in a cache file
+	 *
+	 * @param string $data data to put in cache (can be another type than strings
+	 * if automaticSerialization is on)
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function save($data, $id = null, $group = 'default')
+	{
+		if ($this->_caching) {
+			if ($this->_automaticSerialization) {
+				$data = serialize($data);
+			}
+			if (isset($id)) {
+				$this->_setFileName($id, $group);
+			}
+			if ($this->_memoryCaching) {
+				$this->_memoryCacheAdd($this->_file, $data);
+				if ($this->_onlyMemoryCaching) {
+					return true;
+				}
+			}
+			if ($this->_writeControl) {
+				if (!$this->_writeAndControl($data)) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				} else {
+					return true;
+				}
+			} else {
+				return $this->_write($data);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a cache file
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function remove($id, $group = 'default')
+	{
+		$this->_setFileName($id, $group);
+		if (!@unlink($this->_file)) {
+			$this->raiseError('TCache_Lite : Unable to remove cache !', -3);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * if no group is specified all cache files will be destroyed
+	 * else only cache files of the specified group will be destroyed
+	 *
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function clean($group = false)
+	{
+		if ($this->_fileNameProtection) {
+			$motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+		} else {
+			$motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+		}
+		if ($this->_memoryCaching) {
+			while (list($key, $value) = each($this->_memoryCaching)) {
+				if (strpos($key, $motif, 0)) {
+					unset($this->_memoryCaching[$key]);
+					$this->_memoryCachingCounter =
+							$this->_memoryCachingCounter - 1;
+				}
+			}
+			if ($this->_onlyMemoryCaching) {
+				return true;
+			}
+		}
+		if (!($dh = opendir($this->_cacheDir))) {
+			$this->raiseError('TCache_Lite : Unable to open cache directory !');
+			return false;
+		}
+		while ($file = readdir($dh)) {
+			if (($file != '.') && ($file != '..')) {
+				$file = $this->_cacheDir . $file;
+				if (is_file($file)) {
+					if (strpos($file, $motif, 0)) {
+						if (!@unlink($file)) {
+			 $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
+							return false;
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+		/**
+		 * Set a new life time
+		 *
+		 * @param int $newLifeTime new life time (in seconds)
+		 * @access public
+		 */
+	function setLifeTime($newLifeTime)
+	{
+		$this->_lifeTime = $newLifeTime;
+		$this->_refreshTime = time() - $newLifeTime;
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function saveMemoryCachingState($id, $group = 'default')
+	{
+		if ($this->_caching) {
+			$array = array(
+				'counter' => $this->_memoryCachingCounter,
+				'array' => $this->_memoryCachingState
+			);
+			$data = serialize($array);
+			$this->save($data, $id, $group);
+		}
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function getMemoryCachingState($id, $group = 'default',
+									$doNotTestCacheValidity = false)
+	{
+		if ($this->_caching) {
+			if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+			{
+				$array = unserialize($data);
+				$this->_memoryCachingCounter = $array['counter'];
+				$this->_memoryCachingArray = $array['array'];
+			}
+		}
+	}
+
+	/**
+	 * Return the cache last modification time
+	 *
+	 * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
+	 *
+	 * @return int last modification time
+	 */
+	function lastModified() {
+		return filemtime($this->cache->_file);
+	}
+
+	/**
+	 * Trigger a PEAR error
+	 *
+	 * To improve performances, the PEAR.php file is included dynamically.
+	 * The file is so included only when an error is triggered. So, in most
+	 * cases, the file isn't included and perfs are much better.
+	 *
+	 * @param string $msg error message
+	 * @param int $code error code
+	 * @access public
+	 */
+	function raiseError($msg, $code)
+	{
+	   throw new Exception($msg);
+	}
+
+	// --- Private methods ---
+
+	/**
+	 *
+	 * @access private
+	 */
+	function _memoryCacheAdd($id, $data)
+	{
+		$this->_memoryCachingArray[$this->_file] = $data;
+		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+			list($key, $value) = each($this->_memoryCachingArray);
+			unset($this->_memoryCachingArray[$key]);
+		} else {
+			$this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+		}
+	}
+
+	/**
+	 * Make a file name (with path)
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the group
+	 * @access private
+	 */
+	function _setFileName($id, $group)
+	{
+		if ($this->_fileNameProtection) {
+			$this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+									.md5($id));
+		} else {
+			$this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+		}
+	}
+
+	function getCacheFile()
+	{
+		return $this->_file;
+	}
+
+	/**
+	 * Read the cache file and return the content
+	 *
+	 * @return string content of the cache file
+	 * @access private
+	 */
+	function _read()
+	{
+		$fp = @fopen($this->_file, "rb");
+		if ($this->_fileLocking) @flock($fp, LOCK_SH);
+		if ($fp) {
+			// because the filesize can be cached by PHP itself...
+			clearstatcache();
+			$length = @filesize($this->_file);
+			if ($this->_readControl) {
+				$hashControl = @fread($fp, 32);
+				$length = $length - 32;
+			}
+			$data = @fread($fp, $length);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			if ($this->_readControl) {
+				$hashData = $this->_hash($data, $this->_readControlType);
+				if ($hashData != $hashControl) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				}
+			}
+			return $data;
+		}
+		$this->raiseError('Cache_Lite : Unable to read cache !', -2);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if ok
+	 * @access private
+	 */
+	function _write($data)
+	{
+		$fp = @fopen($this->_file, "wb");
+		if ($fp) {
+			if ($this->_fileLocking) @flock($fp, LOCK_EX);
+			if ($this->_readControl) {
+				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
+			}
+			$len = strlen($data);
+			@fwrite($fp, $data, $len);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			return true;
+		}
+		$this->raiseError('Cache_Lite : Unable to write cache !', -1);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file and control it just after to avoid
+	 * corrupted cache entries
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if the test is ok
+	 * @access private
+	 */
+	function _writeAndControl($data)
+	{
+		$this->_write($data);
+		$dataRead = $this->_read($data);
+		return ($dataRead==$data);
+	}
+
+	/**
+	 * Make a control key with the string containing datas
+	 *
+	 * @param string $data data
+	 * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
+	 * @return string control key
+	 * @access private
+	 */
+	function _hash($data, $controlType)
+	{
+		switch ($controlType) {
+		case 'md5':
+			return md5($data);
+		case 'crc32':
+			return sprintf('% 32d', crc32($data));
+		case 'strlen':
+			return sprintf('% 32d', strlen($data));
+		default:
+			$this->raiseError('Unknown controlType ! '.
+			'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+		}
+	}
 
 }
 

Spacing +12 added lines, -12 removed lines

@@ -230,7 +230,7 @@ 
     */
     function TCache_Lite($options = array(null))
     {
-        $availableOptions = array(	'automaticSerialization',
+        $availableOptions = array('automaticSerialization',
         							'fileNameProtection',
         							'memoryCaching',
         							'onlyMemoryCaching',
@@ -242,9 +242,9 @@ 
         							'writeControl',
         							'readControl',
         							'readControlType');
-        foreach($options as $key => $value) {
-            if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
+        foreach ($options as $key => $value) {
+            if (in_array($key, $availableOptions)) {
+                $property = '_' . $key;
                 $this->$property = $value;
             }
         }
@@ -329,7 +329,7 @@ 
             }
             if ($this->_writeControl) {
                 if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 } else {
                     return true;
@@ -372,9 +372,9 @@ 
     function clean($group = false)
     {
         if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+            $motif = ($group) ? 'cache_' . md5($group) . '_' : 'cache_';
         } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+            $motif = ($group) ? 'cache_' . $group . '_' : 'cache_';
         }
         if ($this->_memoryCaching) {
             while (list($key, $value) = each($this->_memoryCaching)) {
@@ -507,10 +507,10 @@ 
     function _setFileName($id, $group)
     {
         if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+            $this->_file = ($this->_cacheDir . 'cache_' . md5($group) . '_'
             						.md5($id));
         } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+            $this->_file = $this->_cacheDir . 'cache_' . $group . '_' . $id;
         }
     }
 
@@ -543,7 +543,7 @@ 
             if ($this->_readControl) {
                 $hashData = $this->_hash($data, $this->_readControlType);
                 if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             }
@@ -590,7 +590,7 @@ 
     {
         $this->_write($data);
         $dataRead = $this->_read($data);
-        return ($dataRead==$data);
+        return ($dataRead == $data);
     }
 
     /**
@@ -611,7 +611,7 @@ 
         case 'strlen':
             return sprintf('% 32d', strlen($data));
         default:
-            $this->raiseError('Unknown controlType ! '.
+            $this->raiseError('Unknown controlType ! ' .
             '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }

Braces +12 added lines, -4 removed lines

@@ -528,7 +528,9 @@ 
     function _read()
     {
         $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
+        if ($this->_fileLocking) {
+        	@flock($fp, LOCK_SH);
+        }
         if ($fp) {
         	// because the filesize can be cached by PHP itself...
             clearstatcache();
@@ -538,7 +540,9 @@ 
                 $length = $length - 32;
             }
             $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_UN);
+            }
             @fclose($fp);
             if ($this->_readControl) {
                 $hashData = $this->_hash($data, $this->_readControlType);
@@ -564,13 +568,17 @@ 
     {
         $fp = @fopen($this->_file, "wb");
         if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_EX);
+            }
             if ($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
             }
             $len = strlen($data);
             @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_UN);
+            }
             @fclose($fp);
             return true;
         }

framework/Collections/TList.php

Spacing +51 added lines, -51 removed lines

@@ -34,22 +34,22 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TList extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	/**
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c=0;
+	private $_c = 0;
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r=false;
+	private $_r = false;
 
 	/**
 	 * Constructor.
@@ -58,9 +58,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);
 	}
@@ -78,7 +78,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -118,10 +118,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);
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 */
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
 
 	/**
@@ -145,22 +145,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 (!$this->_r)
 		{
-			if($index===$this->_c)
-				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			if ($index === $this->_c)
+				$this->_d[$this->_c++] = $item;
+			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));
 	}
 
 	/**
@@ -174,9 +174,9 @@ 
 	 */
 	public function remove($item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if (($index = $this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -185,7 +185,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -197,25 +197,25 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if ($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
-				if($index===$this->_c)
+				if ($index === $this->_c)
 					return array_pop($this->_d);
 				else
 				{
-					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					$item = $this->_d[$index];
+					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));
 	}
 
 	/**
@@ -224,7 +224,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for ($i = $this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -234,7 +234,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -243,7 +243,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;
@@ -260,9 +260,9 @@ 
 	 */
 	public function insertBefore($baseitem, $item)
 	{
-		if(!$this->_r)
+		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);
@@ -270,7 +270,7 @@ 
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -284,9 +284,9 @@ 
 	 */
 	public function insertAfter($baseitem, $item)
 	{
-		if(!$this->_r)
+		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);
@@ -294,7 +294,7 @@ 
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -313,14 +313,14 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
+			if ($this->_c > 0)
 				$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -332,12 +332,12 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -349,7 +349,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 
 	/**
@@ -370,14 +370,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);
+		if ($offset === null || $offset === $this->_c)
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}
 

tests/unit/Web/THttpRequestTest.php

Indentation +66 added lines, -66 removed lines

@@ -256,14 +256,14 @@ 
     $acceptLanguages=array('fr', 'en-us','fr-fr','en');
     self::assertEquals($acceptLanguages, $request->getUserLanguages());
     */
-    throw new PHPUnit_Framework_IncompleteTestError();
+	throw new PHPUnit_Framework_IncompleteTestError();
   }
 
   public function testSetEnableCookieValidation() {
-    $request = new THttpRequest();
-    $request->init(null);
-    $request->setEnableCookieValidation (true);
-    self::assertEquals(true, $request->getEnableCookieValidation());
+	$request = new THttpRequest();
+	$request->init(null);
+	$request->setEnableCookieValidation (true);
+	self::assertEquals(true, $request->getEnableCookieValidation());
   }
 
   public function testGetCookies() {
@@ -288,25 +288,25 @@ 
   }
 
   public function testGetUploadedFiles() {
-    $request = new THttpRequest ();
+	$request = new THttpRequest ();
   	$request->init (null);
   	self::assertEquals($_FILES, $request->getUploadedFiles());
   }
 
   public function testGetServerVariables() {
-    $request = new THttpRequest ();
+	$request = new THttpRequest ();
   	$request->init (null);
   	self::assertEquals($_SERVER, $request->getServerVariables());
   }
 
   public function testGetEnvironmentVariables() {
-    $request = new THttpRequest ();
+	$request = new THttpRequest ();
   	$request->init (null);
   	self::assertEquals($_ENV, $request->getEnvironmentVariables());
   }
 
   public function testConstructUrl() {
-    $request = new THttpRequest ();
+	$request = new THttpRequest ();
   	$request->init (null);
   	// Try to construct an url to the pageservice with some parameters
   	$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), true);
@@ -314,57 +314,57 @@ 
   	// Try without encode &
 	$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false);
 	self::assertEquals('/demos/personal/index.php?page=Home&param1=value1&param2=value2', $url);
-    // Try to use HTTPS even if the current request is sent via HTTP
-    //$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false, false, true);
-    //self::assertEquals('https', substr($url,0,5));
+	// Try to use HTTPS even if the current request is sent via HTTP
+	//$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false, false, true);
+	//self::assertEquals('https', substr($url,0,5));
   }
 
   public function testSetServiceID() {
-    $request = new THttpRequest ();
-    $request->setServiceId('page');
-    self::assertEquals('page', $request->getServiceId());
+	$request = new THttpRequest ();
+	$request->setServiceId('page');
+	self::assertEquals('page', $request->getServiceId());
   }
 
   public function testGetIterator() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    self::assertInstanceOf ('ArrayIterator', $request->getIterator());
+	$request = new THttpRequest ();
+	$request->init(null);
+	self::assertInstanceOf ('ArrayIterator', $request->getIterator());
   }
 
   public function testGetCount() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
-    $request->resolveRequest(array('page'));
-    // Should return 1 (service param, and no get param)
+	$request->resolveRequest(array('page'));
+	// Should return 1 (service param, and no get param)
 	self::assertEquals(1, $request->getCount());
 	self::assertEquals(1, $request->count());
 
   }
 
   public function testGetKeys() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
-    $request->resolveRequest(array('page'));
+	$request->resolveRequest(array('page'));
 	self::assertEquals(array('page'), $request->getKeys());
   }
 
   public function testItemAt() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
-    $request->resolveRequest(array('page'));
+	$request->resolveRequest(array('page'));
 	self::assertEquals('Home', $request->itemAt('page'));
   }
 
   public function testAdd() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
 	$request->resolveRequest(array('page'));
 	$request->Add('param1','value1');
@@ -372,9 +372,9 @@ 
   }
 
   public function testRemove() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
 	$request->resolveRequest(array('page'));
 	// Remove an unknow key
@@ -384,9 +384,9 @@ 
   }
 
   public function testContains() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
 	$request->resolveRequest(array('page'));
 	self::assertTrue($request->contains('page'));
@@ -395,8 +395,8 @@ 
 
   public function testClear() {
   	$request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
 	$request->resolveRequest(array('page'));
 	$request->clear();
@@ -404,45 +404,45 @@ 
   }
 
   public function testToArray() {
-    $request = new THttpRequest ();
-    $request->init(null);
-    // Simulate a request with just a service
+	$request = new THttpRequest ();
+	$request->init(null);
+	// Simulate a request with just a service
 	$_GET['page']='Home';
 	$request->resolveRequest(array('page'));
 	self::assertEquals(array ('page'=>'Home'), $request->toArray());
   }
 
   public function testOffsetExists() {
-    $request = new THttpRequest ();
-    $request->init (null);
-    // should not exists
-    self::assertFalse($request->offsetExists(0));
+	$request = new THttpRequest ();
+	$request->init (null);
+	// should not exists
+	self::assertFalse($request->offsetExists(0));
   }
 
   public function testOffsetGet() {
-    $request = new THttpRequest ();
-    $request->init (null);
-    // should not exists
-    self::assertNull($request->offsetGet(0));
+	$request = new THttpRequest ();
+	$request->init (null);
+	// should not exists
+	self::assertNull($request->offsetGet(0));
   }
 
   public function testOffsetSet() {
-    $request = new THttpRequest ();
-    $request->init (null);
-    $request->offsetSet(0, 'test');
-    // should not exists
-    self::assertEquals('test',$request->offsetGet(0));
+	$request = new THttpRequest ();
+	$request->init (null);
+	$request->offsetSet(0, 'test');
+	// should not exists
+	self::assertEquals('test',$request->offsetGet(0));
   }
 
   public function testOffsetUnset() {
-    $request = new THttpRequest ();
-    $request->init (null);
-    $request->offsetSet(0, 'test');
-    // Count should be 1
-    self::assertEquals (1, $request->count());
-    $request->offsetUnset(0);
-    // Now, count should be zero
-    self::assertEquals (0, $request->count());
+	$request = new THttpRequest ();
+	$request->init (null);
+	$request->offsetSet(0, 'test');
+	// Count should be 1
+	self::assertEquals (1, $request->count());
+	$request->offsetUnset(0);
+	// Now, count should be zero
+	self::assertEquals (0, $request->count());
   }
 
   public function testGetSetID() {

Spacing +88 added lines, -88 removed lines

@@ -32,11 +32,11 @@ 
 		$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip,deflate';
 		$_SERVER['HTTP_ACCEPT_CHARSET'] = 'ISO-8859-1,utf-8;q=0.7,*;q=0.7';
 
-		$_COOKIE['phpsessid']='0123456789abcdef';
+		$_COOKIE['phpsessid'] = '0123456789abcdef';
 
-		$_FILES['userfile']=array ('name' => 'test.jpg','type' => 'image/jpg', 'size' => 10240, 'tmp_name' => 'tmpXXAZECZ', 'error'=>0);
-		if(self::$app === null) {
-			self::$app = new TApplication(dirname(__FILE__).'/app');
+		$_FILES['userfile'] = array('name' => 'test.jpg', 'type' => 'image/jpg', 'size' => 10240, 'tmp_name' => 'tmpXXAZECZ', 'error'=>0);
+		if (self::$app === null) {
+			self::$app = new TApplication(dirname(__FILE__) . '/app');
 		}
 	}
 
@@ -64,10 +64,10 @@ 
 		$request->init(null);
 		self::assertInstanceOf('TUri', $request->getUrl());
 		// Try with $_SERVER['HTTP_HOST'] empty
-		$request=null;
+		$request = null;
 		$request = new THttpRequest();
 		$request->init(null);
-		$_SERVER['HTTP_HOST']='';
+		$_SERVER['HTTP_HOST'] = '';
 		self::assertInstanceOf('TUri', $request->getUrl());
 	}
 
@@ -84,35 +84,35 @@ 
 		try {
 			$request->init(null);
 			$request->getUrlManagerModule();
-			self::fail ('httprequest_urlmanager_inexist exception not thrown');
+			self::fail('httprequest_urlmanager_inexist exception not thrown');
 		} catch (TConfigurationException $e) {
 
 		}
-		$request=null;
+		$request = null;
 
 
 		// Try with valid module id, but not instance of TUrlManager
-		$module=new TAssetManager();
-		self::$app->setModule('badmanager',$module);
+		$module = new TAssetManager();
+		self::$app->setModule('badmanager', $module);
 		$request = new THttpRequest();
 		$request->setUrlManager('badmanager');
 		try {
 			$request->init(null);
 			$request->getUrlManagerModule();
-			self::fail ('httprequest_urlmanager_invalid exception not thrown');
+			self::fail('httprequest_urlmanager_invalid exception not thrown');
 		} catch (TConfigurationException $e) {
 
 		}
-		$request=null;
+		$request = null;
 
 		// Finally, try with a valid manager
-		$module=new TUrlManager ();
-		self::$app->setModule('goodmanager',$module);
+		$module = new TUrlManager();
+		self::$app->setModule('goodmanager', $module);
 		$request = new THttpRequest();
 		$request->setUrlManager('goodmanager');
 		$request->init(null);
-		self::assertEquals ('goodmanager', $request->getUrlManager());
-		self::assertInstanceOf ('TUrlManager',$request->getUrlManagerModule());
+		self::assertEquals('goodmanager', $request->getUrlManager());
+		self::assertInstanceOf('TUrlManager', $request->getUrlManagerModule());
 
 	}
 
@@ -121,9 +121,9 @@ 
 		$request->setUrlFormat('Path');
 		self::assertEquals('Path', $request->getUrlFormat());
 		// Test invalid
-		try  {
+		try {
 			$request->setUrlFormat('Bad');
-			self::fail ('Bad Value exception not thrown');
+			self::fail('Bad Value exception not thrown');
 		} catch (TInvalidDataValueException $e) {}
 	}
 
@@ -262,57 +262,57 @@ 
   public function testSetEnableCookieValidation() {
     $request = new THttpRequest();
     $request->init(null);
-    $request->setEnableCookieValidation (true);
+    $request->setEnableCookieValidation(true);
     self::assertEquals(true, $request->getEnableCookieValidation());
   }
 
   public function testGetCookies() {
-  	$request = new THttpRequest ();
-  	$request->init (null);
-  	$request->setEnableCookieValidation (false);
-  	$cookies=$request->getCookies();
+  	$request = new THttpRequest();
+  	$request->init(null);
+  	$request->setEnableCookieValidation(false);
+  	$cookies = $request->getCookies();
   	self::assertInstanceOf('THttpCookieCollection', $cookies);
   	self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue());
   	$request = null;
 
   	// Test with cookie validation
-	$security=new TSecurityManager();
-	self::$app->setModule ('security', $security);
-	$_COOKIE['phpsessid']=$security->hashData('0123456789abcdef');
-	$request = new THttpRequest ();
-  	$request->init (null);
-  	$request->setEnableCookieValidation (true);
-  	$cookies=$request->getCookies();
+	$security = new TSecurityManager();
+	self::$app->setModule('security', $security);
+	$_COOKIE['phpsessid'] = $security->hashData('0123456789abcdef');
+	$request = new THttpRequest();
+  	$request->init(null);
+  	$request->setEnableCookieValidation(true);
+  	$cookies = $request->getCookies();
   	self::assertInstanceOf('THttpCookieCollection', $cookies);
   	self::assertEquals('0123456789abcdef', $cookies->itemAt('phpsessid')->getValue());
   }
 
   public function testGetUploadedFiles() {
-    $request = new THttpRequest ();
-  	$request->init (null);
+    $request = new THttpRequest();
+  	$request->init(null);
   	self::assertEquals($_FILES, $request->getUploadedFiles());
   }
 
   public function testGetServerVariables() {
-    $request = new THttpRequest ();
-  	$request->init (null);
+    $request = new THttpRequest();
+  	$request->init(null);
   	self::assertEquals($_SERVER, $request->getServerVariables());
   }
 
   public function testGetEnvironmentVariables() {
-    $request = new THttpRequest ();
-  	$request->init (null);
+    $request = new THttpRequest();
+  	$request->init(null);
   	self::assertEquals($_ENV, $request->getEnvironmentVariables());
   }
 
   public function testConstructUrl() {
-    $request = new THttpRequest ();
-  	$request->init (null);
+    $request = new THttpRequest();
+  	$request->init(null);
   	// Try to construct an url to the pageservice with some parameters
-  	$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), true);
+  	$url = $request->constructURL('page', 'Home', array('param1'=>'value1', 'param2'=>'value2'), true);
   	self::assertEquals('/demos/personal/index.php?page=Home&param1=value1&param2=value2', $url);
   	// Try without encode &
-	$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false);
+	$url = $request->constructURL('page', 'Home', array('param1'=>'value1', 'param2'=>'value2'), false);
 	self::assertEquals('/demos/personal/index.php?page=Home&param1=value1&param2=value2', $url);
     // Try to use HTTPS even if the current request is sent via HTTP
     //$url=$request->constructURL('page','Home',array('param1'=>'value1','param2'=>'value2'), false, false, true);
@@ -320,22 +320,22 @@ 
   }
 
   public function testSetServiceID() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->setServiceId('page');
     self::assertEquals('page', $request->getServiceId());
   }
 
   public function testGetIterator() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
-    self::assertInstanceOf ('ArrayIterator', $request->getIterator());
+    self::assertInstanceOf('ArrayIterator', $request->getIterator());
   }
 
   public function testGetCount() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
     $request->resolveRequest(array('page'));
     // Should return 1 (service param, and no get param)
 	self::assertEquals(1, $request->getCount());
@@ -344,116 +344,116 @@ 
   }
 
   public function testGetKeys() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
     $request->resolveRequest(array('page'));
 	self::assertEquals(array('page'), $request->getKeys());
   }
 
   public function testItemAt() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
     $request->resolveRequest(array('page'));
 	self::assertEquals('Home', $request->itemAt('page'));
   }
 
   public function testAdd() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
-	$request->Add('param1','value1');
+	$request->Add('param1', 'value1');
 	self::assertEquals('value1', $request->itemAt('param1'));
   }
 
   public function testRemove() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
 	// Remove an unknow key
-	self::assertNull($request->remove('param1','value1'));
+	self::assertNull($request->remove('param1', 'value1'));
 	// Remove a key
 	self::assertEquals('Home', $request->remove('page'));
   }
 
   public function testContains() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
 	self::assertTrue($request->contains('page'));
 	self::assertFalse($request->contains('param'));
   }
 
   public function testClear() {
-  	$request = new THttpRequest ();
+  	$request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
 	$request->clear();
-	self::assertEquals(0,$request->getCount());
+	self::assertEquals(0, $request->getCount());
   }
 
   public function testToArray() {
-    $request = new THttpRequest ();
+    $request = new THttpRequest();
     $request->init(null);
     // Simulate a request with just a service
-	$_GET['page']='Home';
+	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
-	self::assertEquals(array ('page'=>'Home'), $request->toArray());
+	self::assertEquals(array('page'=>'Home'), $request->toArray());
   }
 
   public function testOffsetExists() {
-    $request = new THttpRequest ();
-    $request->init (null);
+    $request = new THttpRequest();
+    $request->init(null);
     // should not exists
     self::assertFalse($request->offsetExists(0));
   }
 
   public function testOffsetGet() {
-    $request = new THttpRequest ();
-    $request->init (null);
+    $request = new THttpRequest();
+    $request->init(null);
     // should not exists
     self::assertNull($request->offsetGet(0));
   }
 
   public function testOffsetSet() {
-    $request = new THttpRequest ();
-    $request->init (null);
+    $request = new THttpRequest();
+    $request->init(null);
     $request->offsetSet(0, 'test');
     // should not exists
-    self::assertEquals('test',$request->offsetGet(0));
+    self::assertEquals('test', $request->offsetGet(0));
   }
 
   public function testOffsetUnset() {
-    $request = new THttpRequest ();
-    $request->init (null);
+    $request = new THttpRequest();
+    $request->init(null);
     $request->offsetSet(0, 'test');
     // Count should be 1
-    self::assertEquals (1, $request->count());
+    self::assertEquals(1, $request->count());
     $request->offsetUnset(0);
     // Now, count should be zero
-    self::assertEquals (0, $request->count());
+    self::assertEquals(0, $request->count());
   }
 
   public function testGetSetID() {
-  	$request=new THttpRequest();
+  	$request = new THttpRequest();
   	$request->init(null);
   	$request->setID('testId');
   	self::assertEquals('testId', $request->getID());
   }
 
   public function testGetSetUrlParamSeparator() {
-  	$request=new THttpRequest();
+  	$request = new THttpRequest();
   	$request->init(null);
   	// Try an invalid separator
 	try {
@@ -467,29 +467,29 @@ 
   }
 
   public function testGetServiceParameter() {
-  	$request=new THttpRequest();
+  	$request = new THttpRequest();
   	$request->init(null);
-  	$_GET['page']='Home';
+  	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
 	self::assertEquals('Home', $request->getServiceParameter());
   }
 
   public function testGetRequestResolved() {
-  	$request=new THttpRequest();
+  	$request = new THttpRequest();
   	$request->init(null);
   	self::assertFalse($request->getRequestResolved());
-  	$_GET['page']='Home';
+  	$_GET['page'] = 'Home';
 	$request->resolveRequest(array('page'));
 	self::assertTrue($request->getRequestResolved());
   }
 
-  public function testRequestWithUrlMapping () {
-  	Prado::Using ('System.Web.TUrlMapping');
-  	$confstr='<config><url ServiceId="testService" ServiceParameter="testServiceParam" pattern="test/{param}/?" parameters.param="\w+"/></config>';
-	$config=new TXmlDocument('1.0','utf8');
+  public function testRequestWithUrlMapping() {
+  	Prado::Using('System.Web.TUrlMapping');
+  	$confstr = '<config><url ServiceId="testService" ServiceParameter="testServiceParam" pattern="test/{param}/?" parameters.param="\w+"/></config>';
+	$config = new TXmlDocument('1.0', 'utf8');
 	$config->loadFromString($confstr);
-  	$module=new TUrlMapping ();
-	self::$app->setModule('friendly-url',$module);
+  	$module = new TUrlMapping();
+	self::$app->setModule('friendly-url', $module);
 	if (isset ($_GET['page'])) unset ($_GET['page']); // Remove service from a previous test !
 	$_SERVER['REQUEST_URI'] = '/index.php/test/value2';
 	$_SERVER['SCRIPT_NAME'] = '/index.php';
@@ -500,7 +500,7 @@ 
 	$request->setUrlManager('friendly-url');
 	$request->setUrlFormat(THttpRequestUrlFormat::Path);
 	$request->init(null);
-	$module->init ($config);
-	self::assertEquals('testService', $request->resolveRequest(array ('page', 'testService')));
+	$module->init($config);
+	self::assertEquals('testService', $request->resolveRequest(array('page', 'testService')));
   }
 }
\ No newline at end of file