pradosoft / prado

framework/Security/TSecurityManager.php

Doc Comments +7 added lines, -1 removed lines

@@ -85,6 +85,7 @@ 
 
 	/**
 	 * @param string the key used to generate HMAC
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the key is empty
 	 */
 	public function setValidationKey($value)
@@ -112,6 +113,7 @@ 
 
 	/**
 	 * @param string the key used to encrypt/decrypt data.
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the key is empty
 	 */
 	public function setEncryptionKey($value)
@@ -144,6 +146,7 @@ 
 	 * This method has been deprecated since version 3.2.1.
 	 * Please use {@link setHashAlgorithm()} instead.
 	 * @param TSecurityManagerValidationMode hashing algorithm used to generate HMAC.
+	 * @param string $value
 	 */
 	public function setValidation($value)
 	{
@@ -182,7 +185,7 @@ 
 	}
 
 	/**
-	 * @return mixed the algorithm used to encrypt/decrypt data. Defaults to the string 'rijndael-256'.
+	 * @return string the algorithm used to encrypt/decrypt data. Defaults to the string 'rijndael-256'.
 	 */
 	public function getCryptAlgorithm()
 	{
@@ -192,6 +195,7 @@ 
 	/**
 	 * Sets the crypt algorithm (also known as cipher or cypher) that will be used for {@link encrypt} and {@link decrypt}.
 	 * @param mixed either a string containing the cipther name or an array containing the full parameters to call mcrypt_module_open().
+	 * @param string $value
 	 */
 	public function setCryptAlgorithm($value)
 	{
@@ -201,6 +205,7 @@ 
 	/**
 	 * Encrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be encrypted.
+	 * @param string $data
 	 * @return string the encrypted data
 	 * @throws TNotSupportedException if PHP Mcrypt extension is not loaded
 	 */
@@ -220,6 +225,7 @@ 
 	/**
 	 * Decrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be decrypted.
+	 * @param string $data
 	 * @return string the decrypted data
 	 * @throws TNotSupportedException if PHP Mcrypt extension is not loaded
 	 */

Spacing +26 added lines, -26 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function init($config)
 	{
-		$this->_mbstring=extension_loaded('mbstring');
+		$this->_mbstring = extension_loaded('mbstring');
 		$this->getApplication()->setSecurityManager($this);
 	}
 
@@ -65,7 +65,7 @@ 
 	 */
 	protected function generateRandomKey()
 	{
-		return sprintf('%08x%08x%08x%08x',mt_rand(),mt_rand(),mt_rand(),mt_rand());
+		return sprintf('%08x%08x%08x%08x', mt_rand(), mt_rand(), mt_rand(), mt_rand());
 	}
 
 	/**
@@ -74,8 +74,8 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+		if (null === $this->_validationKey) {
+			if (null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
 				$this->_validationKey = $this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
@@ -89,7 +89,7 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if ('' === $value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
 		$this->_validationKey = $value;
@@ -101,8 +101,8 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+		if (null === $this->_encryptionKey) {
+			if (null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
 				$this->_encryptionKey = $this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
@@ -116,7 +116,7 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if ('' === $value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
 		$this->_encryptionKey = $value;
@@ -165,7 +165,7 @@ 
 	 */
 	public function getEncryption()
 	{
-		if(is_string($this->_cryptAlgorithm))
+		if (is_string($this->_cryptAlgorithm))
 			return $this->_cryptAlgorithm;
 		// fake the pre-3.2.1 answer
 		return "3DES";
@@ -206,12 +206,12 @@ 
 	 */
 	public function encrypt($data)
 	{
-		$module=$this->openCryptModule();
+		$module = $this->openCryptModule();
 		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		srand();
 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
 		mcrypt_generic_init($module, $key, $iv);
-		$encrypted = $iv.mcrypt_generic($module, $data);
+		$encrypted = $iv . mcrypt_generic($module, $data);
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $encrypted;
@@ -225,7 +225,7 @@ 
 	 */
 	public function decrypt($data)
 	{
-		$module=$this->openCryptModule();
+		$module = $this->openCryptModule();
 		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		$ivSize = mcrypt_enc_get_iv_size($module);
 		$iv = $this->substr($data, 0, $ivSize);
@@ -243,14 +243,14 @@ 
 	 */
 	protected function openCryptModule()
 	{
-		if(extension_loaded('mcrypt'))
+		if (extension_loaded('mcrypt'))
 		{
-			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+			if (is_array($this->_cryptAlgorithm))
+				$module = @call_user_func_array('mcrypt_module_open', $this->_cryptAlgorithm);
 			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+				$module = @mcrypt_module_open($this->_cryptAlgorithm, '', MCRYPT_MODE_CBC, '');
 
-			if($module===false)
+			if ($module === false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
 
 			return $module;
@@ -267,7 +267,7 @@ 
 	public function hashData($data)
 	{
 		$hmac = $this->computeHMAC($data);
-		return $hmac.$data;
+		return $hmac . $data;
 	}
 
 	/**
@@ -279,13 +279,13 @@ 
 	 */
 	public function validateData($data)
 	{
-		$len=$this->strlen($this->computeHMAC('test'));
+		$len = $this->strlen($this->computeHMAC('test'));
 
-		if($this->strlen($data) < $len)
+		if ($this->strlen($data) < $len)
 			return false;
 
 		$hmac = $this->substr($data, 0, $len);
-		$data2=$this->substr($data, $len, $this->strlen($data));
+		$data2 = $this->substr($data, $len, $this->strlen($data));
 		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
 	}
 
@@ -298,10 +298,10 @@ 
 	{
 		$key = $this->getValidationKey();
 
-		if(function_exists('hash_hmac'))
+		if (function_exists('hash_hmac'))
 			return hash_hmac($this->_hashAlgorithm, $data, $key);
 
-		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
+		if (!strcasecmp($this->_hashAlgorithm, 'sha1'))
 		{
 			$pack = 'H40';
 			$func = 'sha1';
@@ -322,7 +322,7 @@ 
 	 */
 	private function strlen($string)
 	{
-		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
+		return $this->_mbstring ? mb_strlen($string, '8bit') : strlen($string);
 	}
 
 	/**
@@ -333,9 +333,9 @@ 
 	 * @param int $length the desired portion length
 	 * @return string the extracted part of string, or FALSE on failure or an empty string.
 	 */
-	private function substr($string,$start,$length)
+	private function substr($string, $start, $length)
 	{
-		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
+		return $this->_mbstring ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
 	}
 }
 

Braces +25 added lines, -18 removed lines

@@ -89,8 +89,9 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
-			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
+		if('' === $value) {
+					throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
+		}
 
 		$this->_validationKey = $value;
 	}
@@ -116,8 +117,9 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
-			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
+		if('' === $value) {
+					throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
+		}
 
 		$this->_encryptionKey = $value;
 	}
@@ -165,8 +167,9 @@ 
 	 */
 	public function getEncryption()
 	{
-		if(is_string($this->_cryptAlgorithm))
-			return $this->_cryptAlgorithm;
+		if(is_string($this->_cryptAlgorithm)) {
+					return $this->_cryptAlgorithm;
+		}
 		// fake the pre-3.2.1 answer
 		return "3DES";
 	}
@@ -245,18 +248,20 @@ 
 	{
 		if(extension_loaded('mcrypt'))
 		{
-			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
-			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+			if(is_array($this->_cryptAlgorithm)) {
+							$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+			} else {
+							$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+			}
 
-			if($module===false)
-				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
+			if($module===false) {
+							throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
+			}
 
 			return $module;
+		} else {
+					throw new TNotSupportedException('securitymanager_mcryptextension_required');
 		}
-		else
-			throw new TNotSupportedException('securitymanager_mcryptextension_required');
 	}
 
 	/**
@@ -281,8 +286,9 @@ 
 	{
 		$len=$this->strlen($this->computeHMAC('test'));
 
-		if($this->strlen($data) < $len)
-			return false;
+		if($this->strlen($data) < $len) {
+					return false;
+		}
 
 		$hmac = $this->substr($data, 0, $len);
 		$data2=$this->substr($data, $len, $this->strlen($data));
@@ -298,8 +304,9 @@ 
 	{
 		$key = $this->getValidationKey();
 
-		if(function_exists('hash_hmac'))
-			return hash_hmac($this->_hashAlgorithm, $data, $key);
+		if(function_exists('hash_hmac')) {
+					return hash_hmac($this->_hashAlgorithm, $data, $key);
+		}
 
 		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
 		{

framework/Security/TUser.php

Doc Comments +5 added lines

@@ -89,6 +89,7 @@ 
 
 	/**
 	 * @param boolean if the user is a guest
+	 * @param boolean $value
 	 */
 	public function setIsGuest($value)
 	{
@@ -129,6 +130,7 @@ 
 
 	/**
 	 * @param string role to be tested. Note, role is case-insensitive.
+	 * @param string $role
 	 * @return boolean whether the user is of this role
 	 */
 	public function isInRole($role)
@@ -170,6 +172,7 @@ 
 	 *
 	 * @param string variable name
 	 * @param mixed default value
+	 * @param string $key
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
@@ -190,6 +193,7 @@ 
 	 * @param string variable name
 	 * @param mixed variable value
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
+	 * @param string $key
 	 * @see getState
 	 */
 	protected function setState($key,$value,$defaultValue=null)
@@ -211,6 +215,7 @@ 
 
 	/**
 	 * @param boolean whether user session state is changed
+	 * @param boolean $value
 	 */
 	public function setStateChanged($value)
 	{

Spacing +29 added lines, -29 removed lines

@@ -38,7 +38,7 @@ 
 	/**
 	 * @var boolean whether user state is changed
 	 */
-	private $_stateChanged=false;
+	private $_stateChanged = false;
 	/**
 	 * @var IUserManager user manager
 	 */
@@ -50,8 +50,8 @@ 
 	 */
 	public function __construct(IUserManager $manager)
 	{
-		$this->_state=array();
-		$this->_manager=$manager;
+		$this->_state = array();
+		$this->_manager = $manager;
 		$this->setName($manager->getGuestName());
 	}
 
@@ -68,7 +68,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getState('Name','');
+		return $this->getState('Name', '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->setState('Name',$value,'');
+		$this->setState('Name', $value, '');
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function getIsGuest()
 	{
-		return $this->getState('IsGuest',true);
+		return $this->getState('IsGuest', true);
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	 */
 	public function setIsGuest($value)
 	{
-		if($isGuest=TPropertyValue::ensureBoolean($value))
+		if ($isGuest = TPropertyValue::ensureBoolean($value))
 		{
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles(array());
 		}
-		$this->setState('IsGuest',$isGuest);
+		$this->setState('IsGuest', $isGuest);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getRoles()
 	{
-		return $this->getState('Roles',array());
+		return $this->getState('Roles', array());
 	}
 
 	/**
@@ -113,17 +113,17 @@ 
 	 */
 	public function setRoles($value)
 	{
-		if(is_array($value))
-			$this->setState('Roles',$value,array());
+		if (is_array($value))
+			$this->setState('Roles', $value, array());
 		else
 		{
-			$roles=array();
-			foreach(explode(',',$value) as $role)
+			$roles = array();
+			foreach (explode(',', $value) as $role)
 			{
-				if(($role=trim($role))!=='')
-					$roles[]=$role;
+				if (($role = trim($role)) !== '')
+					$roles[] = $role;
 			}
-			$this->setState('Roles',$roles,array());
+			$this->setState('Roles', $roles, array());
 		}
 	}
 
@@ -133,8 +133,8 @@ 
 	 */
 	public function isInRole($role)
 	{
-		foreach($this->getRoles() as $r)
-			if(strcasecmp($role,$r)===0)
+		foreach ($this->getRoles() as $r)
+			if (strcasecmp($role, $r) === 0)
 				return true;
 		return false;
 	}
@@ -153,10 +153,10 @@ 
 	 */
 	public function loadFromString($data)
 	{
-		if(!empty($data))
-			$this->_state=unserialize($data);
-		if(!is_array($this->_state))
-			$this->_state=array();
+		if (!empty($data))
+			$this->_state = unserialize($data);
+		if (!is_array($this->_state))
+			$this->_state = array();
 		return $this;
 	}
 
@@ -173,9 +173,9 @@ 
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
-	protected function getState($key,$defaultValue=null)
+	protected function getState($key, $defaultValue = null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -192,13 +192,13 @@ 
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
 	 * @see getState
 	 */
-	protected function setState($key,$value,$defaultValue=null)
+	protected function setState($key, $value, $defaultValue = null)
 	{
-		if($value===$defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_state[$key]);
 		else
-			$this->_state[$key]=$value;
-		$this->_stateChanged=true;
+			$this->_state[$key] = $value;
+		$this->_stateChanged = true;
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function setStateChanged($value)
 	{
-		$this->_stateChanged=TPropertyValue::ensureBoolean($value);
+		$this->_stateChanged = TPropertyValue::ensureBoolean($value);
 	}
 }
 

Braces +20 added lines, -15 removed lines

@@ -113,15 +113,16 @@ 
 	 */
 	public function setRoles($value)
 	{
-		if(is_array($value))
-			$this->setState('Roles',$value,array());
-		else
+		if(is_array($value)) {
+					$this->setState('Roles',$value,array());
+		} else
 		{
 			$roles=array();
 			foreach(explode(',',$value) as $role)
 			{
-				if(($role=trim($role))!=='')
-					$roles[]=$role;
+				if(($role=trim($role))!=='') {
+									$roles[]=$role;
+				}
 			}
 			$this->setState('Roles',$roles,array());
 		}
@@ -133,9 +134,10 @@ 
 	 */
 	public function isInRole($role)
 	{
-		foreach($this->getRoles() as $r)
-			if(strcasecmp($role,$r)===0)
+		foreach($this->getRoles() as $r) {
+					if(strcasecmp($role,$r)===0)
 				return true;
+		}
 		return false;
 	}
 
@@ -153,10 +155,12 @@ 
 	 */
 	public function loadFromString($data)
 	{
-		if(!empty($data))
-			$this->_state=unserialize($data);
-		if(!is_array($this->_state))
-			$this->_state=array();
+		if(!empty($data)) {
+					$this->_state=unserialize($data);
+		}
+		if(!is_array($this->_state)) {
+					$this->_state=array();
+		}
 		return $this;
 	}
 
@@ -194,10 +198,11 @@ 
 	 */
 	protected function setState($key,$value,$defaultValue=null)
 	{
-		if($value===$defaultValue)
-			unset($this->_state[$key]);
-		else
-			$this->_state[$key]=$value;
+		if($value===$defaultValue) {
+					unset($this->_state[$key]);
+		} else {
+					$this->_state[$key]=$value;
+		}
 		$this->_stateChanged=true;
 	}
 

framework/Security/TUserManager.php

Doc Comments +7 added lines

@@ -103,6 +103,7 @@ 
 	 * This method is required by IModule and is invoked by application.
 	 * It loads user/role information from the module configuration.
 	 * @param mixed module configuration
+	 * @param TXmlDocument $config
 	 */
 	public function init($config)
 	{
@@ -239,6 +240,7 @@ 
 	/**
 	 * @param string user/role data file path (in namespace form). The file format is XML
 	 * whose content is similar to that user/role block in application configuration.
+	 * @param string $value
 	 * @throws TInvalidOperationException if the module is already initialized
 	 * @throws TConfigurationException if the file is not in proper namespace format
 	 */
@@ -260,6 +262,7 @@ 
 
 	/**
 	 * @param string name to be used for guest users.
+	 * @param string $value
 	 */
 	public function setGuestName($value)
 	{
@@ -276,6 +279,7 @@ 
 
 	/**
 	 * @param TUserManagerPasswordMode how password is stored, clear text, or MD5 or SHA1 hashed.
+	 * @param string $value
 	 */
 	public function setPasswordMode($value)
 	{
@@ -286,6 +290,8 @@ 
 	 * Validates if the username and password are correct.
 	 * @param string user name
 	 * @param string password
+	 * @param string $username
+	 * @param string $password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
 	public function validateUser($username,$password)
@@ -369,6 +375,7 @@ 
 	 * Sets a user as a guest.
 	 * User name is changed as guest name, and roles are emptied.
 	 * @param TUser the user to be changed to a guest.
+	 * @param TUser|null $user
 	 */
 	public function switchToGuest($user)
 	{

Spacing +70 added lines, -70 removed lines

@@ -71,32 +71,32 @@ 
 	/**
 	 * extension name to the user file
 	 */
-	const USER_FILE_EXT='.xml';
+	const USER_FILE_EXT = '.xml';
 
 	/**
 	 * @var array list of users managed by this module
 	 */
-	private $_users=array();
+	private $_users = array();
 	/**
 	 * @var array list of roles managed by this module
 	 */
-	private $_roles=array();
+	private $_roles = array();
 	/**
 	 * @var string guest name
 	 */
-	private $_guestName='Guest';
+	private $_guestName = 'Guest';
 	/**
 	 * @var TUserManagerPasswordMode password mode
 	 */
-	private $_passwordMode=TUserManagerPasswordMode::MD5;
+	private $_passwordMode = TUserManagerPasswordMode::MD5;
 	/**
 	 * @var boolean whether the module has been initialized
 	 */
-	private $_initialized=false;
+	private $_initialized = false;
 	/**
 	 * @var string user/role information file
 	 */
-	private $_userFile=null;
+	private $_userFile = null;
 
 	/**
 	 * Initializes the module.
@@ -107,21 +107,21 @@ 
 	public function init($config)
 	{
 		$this->loadUserData($config);
-		if($this->_userFile!==null)
+		if ($this->_userFile !== null)
 		{
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
 			{
-				$dom=new TXmlDocument;
+				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
 				$this->loadUserDataFromXml($dom);
 			}
 		}
-		$this->_initialized=true;
+		$this->_initialized = true;
 	}
 
 	/*
@@ -130,7 +130,7 @@ 
 	 */
 	private function loadUserData($config)
 	{
-		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			$this->loadUserDataFromPhp($config);
 		else
 			$this->loadUserDataFromXml($config);
@@ -142,34 +142,34 @@ 
 	 */
 	private function loadUserDataFromPhp($config)
 	{
-		if(isset($config['users']) && is_array($config['users']))
+		if (isset($config['users']) && is_array($config['users']))
 		{
-			foreach($config['users'] as $user)
+			foreach ($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
+				$name = trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password = isset($user['password']) ? $user['password'] : '';
 				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
-				if($roles!=='')
+				$roles = isset($user['roles']) ? $user['roles'] : '';
+				if ($roles !== '')
 				{
-					foreach(explode(',',$roles) as $role)
+					foreach (explode(',', $roles) as $role)
 					{
-						if(($role=trim($role))!=='')
-							$this->_roles[$name][]=$role;
+						if (($role = trim($role)) !== '')
+							$this->_roles[$name][] = $role;
 					}
 				}
 			}
 		}
-		if(isset($config['roles']) && is_array($config['roles']))
+		if (isset($config['roles']) && is_array($config['roles']))
 		{
-			foreach($config['roles'] as $role)
+			foreach ($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
-				foreach(explode(',',$users) as $user)
+				$name = isset($role['name']) ? $role['name'] : '';
+				$users = isset($role['users']) ? $role['users'] : '';
+				foreach (explode(',', $users) as $user)
 				{
-					if(($user=trim($user))!=='')
-						$this->_roles[strtolower($user)][]=$name;
+					if (($user = trim($user)) !== '')
+						$this->_roles[strtolower($user)][] = $name;
 				}
 			}
 		}
@@ -181,25 +181,25 @@ 
 	 */
 	private function loadUserDataFromXml($xmlNode)
 	{
-		foreach($xmlNode->getElementsByTagName('user') as $node)
+		foreach ($xmlNode->getElementsByTagName('user') as $node)
 		{
-			$name=trim(strtolower($node->getAttribute('name')));
-			$this->_users[$name]=$node->getAttribute('password');
-			if(($roles=trim($node->getAttribute('roles')))!=='')
+			$name = trim(strtolower($node->getAttribute('name')));
+			$this->_users[$name] = $node->getAttribute('password');
+			if (($roles = trim($node->getAttribute('roles'))) !== '')
 			{
-				foreach(explode(',',$roles) as $role)
+				foreach (explode(',', $roles) as $role)
 				{
-					if(($role=trim($role))!=='')
-						$this->_roles[$name][]=$role;
+					if (($role = trim($role)) !== '')
+						$this->_roles[$name][] = $role;
 				}
 			}
 		}
-		foreach($xmlNode->getElementsByTagName('role') as $node)
+		foreach ($xmlNode->getElementsByTagName('role') as $node)
 		{
-			foreach(explode(',',$node->getAttribute('users')) as $user)
+			foreach (explode(',', $node->getAttribute('users')) as $user)
 			{
-				if(($user=trim($user))!=='')
-					$this->_roles[strtolower($user)][]=$node->getAttribute('name');
+				if (($user = trim($user)) !== '')
+					$this->_roles[strtolower($user)][] = $node->getAttribute('name');
 			}
 		}
 	}
@@ -244,10 +244,10 @@ 
 	 */
 	public function setUserFile($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		else if (($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile))
+			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 */
 	public function setGuestName($value)
 	{
-		$this->_guestName=$value;
+		$this->_guestName = $value;
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode=TPropertyValue::ensureEnum($value,'TUserManagerPasswordMode');
+		$this->_passwordMode = TPropertyValue::ensureEnum($value, 'TUserManagerPasswordMode');
 	}
 
 	/**
@@ -288,14 +288,14 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
-		if($this->_passwordMode===TUserManagerPasswordMode::MD5)
-			$password=md5($password);
-		else if($this->_passwordMode===TUserManagerPasswordMode::SHA1)
-			$password=sha1($password);
-		$username=strtolower($username);
-		return (isset($this->_users[$username]) && $this->_users[$username]===$password);
+		if ($this->_passwordMode === TUserManagerPasswordMode::MD5)
+			$password = md5($password);
+		else if ($this->_passwordMode === TUserManagerPasswordMode::SHA1)
+			$password = sha1($password);
+		$username = strtolower($username);
+		return (isset($this->_users[$username]) && $this->_users[$username] === $password);
 	}
 
 	/**
@@ -303,23 +303,23 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username=null)
+	public function getUser($username = null)
 	{
-		if($username===null)
+		if ($username === null)
 		{
-			$user=new TUser($this);
+			$user = new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
 		}
 		else
 		{
-			$username=strtolower($username);
-			if(isset($this->_users[$username]))
+			$username = strtolower($username);
+			if (isset($this->_users[$username]))
 			{
-				$user=new TUser($this);
+				$user = new TUser($this);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				if(isset($this->_roles[$username]))
+				if (isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
 			}
@@ -336,13 +336,13 @@ 
 	 */
 	public function getUserFromCookie($cookie)
 	{
-		if(($data=$cookie->getValue())!=='')
+		if (($data = $cookie->getValue()) !== '')
 		{
-			$data=unserialize($data);
-			if(is_array($data) && count($data)===2)
+			$data = unserialize($data);
+			if (is_array($data) && count($data) === 2)
 			{
-				list($username,$token)=$data;
-				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
+				list($username, $token) = $data;
+				if (isset($this->_users[$username]) && $token === md5($username . $this->_users[$username]))
 					return $this->getUser($username);
 			}
 		}
@@ -356,11 +356,11 @@ 
 	 */
 	public function saveUserToCookie($cookie)
 	{
-		$user=$this->getApplication()->getUser();
-		$username=strtolower($user->getName());
-		if(isset($this->_users[$username]))
+		$user = $this->getApplication()->getUser();
+		$username = strtolower($user->getName());
+		if (isset($this->_users[$username]))
 		{
-			$data=array($username,md5($username.$this->_users[$username]));
+			$data = array($username, md5($username . $this->_users[$username]));
 			$cookie->setValue(serialize($data));
 		}
 	}
@@ -392,8 +392,8 @@ 
  */
 class TUserManagerPasswordMode extends TEnumerable
 {
-	const Clear='Clear';
-	const MD5='MD5';
-	const SHA1='SHA1';
+	const Clear = 'Clear';
+	const MD5 = 'MD5';
+	const SHA1 = 'SHA1';
 }
 

Braces +37 added lines, -30 removed lines

@@ -113,8 +113,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -130,10 +129,11 @@ 
 	 */
 	private function loadUserData($config)
 	{
-		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-			$this->loadUserDataFromPhp($config);
-		else
-			$this->loadUserDataFromXml($config);
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+					$this->loadUserDataFromPhp($config);
+		} else {
+					$this->loadUserDataFromXml($config);
+		}
 	}
 
 	/**
@@ -154,8 +154,9 @@ 
 				{
 					foreach(explode(',',$roles) as $role)
 					{
-						if(($role=trim($role))!=='')
-							$this->_roles[$name][]=$role;
+						if(($role=trim($role))!=='') {
+													$this->_roles[$name][]=$role;
+						}
 					}
 				}
 			}
@@ -168,8 +169,9 @@ 
 				$users = isset($role['users'])?$role['users']:'';
 				foreach(explode(',',$users) as $user)
 				{
-					if(($user=trim($user))!=='')
-						$this->_roles[strtolower($user)][]=$name;
+					if(($user=trim($user))!=='') {
+											$this->_roles[strtolower($user)][]=$name;
+					}
 				}
 			}
 		}
@@ -189,8 +191,9 @@ 
 			{
 				foreach(explode(',',$roles) as $role)
 				{
-					if(($role=trim($role))!=='')
-						$this->_roles[$name][]=$role;
+					if(($role=trim($role))!=='') {
+											$this->_roles[$name][]=$role;
+					}
 				}
 			}
 		}
@@ -198,8 +201,9 @@ 
 		{
 			foreach(explode(',',$node->getAttribute('users')) as $user)
 			{
-				if(($user=trim($user))!=='')
-					$this->_roles[strtolower($user)][]=$node->getAttribute('name');
+				if(($user=trim($user))!=='') {
+									$this->_roles[strtolower($user)][]=$node->getAttribute('name');
+				}
 			}
 		}
 	}
@@ -244,10 +248,11 @@ 
 	 */
 	public function setUserFile($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('usermanager_userfile_unchangeable');
+		} else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile)) {
+					throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		}
 	}
 
 	/**
@@ -290,10 +295,11 @@ 
 	 */
 	public function validateUser($username,$password)
 	{
-		if($this->_passwordMode===TUserManagerPasswordMode::MD5)
-			$password=md5($password);
-		else if($this->_passwordMode===TUserManagerPasswordMode::SHA1)
-			$password=sha1($password);
+		if($this->_passwordMode===TUserManagerPasswordMode::MD5) {
+					$password=md5($password);
+		} else if($this->_passwordMode===TUserManagerPasswordMode::SHA1) {
+					$password=sha1($password);
+		}
 		$username=strtolower($username);
 		return (isset($this->_users[$username]) && $this->_users[$username]===$password);
 	}
@@ -310,8 +316,7 @@ 
 			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username=strtolower($username);
 			if(isset($this->_users[$username]))
@@ -319,12 +324,13 @@ 
 				$user=new TUser($this);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				if(isset($this->_roles[$username]))
-					$user->setRoles($this->_roles[$username]);
+				if(isset($this->_roles[$username])) {
+									$user->setRoles($this->_roles[$username]);
+				}
 				return $user;
+			} else {
+							return null;
 			}
-			else
-				return null;
 		}
 	}
 
@@ -342,8 +348,9 @@ 
 			if(is_array($data) && count($data)===2)
 			{
 				list($username,$token)=$data;
-				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
-					return $this->getUser($username);
+				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username])) {
+									return $this->getUser($username);
+				}
 			}
 		}
 		return null;

framework/TApplication.php

Doc Comments +10 added lines, -1 removed lines

@@ -342,6 +342,7 @@ 
 	 * to determine the application configuration file,
 	 * application root path and the runtime path.
 	 * @param string the application root path or the application configuration file
+	 * @param string $basePath
 	 * @see setBasePath
 	 * @see setRuntimePath
 	 * @see setConfigurationFile
@@ -440,6 +441,7 @@ 
 	 * A global value is one that is persistent across users sessions and requests.
 	 * @param string the name of the value to be returned
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
+	 * @param integer $defaultValue
 	 * @return mixed the global value corresponding to $key
 	 */
 	public function getGlobalState($key,$defaultValue=null)
@@ -456,6 +458,7 @@ 
 	 * @param mixed the global value to be set
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
+	 * @param string $key
 	 */
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
@@ -545,7 +548,7 @@ 
 	}
 
 	/**
-	 * @return TApplicationMode application mode. Defaults to TApplicationMode::Debug.
+	 * @return string application mode. Defaults to TApplicationMode::Debug.
 	 */
 	public function getMode()
 	{
@@ -570,6 +573,7 @@ 
 
 	/**
 	 * @param string the directory containing the application configuration file
+	 * @param string $value
 	 */
 	public function setBasePath($value)
 	{
@@ -586,6 +590,7 @@ 
 
 	/**
 	 * @param string the application configuration file (absolute path)
+	 * @param string $value
 	 */
 	public function setConfigurationFile($value)
 	{
@@ -602,6 +607,7 @@ 
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
+ 	 * @param string $value
 	 */
 	public function setConfigurationType($value)
 	{
@@ -657,6 +663,7 @@ 
 
 	/**
 	 * @param string the directory storing cache data and application-level persistent data. (absolute path)
+	 * @param string $value
 	 */
 	public function setRuntimePath($value)
 	{
@@ -677,6 +684,7 @@ 
 
 	/**
 	 * @param IService the currently requested service
+	 * @param IService $value
 	 */
 	public function setService($value)
 	{
@@ -1126,6 +1134,7 @@ 
 	 * This method is invoked when an exception is raised during the lifecycles
 	 * of the application.
 	 * @param mixed event parameter
+	 * @param Exception $param
 	 */
 	public function onError($param)
 	{

Indentation +1 added lines, -1 removed lines

@@ -602,7 +602,7 @@
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
-	 */
+ 	 */
 	public function setConfigurationType($value)
 	{
 		$this->_configType = $value;

Spacing +354 added lines, -354 removed lines

@@ -12,7 +12,7 @@ 
 /**
  * Includes core interfaces essential for TApplication class
  */
-require_once(PRADO_DIR.'/interfaces.php');
+require_once(PRADO_DIR . '/interfaces.php');
 
 /**
  * Includes core classes essential for TApplication class
@@ -113,23 +113,23 @@ 
 	 * possible application mode.
 	 * @deprecated deprecated since version 3.0.4 (use TApplicationMode constants instead)
 	 */
-	const STATE_OFF='Off';
-	const STATE_DEBUG='Debug';
-	const STATE_NORMAL='Normal';
-	const STATE_PERFORMANCE='Performance';
+	const STATE_OFF = 'Off';
+	const STATE_DEBUG = 'Debug';
+	const STATE_NORMAL = 'Normal';
+	const STATE_PERFORMANCE = 'Performance';
 
 	/**
 	 * Page service ID
 	 */
-	const PAGE_SERVICE_ID='page';
+	const PAGE_SERVICE_ID = 'page';
 	/**
 	 * Application configuration file name
 	 */
-	const CONFIG_FILE_XML='application.xml';
+	const CONFIG_FILE_XML = 'application.xml';
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_XML='.xml';
+	const CONFIG_FILE_EXT_XML = '.xml';
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
@@ -137,11 +137,11 @@ 
 	/**
 	 * Application configuration file name
 	 */
-	const CONFIG_FILE_PHP='application.php';
+	const CONFIG_FILE_PHP = 'application.php';
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_PHP='.php';
+	const CONFIG_FILE_EXT_PHP = '.php';
 	/**
 	 * Configuration file type, application.php and config.php
 	 */
@@ -149,20 +149,20 @@ 
 	/**
 	 * Runtime directory name
 	 */
-	const RUNTIME_PATH='runtime';
+	const RUNTIME_PATH = 'runtime';
 	/**
 	 * Config cache file
 	 */
-	const CONFIGCACHE_FILE='config.cache';
+	const CONFIGCACHE_FILE = 'config.cache';
 	/**
 	 * Global data file
 	 */
-	const GLOBAL_FILE='global.cache';
+	const GLOBAL_FILE = 'global.cache';
 
 	/**
 	 * @var array list of events that define application lifecycles
 	 */
-	private static $_steps=array(
+	private static $_steps = array(
 		'onBeginRequest',
 		'onLoadState',
 		'onLoadStateComplete',
@@ -189,7 +189,7 @@ 
 	/**
 	 * @var boolean whether the request is completed
 	 */
-	private $_requestCompleted=false;
+	private $_requestCompleted = false;
 	/**
 	 * @var integer application state
 	 */
@@ -205,11 +205,11 @@ 
 	/**
 	 * @var array list of loaded application modules
 	 */
-	private $_modules=array();
+	private $_modules = array();
 	/**
 	 * @var array list of application modules yet to be loaded
 	 */
-	private $_lazyModules=array();
+	private $_lazyModules = array();
 	/**
 	 * @var TMap list of application parameters
 	 */
@@ -237,11 +237,11 @@ 
 	/**
 	 * @var boolean if any global state is changed during the current request
 	 */
-	private $_stateChanged=false;
+	private $_stateChanged = false;
 	/**
 	 * @var array global variables (persistent across sessions, requests)
 	 */
-	private $_globals=array();
+	private $_globals = array();
 	/**
 	 * @var string cache file
 	 */
@@ -293,7 +293,7 @@ 
 	/**
 	 * @var TApplicationMode application mode
 	 */
-	private $_mode=TApplicationMode::Debug;
+	private $_mode = TApplicationMode::Debug;
 
 	/**
 	 * @var string Customizable page service ID
@@ -318,22 +318,22 @@ 
 	 * @param boolean whether to cache application configuration. Defaults to true.
 	 * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid.
 	 */
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	public function __construct($basePath = 'protected', $cacheConfig = true, $configType = self::CONFIG_TYPE_XML)
 	{
 		// register application as a singleton
 		Prado::setApplication($this);
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
 
-		if($cacheConfig)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		if ($cacheConfig)
+			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
 
 		// generates unique ID by hashing the runtime path
-		$this->_uniqueID=md5($this->_runtimePath);
-		$this->_parameters=new TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		$this->_uniqueID = md5($this->_runtimePath);
+		$this->_parameters = new TMap;
+		$this->_services = array($this->getPageServiceID()=>array('TPageService', array(), null));
 
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 
 	/**
@@ -349,29 +349,29 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
-		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
-			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
-		else if(is_file($basePath))
+		if (empty($basePath) || ($basePath = realpath($basePath)) === false)
+			throw new TConfigurationException('application_basepath_invalid', $basePath);
+		if (is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
+			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
+		else if (is_file($basePath))
 		{
-			$configFile=$basePath;
-			$basePath=dirname($configFile);
+			$configFile = $basePath;
+			$basePath = dirname($configFile);
 		}
 		else
-			$configFile=null;
+			$configFile = null;
 
 		// determine runtime path
-		$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
-		if(is_writable($runtimePath))
+		$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
+		if (is_writable($runtimePath))
 		{
-			if($configFile!==null)
+			if ($configFile !== null)
 			{
-				$runtimePath.=DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
-				if(!is_dir($runtimePath))
+				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
+				if (!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+					if (@mkdir($runtimePath) === false)
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
@@ -380,7 +380,7 @@ 
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -394,22 +394,22 @@ 
 		try
 		{
 			$this->initApplication();
-			$n=count(self::$_steps);
-			$this->_step=0;
-			$this->_requestCompleted=false;
-			while($this->_step<$n)
+			$n = count(self::$_steps);
+			$this->_step = 0;
+			$this->_requestCompleted = false;
+			while ($this->_step < $n)
 			{
-				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
-				if($this->_requestCompleted)
+				if ($this->_mode === self::STATE_OFF)
+					throw new THttpException(503, 'application_unavailable');
+				if ($this->_requestCompleted)
 					break;
-				$method=self::$_steps[$this->_step];
-				Prado::trace("Executing $method()",'System.TApplication');
+				$method = self::$_steps[$this->_step];
+				Prado::trace("Executing $method()", 'System.TApplication');
 				$this->$method();
 				$this->_step++;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -423,7 +423,7 @@ 
 	 */
 	public function completeRequest()
 	{
-		$this->_requestCompleted=true;
+		$this->_requestCompleted = true;
 	}
 
 	/**
@@ -442,9 +442,9 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @return mixed the global value corresponding to $key
 	 */
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue = null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -457,14 +457,14 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
 	 */
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
-		$this->_stateChanged=true;
-		if($value===$defaultValue)
+		$this->_stateChanged = true;
+		if ($value === $defaultValue)
 			unset($this->_globals[$key]);
 		else
-			$this->_globals[$key]=$value;
-		if($forceSave)
+			$this->_globals[$key] = $value;
+		if ($forceSave)
 			$this->saveGlobals();
 	}
 
@@ -476,7 +476,7 @@ 
 	 */
 	public function clearGlobalState($key)
 	{
-		$this->_stateChanged=true;
+		$this->_stateChanged = true;
 		unset($this->_globals[$key]);
 	}
 
@@ -488,7 +488,7 @@ 
 	 */
 	protected function loadGlobals()
 	{
-		$this->_globals=$this->getApplicationStatePersister()->load();
+		$this->_globals = $this->getApplicationStatePersister()->load();
 	}
 
 	/**
@@ -497,9 +497,9 @@ 
 	 */
 	protected function saveGlobals()
 	{
-		if($this->_stateChanged)
+		if ($this->_stateChanged)
 		{
-			$this->_stateChanged=false;
+			$this->_stateChanged = false;
 			$this->getApplicationStatePersister()->save($this->_globals);
 		}
 	}
@@ -517,7 +517,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**
@@ -533,7 +533,7 @@ 
 	 */
 	public function setPageServiceID($value)
 	{
-		$this->_pageServiceID=$value;
+		$this->_pageServiceID = $value;
 	}
 
 	/**
@@ -557,7 +557,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'TApplicationMode');
+		$this->_mode = TPropertyValue::ensureEnum($value, 'TApplicationMode');
 	}
 
 	/**
@@ -573,7 +573,7 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		$this->_basePath=$value;
+		$this->_basePath = $value;
 	}
 
 	/**
@@ -589,7 +589,7 @@ 
 	 */
 	public function setConfigurationFile($value)
 	{
-		$this->_configFile=$value;
+		$this->_configFile = $value;
 	}
 
 	/**
@@ -613,9 +613,9 @@ 
 	 */
 	public function getConfigurationFileExt()
 	{
-		if($this->_configFileExt===null)
+		if ($this->_configFileExt === null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
@@ -633,9 +633,9 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if ($fileName == null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$fileName = TApplication::CONFIG_FILE_PHP;
@@ -660,11 +660,11 @@ 
 	 */
 	public function setRuntimePath($value)
 	{
-		$this->_runtimePath=$value;
-		if($this->_cacheFile)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		$this->_runtimePath = $value;
+		if ($this->_cacheFile)
+			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
 		// generates unique ID by hashing the runtime path
-		$this->_uniqueID=md5($this->_runtimePath);
+		$this->_uniqueID = md5($this->_runtimePath);
 	}
 
 	/**
@@ -680,7 +680,7 @@ 
 	 */
 	public function setService($value)
 	{
-		$this->_service=$value;
+		$this->_service = $value;
 	}
 
 	/**
@@ -689,12 +689,12 @@ 
 	 * @param string ID of the module
 	 * @param IModule module object or null if the module has not been loaded yet
 	 */
-	public function setModule($id,IModule $module=null)
+	public function setModule($id, IModule $module = null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+		if (isset($this->_modules[$id]))
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
-			$this->_modules[$id]=$module;
+			$this->_modules[$id] = $module;
 	}
 
 	/**
@@ -702,11 +702,11 @@ 
 	 */
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
+		if (!array_key_exists($id, $this->_modules))
 			return null;
 
 		// force loading of a lazy module
-		if($this->_modules[$id]===null)
+		if ($this->_modules[$id] === null)
 		{
 			$module = $this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
@@ -741,9 +741,9 @@ 
 	 */
 	public function getRequest()
 	{
-		if(!$this->_request)
+		if (!$this->_request)
 		{
-			$this->_request=new THttpRequest;
+			$this->_request = new THttpRequest;
 			$this->_request->init(null);
 		}
 		return $this->_request;
@@ -754,7 +754,7 @@ 
 	 */
 	public function setRequest(THttpRequest $request)
 	{
-		$this->_request=$request;
+		$this->_request = $request;
 	}
 
 	/**
@@ -762,9 +762,9 @@ 
 	 */
 	public function getResponse()
 	{
-		if(!$this->_response)
+		if (!$this->_response)
 		{
-			$this->_response=new THttpResponse;
+			$this->_response = new THttpResponse;
 			$this->_response->init(null);
 		}
 		return $this->_response;
@@ -775,7 +775,7 @@ 
 	 */
 	public function setResponse(THttpResponse $response)
 	{
-		$this->_response=$response;
+		$this->_response = $response;
 	}
 
 	/**
@@ -783,9 +783,9 @@ 
 	 */
 	public function getSession()
 	{
-		if(!$this->_session)
+		if (!$this->_session)
 		{
-			$this->_session=new THttpSession;
+			$this->_session = new THttpSession;
 			$this->_session->init(null);
 		}
 		return $this->_session;
@@ -796,7 +796,7 @@ 
 	 */
 	public function setSession(THttpSession $session)
 	{
-		$this->_session=$session;
+		$this->_session = $session;
 	}
 
 	/**
@@ -804,9 +804,9 @@ 
 	 */
 	public function getErrorHandler()
 	{
-		if(!$this->_errorHandler)
+		if (!$this->_errorHandler)
 		{
-			$this->_errorHandler=new TErrorHandler;
+			$this->_errorHandler = new TErrorHandler;
 			$this->_errorHandler->init(null);
 		}
 		return $this->_errorHandler;
@@ -817,7 +817,7 @@ 
 	 */
 	public function setErrorHandler(TErrorHandler $handler)
 	{
-		$this->_errorHandler=$handler;
+		$this->_errorHandler = $handler;
 	}
 
 	/**
@@ -825,9 +825,9 @@ 
 	 */
 	public function getSecurityManager()
 	{
-		if(!$this->_security)
+		if (!$this->_security)
 		{
-			$this->_security=new TSecurityManager;
+			$this->_security = new TSecurityManager;
 			$this->_security->init(null);
 		}
 		return $this->_security;
@@ -838,7 +838,7 @@ 
 	 */
 	public function setSecurityManager(TSecurityManager $sm)
 	{
-		$this->_security=$sm;
+		$this->_security = $sm;
 	}
 
 	/**
@@ -846,9 +846,9 @@ 
 	 */
 	public function getAssetManager()
 	{
-		if(!$this->_assetManager)
+		if (!$this->_assetManager)
 		{
-			$this->_assetManager=new TAssetManager;
+			$this->_assetManager = new TAssetManager;
 			$this->_assetManager->init(null);
 		}
 		return $this->_assetManager;
@@ -859,7 +859,7 @@ 
 	 */
 	public function setAssetManager(TAssetManager $value)
 	{
-		$this->_assetManager=$value;
+		$this->_assetManager = $value;
 	}
 
 	/**
@@ -867,9 +867,9 @@ 
 	 */
 	public function getApplicationStatePersister()
 	{
-		if(!$this->_statePersister)
+		if (!$this->_statePersister)
 		{
-			$this->_statePersister=new TApplicationStatePersister;
+			$this->_statePersister = new TApplicationStatePersister;
 			$this->_statePersister->init(null);
 		}
 		return $this->_statePersister;
@@ -880,7 +880,7 @@ 
 	 */
 	public function setApplicationStatePersister(IStatePersister $persister)
 	{
-		$this->_statePersister=$persister;
+		$this->_statePersister = $persister;
 	}
 
 	/**
@@ -896,7 +896,7 @@ 
 	 */
 	public function setCache(ICache $cache)
 	{
-		$this->_cache=$cache;
+		$this->_cache = $cache;
 	}
 
 	/**
@@ -912,18 +912,18 @@ 
 	 */
 	public function setUser(IUser $user)
 	{
-		$this->_user=$user;
+		$this->_user = $user;
 	}
 
 	/**
 	 * @param boolean whether to create globalization if it does not exist
 	 * @return TGlobalization globalization module
 	 */
-	public function getGlobalization($createIfNotExists=true)
+	public function getGlobalization($createIfNotExists = true)
 	{
-		if($this->_globalization===null && $createIfNotExists)
+		if ($this->_globalization === null && $createIfNotExists)
 		{
-			$this->_globalization=new TGlobalization;
+			$this->_globalization = new TGlobalization;
 			$this->_globalization->init(null);
 		}
 		return $this->_globalization;
@@ -934,7 +934,7 @@ 
 	 */
 	public function setGlobalization(TGlobalization $glob)
 	{
-		$this->_globalization=$glob;
+		$this->_globalization = $glob;
 	}
 
 	/**
@@ -942,8 +942,8 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules===null)
-			$this->_authRules=new TAuthorizationRuleCollection;
+		if ($this->_authRules === null)
+			$this->_authRules = new TAuthorizationRuleCollection;
 		return $this->_authRules;
 	}
 
@@ -952,99 +952,99 @@ 
 		return 'TApplicationConfiguration';
 	}
 
-	protected function internalLoadModule($id, $force=false)
+	protected function internalLoadModule($id, $force = false)
 	{
-		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
-		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
+		list($moduleClass, $initProperties, $configElement) = $this->_lazyModules[$id];
+		if (isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
-			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})",'System.TApplication');
+			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", 'System.TApplication');
 			$this->setModule($id, null);
 			return null;
 		}
 
-		Prado::trace("Loading module $id ({$moduleClass})",'System.TApplication');
-		$module=Prado::createComponent($moduleClass);
-		foreach($initProperties as $name=>$value)
+		Prado::trace("Loading module $id ({$moduleClass})", 'System.TApplication');
+		$module = Prado::createComponent($moduleClass);
+		foreach ($initProperties as $name=>$value)
 		{
-			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			if ($name === 'lazy') continue;
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
+		$this->setModule($id, $module);
 		// keep the key to avoid reuse of the old module id
-		$this->_lazyModules[$id]=null;
+		$this->_lazyModules[$id] = null;
 
-		return array($module,$configElement);
+		return array($module, $configElement);
 	}
 	/**
 	 * Applies an application configuration.
 	 * @param TApplicationConfiguration the configuration
 	 * @param boolean whether the configuration is specified within a service.
 	 */
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService = false)
 	{
-		if($config->getIsEmpty())
+		if ($config->getIsEmpty())
 			return;
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
-		foreach($config->getUsings() as $using)
+		foreach ($config->getAliases() as $alias=>$path)
+			Prado::setPathOfAlias($alias, $path);
+		foreach ($config->getUsings() as $using)
 			Prado::using($using);
 
 		// set application properties
-		if(!$withinService)
+		if (!$withinService)
 		{
-			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+			foreach ($config->getProperties() as $name=>$value)
+				$this->setSubProperty($name, $value);
 		}
 
-		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		if (empty($this->_services))
+			$this->_services = array($this->getPageServiceID()=>array('TPageService', array(), null));
 
 		// load parameters
-		foreach($config->getParameters() as $id=>$parameter)
+		foreach ($config->getParameters() as $id=>$parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				$component=Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$this->_parameters->add($id,$component);
+				$component = Prado::createComponent($parameter[0]);
+				foreach ($parameter[1] as $name=>$value)
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
-		$modules=array();
-		foreach($config->getModules() as $id=>$moduleConfig)
+		$modules = array();
+		foreach ($config->getModules() as $id=>$moduleConfig)
 		{
-			if(!is_string($id))
-				$id='_module'.count($this->_lazyModules);
-			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[]=$module;
+			if (!is_string($id))
+				$id = '_module' . count($this->_lazyModules);
+			$this->_lazyModules[$id] = $moduleConfig;
+			if ($module = $this->internalLoadModule($id))
+				$modules[] = $module;
 		}
-		foreach($modules as $module)
+		foreach ($modules as $module)
 			$module[0]->init($module[1]);
 
 		// load service
-		foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
+		foreach ($config->getServices() as $serviceID=>$serviceConfig)
+			$this->_services[$serviceID] = $serviceConfig;
 
 		// external configurations
-		foreach($config->getExternalConfigurations() as $filePath=>$condition)
+		foreach ($config->getExternalConfigurations() as $filePath=>$condition)
 		{
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
-			if($condition)
+			if ($condition !== true)
+				$condition = $this->evaluateExpression($condition);
+			if ($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
-				$cn=$this->getApplicationConfigurationClass();
-				$c=new $cn;
+				if (($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
+					throw new TConfigurationException('application_includefile_invalid', $filePath);
+				$cn = $this->getApplicationConfigurationClass();
+				$c = new $cn;
 				$c->loadFromFile($path);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
@@ -1060,25 +1060,25 @@ 
 	 */
 	protected function initApplication()
 	{
-		Prado::trace('Initializing application','System.TApplication');
+		Prado::trace('Initializing application', 'System.TApplication');
 
-		if($this->_configFile!==null)
+		if ($this->_configFile !== null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if ($this->_cacheFile === null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
-				$config=new TApplicationConfiguration;
+				$config = new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				if ($this->_cacheFile !== null)
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
-				$config=unserialize(file_get_contents($this->_cacheFile));
+				$config = unserialize(file_get_contents($this->_cacheFile));
 
-			$this->applyConfiguration($config,false);
+			$this->applyConfiguration($config, false);
 		}
 
-		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
-			$serviceID=$this->getPageServiceID();
+		if (($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
+			$serviceID = $this->getPageServiceID();
 
 		$this->startService($serviceID);
 	}
@@ -1091,34 +1091,34 @@ 
 	 */
 	public function startService($serviceID)
 	{
-		if(isset($this->_services[$serviceID]))
+		if (isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
-			$service=Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
+			$service = Prado::createComponent($serviceClass);
+			if (!($service instanceof IService))
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
+			if (!$service->getEnabled())
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+			foreach ($initProperties as $name=>$value)
+				$service->setSubProperty($name, $value);
 
-			if($configElement!==null)
+			if ($configElement !== null)
 			{
-				$config=new TApplicationConfiguration;
-				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+				$config = new TApplicationConfiguration;
+				if ($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1129,9 +1129,9 @@ 
 	 */
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'System.TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'System.TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 
 	/**
@@ -1143,7 +1143,7 @@ 
 	 */
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 
 	/**
@@ -1152,7 +1152,7 @@ 
 	 */
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 
 	/**
@@ -1161,7 +1161,7 @@ 
 	 */
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 
 	/**
@@ -1170,7 +1170,7 @@ 
 	 */
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 
 	/**
@@ -1179,7 +1179,7 @@ 
 	 */
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 
 	/**
@@ -1189,7 +1189,7 @@ 
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 
 	/**
@@ -1198,7 +1198,7 @@ 
 	 */
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 
 	/**
@@ -1207,7 +1207,7 @@ 
 	 */
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 
 	/**
@@ -1215,7 +1215,7 @@ 
 	 */
 	public function runService()
 	{
-		if($this->_service)
+		if ($this->_service)
 			$this->_service->run();
 	}
 
@@ -1225,7 +1225,7 @@ 
 	 */
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 
@@ -1235,7 +1235,7 @@ 
 	 */
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 
 	/**
@@ -1244,7 +1244,7 @@ 
 	 */
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
 
 	/**
@@ -1263,8 +1263,8 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
-		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->saveGlobals(); // save global state
+		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }
 
@@ -1283,10 +1283,10 @@ 
  */
 class TApplicationMode extends TEnumerable
 {
-	const Off='Off';
-	const Debug='Debug';
-	const Normal='Normal';
-	const Performance='Performance';
+	const Off = 'Off';
+	const Debug = 'Debug';
+	const Normal = 'Normal';
+	const Performance = 'Performance';
 }
 
 
@@ -1305,35 +1305,35 @@ 
 	/**
 	 * @var array list of application initial property values, indexed by property names
 	 */
-	private $_properties=array();
+	private $_properties = array();
 	/**
 	 * @var array list of namespaces to be used
 	 */
-	private $_usings=array();
+	private $_usings = array();
 	/**
 	 * @var array list of path aliases, indexed by alias names
 	 */
-	private $_aliases=array();
+	private $_aliases = array();
 	/**
 	 * @var array list of module configurations
 	 */
-	private $_modules=array();
+	private $_modules = array();
 	/**
 	 * @var array list of service configurations
 	 */
-	private $_services=array();
+	private $_services = array();
 	/**
 	 * @var array list of parameters
 	 */
-	private $_parameters=array();
+	private $_parameters = array();
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes=array();
+	private $_includes = array();
 	/**
 	 * @var boolean whether this configuration contains actual stuff
 	 */
-	private $_empty=true;
+	private $_empty = true;
 
 	/**
 	 * Parses the application configuration file.
@@ -1342,16 +1342,16 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname));
+			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
-			$dom=new TXmlDocument;
+			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
-			$this->loadFromXml($dom,dirname($fname));
+			$this->loadFromXml($dom, dirname($fname));
 		}
 	}
 
@@ -1371,29 +1371,29 @@ 
 	public function loadFromPhp($config, $configPath)
 	{
 		// application properties
-		if(isset($config['application']))
+		if (isset($config['application']))
 		{
-			foreach($config['application'] as $name=>$value)
+			foreach ($config['application'] as $name=>$value)
 			{
-				$this->_properties[$name]=$value;
+				$this->_properties[$name] = $value;
 			}
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
+		if (isset($config['paths']) && is_array($config['paths']))
+			$this->loadPathsPhp($config['paths'], $configPath);
 
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
+		if (isset($config['modules']) && is_array($config['modules']))
+			$this->loadModulesPhp($config['modules'], $configPath);
 
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
+		if (isset($config['services']) && is_array($config['services']))
+			$this->loadServicesPhp($config['services'], $configPath);
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
+		if (isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
 
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'],$configPath);
+		if (isset($config['includes']) && is_array($config['includes']))
+			$this->loadExternalXml($config['includes'], $configPath);
 	}
 
 	/**
@@ -1401,33 +1401,33 @@ 
 	 * @param TXmlElement the XML element
 	 * @param string the context path (for specifying relative paths)
 	 */
-	public function loadFromXml($dom,$configPath)
+	public function loadFromXml($dom, $configPath)
 	{
 		// application properties
-		foreach($dom->getAttributes() as $name=>$value)
+		foreach ($dom->getAttributes() as $name=>$value)
 		{
-			$this->_properties[$name]=$value;
-			$this->_empty=false;
+			$this->_properties[$name] = $value;
+			$this->_empty = false;
 		}
 
-		foreach($dom->getElements() as $element)
+		foreach ($dom->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'paths':
-					$this->loadPathsXml($element,$configPath);
+					$this->loadPathsXml($element, $configPath);
 					break;
 				case 'modules':
-					$this->loadModulesXml($element,$configPath);
+					$this->loadModulesXml($element, $configPath);
 					break;
 				case 'services':
-					$this->loadServicesXml($element,$configPath);
+					$this->loadServicesXml($element, $configPath);
 					break;
 				case 'parameters':
-					$this->loadParametersXml($element,$configPath);
+					$this->loadParametersXml($element, $configPath);
 					break;
 				case 'include':
-					$this->loadExternalXml($element,$configPath);
+					$this->loadExternalXml($element, $configPath);
 					break;
 				default:
 					//throw new TConfigurationException('appconfig_tag_invalid',$element->getTagName());
@@ -1443,26 +1443,26 @@ 
 	 */
 	protected function loadPathsPhp($pathsNode, $configPath)
 	{
-		if(isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
+		if (isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
 		{
-			foreach($pathsNode['aliases'] as $id=>$path)
+			foreach ($pathsNode['aliases'] as $id=>$path)
 			{
-				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
-					$p=realpath($path);
+				$path = str_replace('\\', '/', $path);
+				if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+					$p = realpath($path);
 				else
-					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
-				$this->_aliases[$id]=$p;
+					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+				if ($p === false || !is_dir($p))
+					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+				if (isset($this->_aliases[$id]))
+					throw new TConfigurationException('appconfig_alias_redefined', $id);
+				$this->_aliases[$id] = $p;
 			}
 		}
 
-		if(isset($pathsNode['using']) && is_array($pathsNode['using']))
+		if (isset($pathsNode['using']) && is_array($pathsNode['using']))
 		{
-			foreach($pathsNode['using'] as $namespace)
+			foreach ($pathsNode['using'] as $namespace)
 			{
 				$this->_usings[] = $namespace;
 			}
@@ -1474,43 +1474,43 @@ 
 	 * @param TXmlElement the paths XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadPathsXml($pathsNode,$configPath)
+	protected function loadPathsXml($pathsNode, $configPath)
 	{
-		foreach($pathsNode->getElements() as $element)
+		foreach ($pathsNode->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'alias':
 				{
-					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
+					if (($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
 					{
-						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
-							$p=realpath($path);
+						$path = str_replace('\\', '/', $path);
+						if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+							$p = realpath($path);
 						else
-							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
-						$this->_aliases[$id]=$p;
+							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+						if ($p === false || !is_dir($p))
+							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+						if (isset($this->_aliases[$id]))
+							throw new TConfigurationException('appconfig_alias_redefined', $id);
+						$this->_aliases[$id] = $p;
 					}
 					else
 						throw new TConfigurationException('appconfig_alias_invalid');
-					$this->_empty=false;
+					$this->_empty = false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace=$element->getAttribute('namespace'))!==null)
-						$this->_usings[]=$namespace;
+					if (($namespace = $element->getAttribute('namespace')) !== null)
+						$this->_usings[] = $namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
-					$this->_empty=false;
+					$this->_empty = false;
 					break;
 				}
 				default:
-					throw new TConfigurationException('appconfig_paths_invalid',$element->getTagName());
+					throw new TConfigurationException('appconfig_paths_invalid', $element->getTagName());
 			}
 		}
 	}
@@ -1522,21 +1522,21 @@ 
 	 */
 	protected function loadModulesPhp($modulesNode, $configPath)
 	{
-		foreach($modulesNode as $id=>$module)
+		foreach ($modulesNode as $id=>$module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
+			if (!isset($module['class']))
+				throw new TConfigurationException('appconfig_moduletype_required', $id);
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = array();
-			if(isset($module['properties']))
+			if (isset($module['properties']))
 			{
 				$properties = $module['properties'];
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id]=array($type,$properties,$module);
-			$this->_empty=false;
+			$this->_modules[$id] = array($type, $properties, $module);
+			$this->_empty = false;
 		}
 	}
 
@@ -1545,26 +1545,26 @@ 
 	 * @param TXmlElement the modules XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadModulesXml($modulesNode,$configPath)
+	protected function loadModulesXml($modulesNode, $configPath)
 	{
-		foreach($modulesNode->getElements() as $element)
+		foreach ($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName()==='module')
+			if ($element->getTagName() === 'module')
 			{
-				$properties=$element->getAttributes();
-				$id=$properties->itemAt('id');
-				$type=$properties->remove('class');
-				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+				$properties = $element->getAttributes();
+				$id = $properties->itemAt('id');
+				$type = $properties->remove('class');
+				if ($type === null)
+					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
+				if ($id === null)
+					$this->_modules[] = array($type, $properties->toArray(), $element);
 				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
-				$this->_empty=false;
+					$this->_modules[$id] = array($type, $properties->toArray(), $element);
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
 
@@ -1573,17 +1573,17 @@ 
 	 * @param array the services PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadServicesPhp($servicesNode,$configPath)
+	protected function loadServicesPhp($servicesNode, $configPath)
 	{
-		foreach($servicesNode as $id => $service)
+		foreach ($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
+			if (!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = array($type,$properties,$service);
+			$this->_services[$id] = array($type, $properties, $service);
 			$this->_empty = false;
 		}
 	}
@@ -1593,23 +1593,23 @@ 
 	 * @param TXmlElement the services XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadServicesXml($servicesNode,$configPath)
+	protected function loadServicesXml($servicesNode, $configPath)
 	{
-		foreach($servicesNode->getElements() as $element)
+		foreach ($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName()==='service')
+			if ($element->getTagName() === 'service')
 			{
-				$properties=$element->getAttributes();
-				if(($id=$properties->itemAt('id'))===null)
+				$properties = $element->getAttributes();
+				if (($id = $properties->itemAt('id')) === null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type=$properties->remove('class'))===null)
-					throw new TConfigurationException('appconfig_servicetype_required',$id);
+				if (($type = $properties->remove('class')) === null)
+					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id]=array($type,$properties->toArray(),$element);
-				$this->_empty=false;
+				$this->_services[$id] = array($type, $properties->toArray(), $element);
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
 
@@ -1618,19 +1618,19 @@ 
 	 * @param array the parameters PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadParametersPhp($parametersNode,$configPath)
+	protected function loadParametersPhp($parametersNode, $configPath)
 	{
-		foreach($parametersNode as $id => $parameter)
+		foreach ($parametersNode as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				if(isset($parameter['class']))
+				if (isset($parameter['class']))
 				{
 					$type = $parameter['class'];
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : array();
 					$properties['id'] = $id;
-					$this->_parameters[$id] = array($type,$properties);
+					$this->_parameters[$id] = array($type, $properties);
 				}
 			}
 			else
@@ -1645,28 +1645,28 @@ 
 	 * @param TXmlElement the parameters XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadParametersXml($parametersNode,$configPath)
+	protected function loadParametersXml($parametersNode, $configPath)
 	{
-		foreach($parametersNode->getElements() as $element)
+		foreach ($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName()==='parameter')
+			if ($element->getTagName() === 'parameter')
 			{
-				$properties=$element->getAttributes();
-				if(($id=$properties->remove('id'))===null)
+				$properties = $element->getAttributes();
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type=$properties->remove('class'))===null)
+				if (($type = $properties->remove('class')) === null)
 				{
-					if(($value=$properties->remove('value'))===null)
-						$this->_parameters[$id]=$element;
+					if (($value = $properties->remove('value')) === null)
+						$this->_parameters[$id] = $element;
 					else
-						$this->_parameters[$id]=$value;
+						$this->_parameters[$id] = $value;
 				}
 				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
-				$this->_empty=false;
+					$this->_parameters[$id] = array($type, $properties->toArray());
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
 
@@ -1675,19 +1675,19 @@ 
 	 * @param array the application PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadExternalPhp($includeNode,$configPath)
+	protected function loadExternalPhp($includeNode, $configPath)
 	{
-		foreach($includeNode as $include)
+		foreach ($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
+			$when = isset($include['when']) ? true : false;
+			if (!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 			else
-				$$this->_includes[$filePath]=$when;
-			$this->_empty=false;
+				$$this->_includes[$filePath] = $when;
+			$this->_empty = false;
 		}
 	}
 
@@ -1696,17 +1696,17 @@ 
 	 * @param TXmlElement the application DOM element
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadExternalXml($includeNode,$configPath)
+	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when=$includeNode->getAttribute('when'))===null)
-			$when=true;
-		if(($filePath=$includeNode->getAttribute('file'))===null)
+		if (($when = $includeNode->getAttribute('when')) === null)
+			$when = true;
+		if (($filePath = $includeNode->getAttribute('file')) === null)
 			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+		if (isset($this->_includes[$filePath]))
+			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 		else
-			$this->_includes[$filePath]=$when;
-		$this->_empty=false;
+			$this->_includes[$filePath] = $when;
+		$this->_empty = false;
 	}
 
 	/**
@@ -1813,7 +1813,7 @@ 
 	/**
 	 * Name of the value stored in cache
 	 */
-	const CACHE_NAME='prado:appstate';
+	const CACHE_NAME = 'prado:appstate';
 
 	/**
 	 * Initializes module.
@@ -1829,7 +1829,7 @@ 
 	 */
 	protected function getStateFilePath()
 	{
-		return $this->getApplication()->getRuntimePath().'/global.cache';
+		return $this->getApplication()->getRuntimePath() . '/global.cache';
 	}
 
 	/**
@@ -1838,11 +1838,11 @@ 
 	 */
 	public function load()
 	{
-		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
+		if (($cache = $this->getApplication()->getCache()) !== null && ($value = $cache->get(self::CACHE_NAME)) !== false)
 			return unserialize($value);
 		else
 		{
-			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
+			if (($content = @file_get_contents($this->getStateFilePath())) !== false)
 				return unserialize($content);
 			else
 				return null;
@@ -1855,19 +1855,19 @@ 
 	 */
 	public function save($state)
 	{
-		$content=serialize($state);
-		$saveFile=true;
-		if(($cache=$this->getApplication()->getCache())!==null)
+		$content = serialize($state);
+		$saveFile = true;
+		if (($cache = $this->getApplication()->getCache()) !== null)
 		{
-			if($cache->get(self::CACHE_NAME)===$content)
-				$saveFile=false;
+			if ($cache->get(self::CACHE_NAME) === $content)
+				$saveFile = false;
 			else
-				$cache->set(self::CACHE_NAME,$content);
+				$cache->set(self::CACHE_NAME, $content);
 		}
-		if($saveFile)
+		if ($saveFile)
 		{
-			$fileName=$this->getStateFilePath();
-			file_put_contents($fileName,$content,LOCK_EX);
+			$fileName = $this->getStateFilePath();
+			file_put_contents($fileName, $content, LOCK_EX);
 		}
 	}
 

Braces +227 added lines, -169 removed lines

@@ -325,8 +325,9 @@ 
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
 
-		if($cacheConfig)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		if($cacheConfig) {
+					$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		}
 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID=md5($this->_runtimePath);
@@ -349,17 +350,18 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
-		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
-			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
-		else if(is_file($basePath))
+		if(empty($basePath) || ($basePath=realpath($basePath))===false) {
+					throw new TConfigurationException('application_basepath_invalid',$basePath);
+		}
+		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName())) {
+					$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
+		} else if(is_file($basePath))
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
+		} else {
+					$configFile=null;
 		}
-		else
-			$configFile=null;
 
 		// determine runtime path
 		$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
@@ -370,17 +372,18 @@ 
 				$runtimePath.=DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
 				if(!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+					if(@mkdir($runtimePath)===false) {
+											throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+					}
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
+		} else {
+					throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 		}
-		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 
 	}
 
@@ -399,17 +402,18 @@ 
 			$this->_requestCompleted=false;
 			while($this->_step<$n)
 			{
-				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
-				if($this->_requestCompleted)
-					break;
+				if($this->_mode===self::STATE_OFF) {
+									throw new THttpException(503,'application_unavailable');
+				}
+				if($this->_requestCompleted) {
+									break;
+				}
 				$method=self::$_steps[$this->_step];
 				Prado::trace("Executing $method()",'System.TApplication');
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -460,12 +464,14 @@ 
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
 		$this->_stateChanged=true;
-		if($value===$defaultValue)
-			unset($this->_globals[$key]);
-		else
-			$this->_globals[$key]=$value;
-		if($forceSave)
-			$this->saveGlobals();
+		if($value===$defaultValue) {
+					unset($this->_globals[$key]);
+		} else {
+					$this->_globals[$key]=$value;
+		}
+		if($forceSave) {
+					$this->saveGlobals();
+		}
 	}
 
 	/**
@@ -661,8 +667,9 @@ 
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath=$value;
-		if($this->_cacheFile)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		if($this->_cacheFile) {
+					$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		}
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID=md5($this->_runtimePath);
 	}
@@ -691,10 +698,11 @@ 
 	 */
 	public function setModule($id,IModule $module=null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
-		else
-			$this->_modules[$id]=$module;
+		if(isset($this->_modules[$id])) {
+					throw new TConfigurationException('application_moduleid_duplicated',$id);
+		} else {
+					$this->_modules[$id]=$module;
+		}
 	}
 
 	/**
@@ -702,8 +710,9 @@ 
 	 */
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
-			return null;
+		if(!array_key_exists($id, $this->_modules)) {
+					return null;
+		}
 
 		// force loading of a lazy module
 		if($this->_modules[$id]===null)
@@ -942,8 +951,9 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules===null)
-			$this->_authRules=new TAuthorizationRuleCollection;
+		if($this->_authRules===null) {
+					$this->_authRules=new TAuthorizationRuleCollection;
+		}
 		return $this->_authRules;
 	}
 
@@ -966,7 +976,9 @@ 
 		$module=Prado::createComponent($moduleClass);
 		foreach($initProperties as $name=>$value)
 		{
-			if($name==='lazy') continue;
+			if($name==='lazy') {
+				continue;
+			}
 			$module->setSubProperty($name,$value);
 		}
 		$this->setModule($id,$module);
@@ -982,24 +994,29 @@ 
 	 */
 	public function applyConfiguration($config,$withinService=false)
 	{
-		if($config->getIsEmpty())
-			return;
+		if($config->getIsEmpty()) {
+					return;
+		}
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
-		foreach($config->getUsings() as $using)
-			Prado::using($using);
+		foreach($config->getAliases() as $alias=>$path) {
+					Prado::setPathOfAlias($alias,$path);
+		}
+		foreach($config->getUsings() as $using) {
+					Prado::using($using);
+		}
 
 		// set application properties
 		if(!$withinService)
 		{
-			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+			foreach($config->getProperties() as $name=>$value) {
+							$this->setSubProperty($name,$value);
+			}
 		}
 
-		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		if(empty($this->_services)) {
+					$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		}
 
 		// load parameters
 		foreach($config->getParameters() as $id=>$parameter)
@@ -1007,40 +1024,47 @@ 
 			if(is_array($parameter))
 			{
 				$component=Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
+				foreach($parameter[1] as $name=>$value) {
+									$component->setSubProperty($name,$value);
+				}
 				$this->_parameters->add($id,$component);
+			} else {
+							$this->_parameters->add($id,$parameter);
 			}
-			else
-				$this->_parameters->add($id,$parameter);
 		}
 
 		// load and init modules specified in app config
 		$modules=array();
 		foreach($config->getModules() as $id=>$moduleConfig)
 		{
-			if(!is_string($id))
-				$id='_module'.count($this->_lazyModules);
+			if(!is_string($id)) {
+							$id='_module'.count($this->_lazyModules);
+			}
 			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[]=$module;
+			if($module = $this->internalLoadModule($id)) {
+							$modules[]=$module;
+			}
+		}
+		foreach($modules as $module) {
+					$module[0]->init($module[1]);
 		}
-		foreach($modules as $module)
-			$module[0]->init($module[1]);
 
 		// load service
-		foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
+		foreach($config->getServices() as $serviceID=>$serviceConfig) {
+					$this->_services[$serviceID]=$serviceConfig;
+		}
 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath=>$condition)
 		{
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
+			if($condition!==true) {
+							$condition=$this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path)) {
+									throw new TConfigurationException('application_includefile_invalid',$filePath);
+				}
 				$cn=$this->getApplicationConfigurationClass();
 				$c=new $cn;
 				$c->loadFromFile($path);
@@ -1068,17 +1092,19 @@ 
 			{
 				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				if($this->_cacheFile!==null) {
+									file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				}
+			} else {
+							$config=unserialize(file_get_contents($this->_cacheFile));
 			}
-			else
-				$config=unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config,false);
 		}
 
-		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
-			$serviceID=$this->getPageServiceID();
+		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null) {
+					$serviceID=$this->getPageServiceID();
+		}
 
 		$this->startService($serviceID);
 	}
@@ -1095,30 +1121,34 @@ 
 		{
 			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
 			$service=Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			if(!($service instanceof IService)) {
+							throw new THttpException(500,'application_service_invalid',$serviceClass);
+			}
+			if(!$service->getEnabled()) {
+							throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			}
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+			foreach($initProperties as $name=>$value) {
+							$service->setSubProperty($name,$value);
+			}
 
 			if($configElement!==null)
 			{
 				$config=new TApplicationConfiguration;
-				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
-				else
-					$config->loadFromXml($configElement,$this->getBasePath());
+				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP) {
+									$config->loadFromPhp($configElement,$this->getBasePath());
+				} else {
+									$config->loadFromXml($configElement,$this->getBasePath());
+				}
 				$this->applyConfiguration($config,true);
 			}
 
 			$service->init($configElement);
+		} else {
+					throw new THttpException(500,'application_service_unknown',$serviceID);
 		}
-		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 
 	/**
@@ -1215,8 +1245,9 @@ 
 	 */
 	public function runService()
 	{
-		if($this->_service)
-			$this->_service->run();
+		if($this->_service) {
+					$this->_service->run();
+		}
 	}
 
 	/**
@@ -1346,8 +1377,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -1380,20 +1410,25 @@ 
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
+		if(isset($config['paths']) && is_array($config['paths'])) {
+					$this->loadPathsPhp($config['paths'],$configPath);
+		}
 
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
+		if(isset($config['modules']) && is_array($config['modules'])) {
+					$this->loadModulesPhp($config['modules'],$configPath);
+		}
 
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
+		if(isset($config['services']) && is_array($config['services'])) {
+					$this->loadServicesPhp($config['services'],$configPath);
+		}
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
-			$this->loadParametersPhp($config['parameters'], $configPath);
+		if(isset($config['parameters']) && is_array($config['parameters'])) {
+					$this->loadParametersPhp($config['parameters'], $configPath);
+		}
 
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'],$configPath);
+		if(isset($config['includes']) && is_array($config['includes'])) {
+					$this->loadExternalXml($config['includes'],$configPath);
+		}
 	}
 
 	/**
@@ -1448,14 +1483,18 @@ 
 			foreach($pathsNode['aliases'] as $id=>$path)
 			{
 				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
+				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path)) {
+					// if absolute path
 					$p=realpath($path);
-				else
-					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
+				} else {
+									$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+				}
+				if($p===false || !is_dir($p)) {
+									throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+				}
+				if(isset($this->_aliases[$id])) {
+									throw new TConfigurationException('appconfig_alias_redefined',$id);
+				}
 				$this->_aliases[$id]=$p;
 			}
 		}
@@ -1485,27 +1524,32 @@ 
 					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
 					{
 						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
+						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path)) {
+							// if absolute path
 							$p=realpath($path);
-						else
-							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
+						} else {
+													$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+						}
+						if($p===false || !is_dir($p)) {
+													throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+						}
+						if(isset($this->_aliases[$id])) {
+													throw new TConfigurationException('appconfig_alias_redefined',$id);
+						}
 						$this->_aliases[$id]=$p;
+					} else {
+											throw new TConfigurationException('appconfig_alias_invalid');
 					}
-					else
-						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty=false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace=$element->getAttribute('namespace'))!==null)
-						$this->_usings[]=$namespace;
-					else
-						throw new TConfigurationException('appconfig_using_invalid');
+					if(($namespace=$element->getAttribute('namespace'))!==null) {
+											$this->_usings[]=$namespace;
+					} else {
+											throw new TConfigurationException('appconfig_using_invalid');
+					}
 					$this->_empty=false;
 					break;
 				}
@@ -1524,8 +1568,9 @@ 
 	{
 		foreach($modulesNode as $id=>$module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
+			if(!isset($module['class'])) {
+							throw new TConfigurationException('appconfig_moduletype_required',$id);
+			}
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = array();
@@ -1554,17 +1599,19 @@ 
 				$properties=$element->getAttributes();
 				$id=$properties->itemAt('id');
 				$type=$properties->remove('class');
-				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+				if($type===null) {
+									throw new TConfigurationException('appconfig_moduletype_required',$id);
+				}
 				$element->setParent(null);
-				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
-				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
+				if($id===null) {
+									$this->_modules[]=array($type,$properties->toArray(),$element);
+				} else {
+									$this->_modules[$id]=array($type,$properties->toArray(),$element);
+				}
 				$this->_empty=false;
+			} else {
+							throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 		}
 	}
 
@@ -1577,8 +1624,9 @@ 
 	{
 		foreach($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
-				throw new TConfigurationException('appconfig_servicetype_required');
+			if(!isset($service['class'])) {
+							throw new TConfigurationException('appconfig_servicetype_required');
+			}
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
@@ -1600,16 +1648,18 @@ 
 			if($element->getTagName()==='service')
 			{
 				$properties=$element->getAttributes();
-				if(($id=$properties->itemAt('id'))===null)
-					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type=$properties->remove('class'))===null)
-					throw new TConfigurationException('appconfig_servicetype_required',$id);
+				if(($id=$properties->itemAt('id'))===null) {
+									throw new TConfigurationException('appconfig_serviceid_required');
+				}
+				if(($type=$properties->remove('class'))===null) {
+									throw new TConfigurationException('appconfig_servicetype_required',$id);
+				}
 				$element->setParent(null);
 				$this->_services[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
+			} else {
+							throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 		}
 	}
 
@@ -1632,8 +1682,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -1652,21 +1701,23 @@ 
 			if($element->getTagName()==='parameter')
 			{
 				$properties=$element->getAttributes();
-				if(($id=$properties->remove('id'))===null)
-					throw new TConfigurationException('appconfig_parameterid_required');
+				if(($id=$properties->remove('id'))===null) {
+									throw new TConfigurationException('appconfig_parameterid_required');
+				}
 				if(($type=$properties->remove('class'))===null)
 				{
-					if(($value=$properties->remove('value'))===null)
-						$this->_parameters[$id]=$element;
-					else
-						$this->_parameters[$id]=$value;
+					if(($value=$properties->remove('value'))===null) {
+											$this->_parameters[$id]=$element;
+					} else {
+											$this->_parameters[$id]=$value;
+					}
+				} else {
+									$this->_parameters[$id]=array($type,$properties->toArray());
 				}
-				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
 				$this->_empty=false;
+			} else {
+							throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 		}
 	}
 
@@ -1680,13 +1731,15 @@ 
 		foreach($includeNode as $include)
 		{
 			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
-				throw new TConfigurationException('appconfig_includefile_required');
+			if(!isset($include['file'])) {
+							throw new TConfigurationException('appconfig_includefile_required');
+			}
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
-			else
-				$$this->_includes[$filePath]=$when;
+			if(isset($this->_includes[$filePath])) {
+							$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+			} else {
+							$$this->_includes[$filePath]=$when;
+			}
 			$this->_empty=false;
 		}
 	}
@@ -1698,14 +1751,17 @@ 
 	 */
 	protected function loadExternalXml($includeNode,$configPath)
 	{
-		if(($when=$includeNode->getAttribute('when'))===null)
-			$when=true;
-		if(($filePath=$includeNode->getAttribute('file'))===null)
-			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
-		else
-			$this->_includes[$filePath]=$when;
+		if(($when=$includeNode->getAttribute('when'))===null) {
+					$when=true;
+		}
+		if(($filePath=$includeNode->getAttribute('file'))===null) {
+					throw new TConfigurationException('appconfig_includefile_required');
+		}
+		if(isset($this->_includes[$filePath])) {
+					$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+		} else {
+					$this->_includes[$filePath]=$when;
+		}
 		$this->_empty=false;
 	}
 
@@ -1838,14 +1894,15 @@ 
 	 */
 	public function load()
 	{
-		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
-			return unserialize($value);
-		else
+		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false) {
+					return unserialize($value);
+		} else
 		{
-			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
-				return unserialize($content);
-			else
-				return null;
+			if(($content=@file_get_contents($this->getStateFilePath()))!==false) {
+							return unserialize($content);
+			} else {
+							return null;
+			}
 		}
 	}
 
@@ -1859,10 +1916,11 @@ 
 		$saveFile=true;
 		if(($cache=$this->getApplication()->getCache())!==null)
 		{
-			if($cache->get(self::CACHE_NAME)===$content)
-				$saveFile=false;
-			else
-				$cache->set(self::CACHE_NAME,$content);
+			if($cache->get(self::CACHE_NAME)===$content) {
+							$saveFile=false;
+			} else {
+							$cache->set(self::CACHE_NAME,$content);
+			}
 		}
 		if($saveFile)
 		{

framework/TApplicationComponent.php

Doc Comments +3 added lines

@@ -92,6 +92,8 @@ 
 	 *
 	 * @param string path of the asset that is relative to the directory containing the specified class file.
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
+	 * @param string $assetPath
+	 * @param string $className
 	 * @return string URL to the asset path.
 	 */
 	public function publishAsset($assetPath,$className=null)
@@ -106,6 +108,7 @@ 
 	/**
 	 * Publishes a file or directory and returns its URL.
 	 * @param string absolute path of the file or directory to be published
+	 * @param string $fullPath
 	 * @return string URL to the published file or directory
 	 */
 	public function publishFilePath($fullPath, $checkTimestamp=false)

Spacing +6 added lines, -6 removed lines

@@ -94,12 +94,12 @@ 
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
 	 * @return string URL to the asset path.
 	 */
-	public function publishAsset($assetPath,$className=null)
+	public function publishAsset($assetPath, $className = null)
 	{
-		if($className===null)
-			$className=get_class($this);
-		$class=new ReflectionClass($className);
-		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
+		if ($className === null)
+			$className = get_class($this);
+		$class = new ReflectionClass($className);
+		$fullPath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $assetPath;
 		return $this->publishFilePath($fullPath);
 	}
 
@@ -108,7 +108,7 @@ 
 	 * @param string absolute path of the file or directory to be published
 	 * @return string URL to the published file or directory
 	 */
-	public function publishFilePath($fullPath, $checkTimestamp=false)
+	public function publishFilePath($fullPath, $checkTimestamp = false)
 	{
 		return Prado::getApplication()->getAssetManager()->publishFilePath($fullPath, $checkTimestamp);
 	}

Braces +3 added lines, -2 removed lines

@@ -96,8 +96,9 @@
 	 */
 	public function publishAsset($assetPath,$className=null)
 	{
-		if($className===null)
-			$className=get_class($this);
+		if($className===null) {
+					$className=get_class($this);
+		}
 		$class=new ReflectionClass($className);
 		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);

framework/TComponent.php

Doc Comments +24 added lines, -4 removed lines

@@ -406,7 +406,7 @@ 
 	 * </code>
 	 * to be executed when listen is called.  All attached behaviors are notified through dyListen.
 	 *
-	 * @return numeric the number of global events that were registered to the global event registry
+	 * @return null|integer the number of global events that were registered to the global event registry
 	 */
 	public function listen() {
 		if($this->_listeningenabled)
@@ -440,7 +440,7 @@ 
 	 * </code>
 	 * to be executed when listen is called.  All attached behaviors are notified through dyUnlisten.
 	 *
-	 * @return numeric the number of global events that were unregistered from the global event registry
+	 * @return null|integer the number of global events that were unregistered from the global event registry
 	 */
 	public function unlisten() {
 		if(!$this->_listeningenabled)
@@ -774,6 +774,7 @@ 
 	 * A property is defined if there is a getter or setter method
 	 * defined in the class. Note, property names are case-insensitive.
 	 * @param string the property name
+	 * @param string $name
 	 * @return boolean whether the property is defined
 	 */
 	public function hasProperty($name)
@@ -1001,6 +1002,7 @@ 
 	 * @param callback the event handler
 	 * @param numeric|null the priority of the handler, defaults to null which translates into the
 	 * default priority of 10.0 within {@link TPriorityList}
+	 * @param integer $priority
 	 * @throws TInvalidOperationException if the event does not exist
 	 */
 	public function attachEventHandler($name,$handler,$priority=null)
@@ -1316,6 +1318,7 @@ 
 	 * dyAddParsedObject.
 	 *
 	 * @param string|TComponent text string or component parsed and instantiated in template
+	 * @param NewComponentNoListen $object
 	 * @see createdOnTemplate
 	 */
 	public function addParsedObject($object)
@@ -1366,6 +1369,8 @@ 
 	 * TPanel::attachClassBehavior('javascripts', (new TJsPanelBehavior())->init($this));
 	 * </code>
 	 * @param numeric|null priority of behavior, default: null the default priority of the {@link TPriorityList}  Optional.
+	 * @param string $name
+	 * @param string $class
 	 * @throws TInvalidOperationException if the class behavior is being added to a {@link TComponent}; due to recursion.
 	 * @throws TInvalidOperationException if the class behavior is already defined
 	 * @since 3.2.3
@@ -1396,8 +1401,8 @@ 
 	 *	This will remove a behavior from a class.  It unregisters it from future instances and
 	 * pulls the changes from all the instances that are listening as well.
 	 * PHP 5.3 uses Late Static Binding to derive the static class upon which this method is called.
-	 * @param $name the key of the class behavior
-	 * @param $class string class on which to attach this behavior.  Defaults to null.
+	 * @param string $name the key of the class behavior
+	 * @param string $class string class on which to attach this behavior.  Defaults to null.
 	 * @param $priority numeric|null|false priority.  false is any priority, null is default
 	 *		{@link TPriorityList} priority, and numeric is a specific priority.
 	 * @throws Exception if the the class cannot be derived from Late Static Binding and is not
@@ -1426,6 +1431,7 @@ 
 	 * Returns the named behavior object.
 	 * The name 'asa' stands for 'as a'.
 	 * @param string the behavior name
+	 * @param string $behaviorname
 	 * @return IBehavior the behavior object, or null if the behavior does not exist
 	 * @since 3.2.3
 	 */
@@ -1654,6 +1660,7 @@ 
 	 * dyEnableBehavior.
 	 *
 	 * @param string the behavior's name. It uniquely identifies the behavior.
+	 * @param string $name
 	 * @since 3.2.3
 	 */
 	public function enableBehavior($name)
@@ -1682,6 +1689,7 @@ 
 	 * dyDisableBehavior.
 	 *
 	 * @param string the behavior's name. It uniquely identifies the behavior.
+	 * @param string $name
 	 * @since 3.2.3
 	 */
 	public function disableBehavior($name)
@@ -2087,6 +2095,7 @@ 
 	/**
 	 * Constructor.
 	 * @param object|string the component instance or the class name
+	 * @param string $component
 	 * @throws TInvalidDataTypeException if the object is not a component
 	 */
 	public function __construct($component)
@@ -2100,6 +2109,9 @@ 
 		$this->reflect();
 	}
 
+	/**
+	 * @param ReflectionMethod $method
+	 */
 	private function isPropertyMethod($method)
 	{
 		$methodName=$method->getName();
@@ -2108,6 +2120,9 @@ 
 				&& isset($methodName[3]);
 	}
 
+	/**
+	 * @param ReflectionMethod $method
+	 */
 	private function isEventMethod($method)
 	{
 		$methodName=$method->getName();
@@ -2254,11 +2269,14 @@ 
 	/**
 	 * Attaches the behavior object to the component.
 	 * @param CComponent the component that this behavior is to be attached to.
+	 * @param TComponent $component
+	 * @return void
 	 */
 	public function attach($component);
 	/**
 	 * Detaches the behavior object from the component.
 	 * @param CComponent the component that this behavior is to be detached from.
+	 * @return void
 	 */
 	public function detach($component);
 }
@@ -2283,6 +2301,8 @@ 
 	public function getEnabled();
 	/**
 	 * @param boolean whether this behavior is enabled
+	 * @param boolean $value
+	 * @return void
 	 */
 	public function setEnabled($value);
 }

Spacing +408 added lines, -408 removed lines

@@ -284,39 +284,39 @@ 
 	/**
 	 * @var array event handler lists
 	 */
-	private $_e=array();
+	private $_e = array();
 
 	/**
 	 * @var boolean if listening is enabled.  Automatically turned on or off in
 	 * constructor according to {@link getAutoGlobalListen}.  Default false, off
 	 */
-	private $_listeningenabled=false;
+	private $_listeningenabled = false;
 
 	/**
 	 * @var array static registered global event handler lists
 	 */
-	private static $_ue=array();
+	private static $_ue = array();
 
 	/**
 	 * @var boolean if object behaviors are on or off.  default true, on
 	 */
-	private $_behaviorsenabled=true;
+	private $_behaviorsenabled = true;
 
 	/**
 	 * @var TPriorityMap list of object behaviors
 	 */
-	private $_m=null;
+	private $_m = null;
 
 	/**
 	 * @var array static global class behaviors, these behaviors are added upon instantiation of a class
 	 */
-	private static $_um=array();
+	private static $_um = array();
 
 
 	/**
 	 * @const string the name of the global {@link raiseEvent} listener
 	 */
-	const GLOBAL_RAISE_EVENT_LISTENER='fxGlobalListener';
+	const GLOBAL_RAISE_EVENT_LISTENER = 'fxGlobalListener';
 
 
 	/**
@@ -327,12 +327,12 @@ 
 	 * through each parent to the top most class, TComponent.
 	 */
 	public function __construct() {
-		if($this->getAutoGlobalListen())
+		if ($this->getAutoGlobalListen())
 			$this->listen();
 
-		$classes=array_reverse($this->getClassHierarchy(true));
-		foreach($classes as $class) {
-			if(isset(self::$_um[$class]))
+		$classes = array_reverse($this->getClassHierarchy(true));
+		foreach ($classes as $class) {
+			if (isset(self::$_um[$class]))
 				$this->attachBehaviors(self::$_um[$class]);
 		}
 	}
@@ -363,7 +363,7 @@ 
 	 * called must be explicitly called.
 	 */
 	public function __destruct() {
-		if($this->_listeningenabled)
+		if ($this->_listeningenabled)
 			$this->unlisten();
 	}
 
@@ -373,7 +373,7 @@ 
 	 * that start with 'fx' are filtered in.
 	 */
 	private function filter_prado_fx($name) {
-		return strncasecmp($name,'fx',2)===0;
+		return strncasecmp($name, 'fx', 2) === 0;
 	}
 
 
@@ -385,11 +385,11 @@ 
 	 */
 	public function getClassHierarchy($lowercase = false)
 	{
-		$class=get_class($this);
-		$classes=array($class);
-		while($class=get_parent_class($class)){array_unshift($classes,$class);}
-		if($lowercase)
-			return array_map('strtolower',$classes);
+		$class = get_class($this);
+		$classes = array($class);
+		while ($class = get_parent_class($class)) {array_unshift($classes, $class); }
+		if ($lowercase)
+			return array_map('strtolower', $classes);
 		return $classes;
 	}
 
@@ -409,20 +409,20 @@ 
 	 * @return numeric the number of global events that were registered to the global event registry
 	 */
 	public function listen() {
-		if($this->_listeningenabled)
+		if ($this->_listeningenabled)
 			return;
 
-		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
+		$fx = array_filter(get_class_methods($this), array($this, 'filter_prado_fx'));
 
-		foreach($fx as $func)
-			$this->attachEventHandler($func,array($this,$func));
+		foreach ($fx as $func)
+			$this->attachEventHandler($func, array($this, $func));
 
-		if(is_a($this,'IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if (is_a($this, 'IDynamicMethods')) {
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
-		$this->_listeningenabled=true;
+		$this->_listeningenabled = true;
 
 		$this->dyListen($fx);
 
@@ -443,20 +443,20 @@ 
 	 * @return numeric the number of global events that were unregistered from the global event registry
 	 */
 	public function unlisten() {
-		if(!$this->_listeningenabled)
+		if (!$this->_listeningenabled)
 			return;
 
-		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
+		$fx = array_filter(get_class_methods($this), array($this, 'filter_prado_fx'));
 
-		foreach($fx as $func)
-			$this->detachEventHandler($func,array($this,$func));
+		foreach ($fx as $func)
+			$this->detachEventHandler($func, array($this, $func));
 
-		if(is_a($this,'IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if (is_a($this, 'IDynamicMethods')) {
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
-		$this->_listeningenabled=false;
+		$this->_listeningenabled = false;
 
 		$this->dyUnlisten($fx);
 
@@ -498,64 +498,64 @@ 
 	 */
 	public function __call($method, $args)
 	{
-		$getset=substr($method,0,3);
-		if(($getset=='get')||($getset=='set'))
+		$getset = substr($method, 0, 3);
+		if (($getset == 'get') || ($getset == 'set'))
 		{
-			$propname=substr($method,3);
-			$jsmethod=$getset.'js'.$propname;
-			if(method_exists($this,$jsmethod))
+			$propname = substr($method, 3);
+			$jsmethod = $getset . 'js' . $propname;
+			if (method_exists($this, $jsmethod))
 			{
-				if(count($args)>0)
-					if($args[0]&&!($args[0] instanceof TJavaScriptString))
-						$args[0]=new TJavaScriptString($args[0]);
-				return call_user_func_array(array($this,$jsmethod),$args);
+				if (count($args) > 0)
+					if ($args[0] && !($args[0] instanceof TJavaScriptString))
+						$args[0] = new TJavaScriptString($args[0]);
+				return call_user_func_array(array($this, $jsmethod), $args);
 			}
 
-			if (($getset=='set')&&method_exists($this,'getjs'.$propname))
-				throw new TInvalidOperationException('component_property_readonly',get_class($this),$method);
+			if (($getset == 'set') && method_exists($this, 'getjs' . $propname))
+				throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
 		}
 
-		if($this->_m!==null&&$this->_behaviorsenabled)
+		if ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			if(strncasecmp($method,'dy',2)===0)
+			if (strncasecmp($method, 'dy', 2) === 0)
 			{
-				$callchain=new TCallChain($method);
-				foreach($this->_m->toArray() as $behavior)
+				$callchain = new TCallChain($method);
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&(method_exists($behavior,$method)||($behavior instanceof IDynamicMethods)))
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods)))
 					{
-						$behavior_args=$args;
-						if($behavior instanceof IClassBehavior)
-							array_unshift($behavior_args,$this);
-						$callchain->addCall(array($behavior,$method),$behavior_args);
+						$behavior_args = $args;
+						if ($behavior instanceof IClassBehavior)
+							array_unshift($behavior_args, $this);
+						$callchain->addCall(array($behavior, $method), $behavior_args);
 					}
 
 				}
-				if($callchain->getCount()>0)
-					return call_user_func_array(array($callchain,'call'),$args);
+				if ($callchain->getCount() > 0)
+					return call_user_func_array(array($callchain, 'call'), $args);
 			}
 			else
 			{
-				foreach($this->_m->toArray() as $behavior)
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&method_exists($behavior,$method))
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method))
 					{
-						if($behavior instanceof IClassBehavior)
-							array_unshift($args,$this);
-						return call_user_func_array(array($behavior,$method),$args);
+						if ($behavior instanceof IClassBehavior)
+							array_unshift($args, $this);
+						return call_user_func_array(array($behavior, $method), $args);
 					}
 				}
 			}
 		}
 
-		if(strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+		if (strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 		{
-			if($this instanceof IDynamicMethods)
-				return $this->__dycall($method,$args);
-			return isset($args[0])?$args[0]:null;
+			if ($this instanceof IDynamicMethods)
+				return $this->__dycall($method, $args);
+			return isset($args[0]) ? $args[0] : null;
 		}
 
-		throw new TApplicationException('component_method_undefined',get_class($this),$method);
+		throw new TApplicationException('component_method_undefined', get_class($this), $method);
 	}
 
 
@@ -584,48 +584,48 @@ 
 	 */
 	public function __get($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
+		if (method_exists($this, $getter = 'get' . $name))
 		{
 			// getting a property
 			return $this->$getter();
 		}
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		else if (method_exists($this, $jsgetter = 'getjs' . $name))
 		{
 			// getting a javascript property
-			return (string)$this->$jsgetter();
+			return (string) $this->$jsgetter();
 		}
-		else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
+		else if (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
 			// getting an event (handler list)
-			$name=strtolower($name);
-			if(!isset($this->_e[$name]))
-				$this->_e[$name]=new TPriorityList;
+			$name = strtolower($name);
+			if (!isset($this->_e[$name]))
+				$this->_e[$name] = new TPriorityList;
 			return $this->_e[$name];
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if (strncasecmp($name, 'fx', 2) === 0)
 		{
 			// getting a global event (handler list)
-			$name=strtolower($name);
-			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name]=new TPriorityList;
+			$name = strtolower($name);
+			if (!isset(self::$_ue[$name]))
+				self::$_ue[$name] = new TPriorityList;
 			return self::$_ue[$name];
 		}
-		else if($this->_behaviorsenabled)
+		else if ($this->_behaviorsenabled)
 		{
 			// getting a behavior property/event (handler list)
-			if(isset($this->_m[$name]))
+			if (isset($this->_m[$name]))
 				return $this->_m[$name];
-			else if($this->_m!==null)
+			else if ($this->_m !== null)
 			{
-				foreach($this->_m->toArray() as $behavior)
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-						(property_exists($behavior,$name)||$behavior->canGetProperty($name)||$behavior->hasEvent($name)))
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name)))
 						return $behavior->$name;
 				}
 			}
 		}
-		throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
+		throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 	}
 
 	/**
@@ -643,46 +643,46 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		if(method_exists($this,$setter='set'.$name))
+		if (method_exists($this, $setter = 'set' . $name))
 		{
-			if(strncasecmp($name,'js',2)===0&&$value&&!($value instanceof TJavaScriptLiteral))
+			if (strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral))
 				$value = new TJavaScriptLiteral($value);
 			return $this->$setter($value);
 		}
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		else if (method_exists($this, $jssetter = 'setjs' . $name))
 		{
-			if($value&&!($value instanceof TJavaScriptString))
-				$value=new TJavaScriptString($value);
+			if ($value && !($value instanceof TJavaScriptString))
+				$value = new TJavaScriptString($value);
 			return $this->$jssetter($value);
 		}
-		else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
+		else if ((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0)
 		{
-			return $this->attachEventHandler($name,$value);
+			return $this->attachEventHandler($name, $value);
 		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			$sets=0;
-			foreach($this->_m->toArray() as $behavior)
+			$sets = 0;
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-					(property_exists($behavior,$name)||$behavior->canSetProperty($name)||$behavior->hasEvent($name))) {
-					$behavior->$name=$value;
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+					(property_exists($behavior, $name) || $behavior->canSetProperty($name) || $behavior->hasEvent($name))) {
+					$behavior->$name = $value;
 					$sets++;
 				}
 			}
-			if($sets)return $value;
+			if ($sets)return $value;
 
 		}
 
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
+		if (method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name))
 		{
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 		}
 		else
 		{
-			throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
+			throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 		}
 	}
 
@@ -700,27 +700,27 @@ 
 	 */
 	public function __isset($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
-			return $this->$getter()!==null;
-		else if(method_exists($this,$jsgetter='getjs'.$name))
-			return $this->$jsgetter()!==null;
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		if (method_exists($this, $getter = 'get' . $name))
+			return $this->$getter() !== null;
+		else if (method_exists($this, $jsgetter = 'getjs' . $name))
+			return $this->$jsgetter() !== null;
+		else if (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
-			$name=strtolower($name);
-			return isset($this->_e[$name])&&$this->_e[$name]->getCount();
+			$name = strtolower($name);
+			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if (strncasecmp($name, 'fx', 2) === 0)
 		{
-			$name=strtolower($name);
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount();
+			$name = strtolower($name);
+			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
 		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
+			if (isset($this->_m[$name]))
 				return true;
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled()))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()))
 					return isset($behavior->$name);
 			}
 
@@ -741,32 +741,32 @@ 
 	 */
 	public function __unset($name)
 	{
-		if(method_exists($this,$setter='set'.$name))
+		if (method_exists($this, $setter = 'set' . $name))
 			$this->$setter(null);
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		else if (method_exists($this, $jssetter = 'setjs' . $name))
 			$this->$jssetter(null);
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		else if (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 			$this->_e[strtolower($name)]->clear();
-		else if(strncasecmp($name,'fx',2)===0)
+		else if (strncasecmp($name, 'fx', 2) === 0)
 			$this->getEventHandlers($name)->remove(array($this, $name));
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
+			if (isset($this->_m[$name]))
 				$this->detachBehavior($name);
 			else {
-				$unset=0;
-				foreach($this->_m->toArray() as $behavior)
+				$unset = 0;
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())) {
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
 						unset($behavior->$name);
 						$unset++;
 					}
 				}
-				if(!$unset&&method_exists($this,'get'.$name))
-					throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+				if (!$unset && method_exists($this, 'get' . $name))
+					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 			}
-		} else if(method_exists($this,'get'.$name))
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+		} else if (method_exists($this, 'get' . $name))
+			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	public function hasProperty($name)
 	{
-		return $this->canGetProperty($name)||$this->canSetProperty($name);
+		return $this->canGetProperty($name) || $this->canSetProperty($name);
 	}
 
 	/**
@@ -792,13 +792,13 @@ 
 	 */
 	public function canGetProperty($name)
 	{
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
+		if (method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name))
 			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canGetProperty($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name))
 					return true;
 			}
 		}
@@ -816,13 +816,13 @@ 
 	 */
 	public function canSetProperty($name)
 	{
-		if(method_exists($this,'set'.$name)||method_exists($this,'setjs'.$name))
+		if (method_exists($this, 'set' . $name) || method_exists($this, 'setjs' . $name))
 			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canSetProperty($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name))
 					return true;
 			}
 		}
@@ -841,9 +841,9 @@ 
 	 */
 	public function getSubProperty($path)
 	{
-		$object=$this;
-		foreach(explode('.',$path) as $property)
-			$object=$object->$property;
+		$object = $this;
+		foreach (explode('.', $path) as $property)
+			$object = $object->$property;
 		return $object;
 	}
 
@@ -857,17 +857,17 @@ 
 	 * @param string property path
 	 * @param mixed the property path value
 	 */
-	public function setSubProperty($path,$value)
+	public function setSubProperty($path, $value)
 	{
-		$object=$this;
-		if(($pos=strrpos($path,'.'))===false)
-			$property=$path;
+		$object = $this;
+		if (($pos = strrpos($path, '.')) === false)
+			$property = $path;
 		else
 		{
-			$object=$this->getSubProperty(substr($path,0,$pos));
-			$property=substr($path,$pos+1);
+			$object = $this->getSubProperty(substr($path, 0, $pos));
+			$property = substr($path, $pos + 1);
 		}
-		$object->$property=$value;
+		$object->$property = $value;
 	}
 
 	/**
@@ -884,14 +884,14 @@ 
 	 */
 	public function hasEvent($name)
 	{
-		if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0||strncasecmp($name,'dy',2)===0)
+		if ((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0 || strncasecmp($name, 'dy', 2) === 0)
 			return true;
 
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return true;
 			}
 		}
@@ -907,17 +907,17 @@ 
 	 */
 	public function hasEventHandler($name)
 	{
-		$name=strtolower($name);
-		if(strncasecmp($name,'fx',2)===0)
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount()>0;
+		$name = strtolower($name);
+		if (strncasecmp($name, 'fx', 2) === 0)
+			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount() > 0;
 		else
 		{
-			if(isset($this->_e[$name])&&$this->_e[$name]->getCount()>0)
+			if (isset($this->_e[$name]) && $this->_e[$name]->getCount() > 0)
 				return true;
-			else if($this->_m!==null&&$this->_behaviorsenabled) {
-				foreach($this->_m->toArray() as $behavior)
+			else if ($this->_m !== null && $this->_behaviorsenabled) {
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEventHandler($name))
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name))
 						return true;
 				}
 			}
@@ -933,29 +933,29 @@ 
 	 */
 	public function getEventHandlers($name)
 	{
-		if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		if (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
-			$name=strtolower($name);
-			if(!isset($this->_e[$name]))
-				$this->_e[$name]=new TPriorityList;
+			$name = strtolower($name);
+			if (!isset($this->_e[$name]))
+				$this->_e[$name] = new TPriorityList;
 			return $this->_e[$name];
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if (strncasecmp($name, 'fx', 2) === 0)
 		{
-			$name=strtolower($name);
-			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name]=new TPriorityList;
+			$name = strtolower($name);
+			if (!isset(self::$_ue[$name]))
+				self::$_ue[$name] = new TPriorityList;
 			return self::$_ue[$name];
 		}
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return $behavior->getEventHandlers($name);
 			}
 		}
-		throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
+		throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 	}
 
 	/**
@@ -1003,9 +1003,9 @@ 
 	 * default priority of 10.0 within {@link TPriorityList}
 	 * @throws TInvalidOperationException if the event does not exist
 	 */
-	public function attachEventHandler($name,$handler,$priority=null)
+	public function attachEventHandler($name, $handler, $priority = null)
 	{
-		$this->getEventHandlers($name)->add($handler,$priority);
+		$this->getEventHandlers($name)->add($handler, $priority);
 	}
 
 	/**
@@ -1018,16 +1018,16 @@ 
 	 * to an item of any priority within {@link TPriorityList}; null means the default priority
 	 * @return boolean if the removal is successful
 	 */
-	public function detachEventHandler($name,$handler,$priority=false)
+	public function detachEventHandler($name, $handler, $priority = false)
 	{
-		if($this->hasEventHandler($name))
+		if ($this->hasEventHandler($name))
 		{
 			try
 			{
-				$this->getEventHandlers($name)->remove($handler,$priority);
+				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 			}
 		}
@@ -1106,105 +1106,105 @@ 
 	 * @throws TInvalidOperationException if the event is undefined
 	 * @throws TInvalidDataValueException If an event handler is invalid
 	 */
-	public function raiseEvent($name,$sender,$param,$responsetype=null,$postfunction=null)
+	public function raiseEvent($name, $sender, $param, $responsetype = null, $postfunction = null)
 	{
-		$p=$param;
-		if(is_callable($responsetype))
+		$p = $param;
+		if (is_callable($responsetype))
 		{
-			$postfunction=$responsetype;
-			$responsetype=null;
+			$postfunction = $responsetype;
+			$responsetype = null;
 		}
 
-		if($responsetype===null)
-			$responsetype=TEventResults::EVENT_RESULT_FILTER;
+		if ($responsetype === null)
+			$responsetype = TEventResults::EVENT_RESULT_FILTER;
 
-		$name=strtolower($name);
-		$responses=array();
+		$name = strtolower($name);
+		$responses = array();
 
-		$name=$this->dyPreRaiseEvent($name,$sender,$param,$responsetype,$postfunction);
+		$name = $this->dyPreRaiseEvent($name, $sender, $param, $responsetype, $postfunction);
 
-		if($this->hasEventHandler($name)||$this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
+		if ($this->hasEventHandler($name) || $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
 		{
-			$handlers=$this->getEventHandlers($name);
-			$handlerArray=$handlers->toArray();
-			if(strncasecmp($name,'fx',2)===0&&$this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
+			$handlers = $this->getEventHandlers($name);
+			$handlerArray = $handlers->toArray();
+			if (strncasecmp($name, 'fx', 2) === 0 && $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
 			{
-				$globalhandlers=$this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
-				$handlerArray=array_merge($globalhandlers->toArrayBelowPriority(0),$handlerArray,$globalhandlers->toArrayAbovePriority(0));
+				$globalhandlers = $this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+				$handlerArray = array_merge($globalhandlers->toArrayBelowPriority(0), $handlerArray, $globalhandlers->toArrayAbovePriority(0));
 			}
-			$response=null;
-			foreach($handlerArray as $handler)
+			$response = null;
+			foreach ($handlerArray as $handler)
 			{
-				if($this->dyIntraRaiseEventTestHandler($handler,$sender,$param,$name)===false)
+				if ($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false)
 					continue;
 
-				if(is_string($handler))
+				if (is_string($handler))
 				{
-					if(($pos=strrpos($handler,'.'))!==false)
+					if (($pos = strrpos($handler, '.')) !== false)
 					{
-						$object=$this->getSubProperty(substr($handler,0,$pos));
-						$method=substr($handler,$pos+1);
-						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+						$object = $this->getSubProperty(substr($handler, 0, $pos));
+						$method = substr($handler, $pos + 1);
+						if (method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 						{
-							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
+							if ($method == '__dycall')
+								$response = $object->__dycall($name, array($sender, $param, $name));
 							else
-								$response=$object->$method($sender,$param,$name);
+								$response = $object->$method($sender, $param, $name);
 						}
 						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
+							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler);
 					}
 					else
-						$response=call_user_func($handler,$sender,$param,$name);
+						$response = call_user_func($handler, $sender, $param, $name);
 				}
-				else if(is_callable($handler,true))
+				else if (is_callable($handler, true))
 				{
-					list($object,$method)=$handler;
-					if(is_string($object))
-						$response=call_user_func($handler,$sender,$param,$name);
+					list($object, $method) = $handler;
+					if (is_string($object))
+						$response = call_user_func($handler, $sender, $param, $name);
 					else
 					{
-						if(($pos=strrpos($method,'.'))!==false)
+						if (($pos = strrpos($method, '.')) !== false)
 						{
-							$object=$this->getSubProperty(substr($method,0,$pos));
-							$method=substr($method,$pos+1);
+							$object = $this->getSubProperty(substr($method, 0, $pos));
+							$method = substr($method, $pos + 1);
 						}
-						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+						if (method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 						{
-							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
+							if ($method == '__dycall')
+								$response = $object->__dycall($name, array($sender, $param, $name));
 							else
-								$response=$object->$method($sender,$param,$name);
+								$response = $object->$method($sender, $param, $name);
 						}
 						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
+							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler[1]);
 					}
 				}
 				else
-					throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
+					throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, gettype($handler));
 
-				$this->dyIntraRaiseEventPostHandler($name,$sender,$param,$handler,$response);
+				$this->dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $response);
 
-				if($postfunction)
-					$response=call_user_func_array($postfunction,array($sender,$param,$this,$response));
+				if ($postfunction)
+					$response = call_user_func_array($postfunction, array($sender, $param, $this, $response));
 
-				if($responsetype&TEventResults::EVENT_RESULT_ALL)
-					$responses[]=array('sender'=>$sender,'param'=>$param,'response'=>$response);
+				if ($responsetype & TEventResults::EVENT_RESULT_ALL)
+					$responses[] = array('sender'=>$sender, 'param'=>$param, 'response'=>$response);
 				else
-					$responses[]=$response;
+					$responses[] = $response;
 
-				if($response!==null&&($responsetype&TEventResults::EVENT_RESULT_FEED_FORWARD))
-					$param=$response;
+				if ($response !== null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD))
+					$param = $response;
 
 			}
 		}
-		else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name))
-			throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
+		else if (strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name))
+			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 
-		if($responsetype&TEventResults::EVENT_RESULT_FILTER)
-			$responses=array_filter($responses);
+		if ($responsetype & TEventResults::EVENT_RESULT_FILTER)
+			$responses = array_filter($responses);
 
-		$responses=$this->dyPostRaiseEvent($responses,$name,$sender,$param,$responsetype,$postfunction);
+		$responses = $this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
 
 		return $responses;
 	}
@@ -1228,16 +1228,16 @@ 
 	 */
 	public function evaluateExpression($expression)
 	{
-		$expression=$this->dyEvaluateExpressionFilter($expression);
+		$expression = $this->dyEvaluateExpressionFilter($expression);
 		try
 		{
-			if(eval("\$result=$expression;")===false)
+			if (eval("\$result=$expression;") === false)
 				throw new Exception('');
 			return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());
+			throw new TInvalidOperationException('component_expression_invalid', get_class($this), $expression, $e->getMessage());
 		}
 	}
 
@@ -1260,19 +1260,19 @@ 
 	 */
 	public function evaluateStatements($statements)
 	{
-		$statements=$this->dyEvaluateStatementsFilter($statements);
+		$statements = $this->dyEvaluateStatementsFilter($statements);
 		try
 		{
 			ob_start();
-			if(eval($statements)===false)
+			if (eval($statements) === false)
 				throw new Exception('');
-			$content=ob_get_contents();
+			$content = ob_get_contents();
 			ob_end_clean();
 			return $content;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());
+			throw new TInvalidOperationException('component_statements_invalid', get_class($this), $statements, $e->getMessage());
 		}
 	}
 
@@ -1297,7 +1297,7 @@ 
 	 */
 	public function createdOnTemplate($parent)
 	{
-		$parent=$this->dyCreatedOnTemplate($parent);
+		$parent = $this->dyCreatedOnTemplate($parent);
 		$parent->addParsedObject($this);
 	}
 
@@ -1332,9 +1332,9 @@ 
 	 * @param $param TClassBehaviorEventParameter
 	 * @since 3.2.3
 	 */
-	public function fxAttachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->attachBehavior($param->getName(),$param->getBehavior(),$param->getPriority());
+	public function fxAttachClassBehavior($sender, $param) {
+		if (in_array($param->getClass(), $this->getClassHierarchy(true)))
+			return $this->attachBehavior($param->getName(), $param->getBehavior(), $param->getPriority());
 	}
 
 
@@ -1346,9 +1346,9 @@ 
 	 * @param $param TClassBehaviorEventParameter
 	 * @since 3.2.3
 	 */
-	public function fxDetachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->detachBehavior($param->getName(),$param->getPriority());
+	public function fxDetachClassBehavior($sender, $param) {
+		if (in_array($param->getClass(), $this->getClassHierarchy(true)))
+			return $this->detachBehavior($param->getName(), $param->getPriority());
 	}
 
 
@@ -1370,25 +1370,25 @@ 
 	 * @throws TInvalidOperationException if the class behavior is already defined
 	 * @since 3.2.3
 	 */
-	public static function attachClassBehavior($name,$behavior,$class=null,$priority=null) {
-		if(!$class&&function_exists('get_called_class'))
-			$class=get_called_class();
-		if(!$class)
+	public static function attachClassBehavior($name, $behavior, $class = null, $priority = null) {
+		if (!$class && function_exists('get_called_class'))
+			$class = get_called_class();
+		if (!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
 
-		if(!is_string($name))
-			$name=get_class($name);
-		$class=strtolower($class);
-		if($class==='tcomponent')
+		if (!is_string($name))
+			$name = get_class($name);
+		$class = strtolower($class);
+		if ($class === 'tcomponent')
 			throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
-		if(empty(self::$_um[$class]))
-			self::$_um[$class]=array();
-		if(isset(self::$_um[$class][$name]))
-			throw new TInvalidOperationException('component_class_behavior_defined',$class,$name);
-		$param=new TClassBehaviorEventParameter($class,$name,$behavior,$priority);
-		self::$_um[$class]=array($name=>$param)+self::$_um[$class];
-		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
-		return $behaviorObject->raiseEvent('fxAttachClassBehavior',null,$param);
+		if (empty(self::$_um[$class]))
+			self::$_um[$class] = array();
+		if (isset(self::$_um[$class][$name]))
+			throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
+		$param = new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
+		self::$_um[$class] = array($name=>$param) + self::$_um[$class];
+		$behaviorObject = is_string($behavior) ? new $behavior : $behavior;
+		return $behaviorObject->raiseEvent('fxAttachClassBehavior', null, $param);
 	}
 
 
@@ -1404,22 +1404,22 @@ 
 	 * not supplied as a parameter.
 	 * @since 3.2.3
 	 */
-	public static function detachClassBehavior($name,$class=null,$priority=false) {
-		if(!$class&&function_exists('get_called_class'))
-			$class=get_called_class();
-		if(!$class)
+	public static function detachClassBehavior($name, $class = null, $priority = false) {
+		if (!$class && function_exists('get_called_class'))
+			$class = get_called_class();
+		if (!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
 
-		$class=strtolower($class);
-		if(!is_string($name))
-			$name=get_class($name);
-		if(empty(self::$_um[$class])||!isset(self::$_um[$class][$name]))
+		$class = strtolower($class);
+		if (!is_string($name))
+			$name = get_class($name);
+		if (empty(self::$_um[$class]) || !isset(self::$_um[$class][$name]))
 			return false;
-		$param=self::$_um[$class][$name];
-		$behavior=$param->getBehavior();
+		$param = self::$_um[$class][$name];
+		$behavior = $param->getBehavior();
 		unset(self::$_um[$class][$name]);
-		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
-		return $behaviorObject->raiseEvent('fxDetachClassBehavior',null,$param);
+		$behaviorObject = is_string($behavior) ? new $behavior : $behavior;
+		return $behaviorObject->raiseEvent('fxDetachClassBehavior', null, $param);
 	}
 
 	/**
@@ -1431,7 +1431,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1455,17 +1455,17 @@ 
 	 */
 	public function isa($class)
 	{
-		if($this instanceof $class)
+		if ($this instanceof $class)
 			return true;
-		if($this->_m!==null&&$this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
-				if(($behavior instanceof IBehavior)&&!$behavior->getEnabled())
+		if ($this->_m !== null && $this->_behaviorsenabled)
+			foreach ($this->_m->toArray() as $behavior) {
+				if (($behavior instanceof IBehavior) && !$behavior->getEnabled())
 					continue;
 
 				$check = null;
-				if(($behavior->isa('IInstanceCheck'))&&$check=$behavior->isinstanceof($class,$this))
+				if (($behavior->isa('IInstanceCheck')) && $check = $behavior->isinstanceof($class, $this))
 					return true;
-				if($check===null&&($behavior->isa($class)))
+				if ($check === null && ($behavior->isa($class)))
 					return true;
 			}
 		return false;
@@ -1481,11 +1481,11 @@ 
 	 */
 	public function attachBehaviors($behaviors)
 	{
-		foreach($behaviors as $name=>$behavior)
-			if($behavior instanceof TClassBehaviorEventParameter)
-				$this->attachBehavior($behavior->getName(),$behavior->getBehavior(),$behavior->getPriority());
+		foreach ($behaviors as $name=>$behavior)
+			if ($behavior instanceof TClassBehaviorEventParameter)
+				$this->attachBehavior($behavior->getName(), $behavior->getBehavior(), $behavior->getPriority());
 			else
-				$this->attachBehavior($name,$behavior);
+				$this->attachBehavior($name, $behavior);
 	}
 
 	/**
@@ -1498,13 +1498,13 @@ 
 	 */
 	public function detachBehaviors($behaviors)
 	{
-		if($this->_m!==null)
+		if ($this->_m !== null)
 		{
-			foreach($behaviors as $name=>$behavior)
-				if($behavior instanceof TClassBehaviorEventParameter)
-					$this->detachBehavior($behavior->getName(),$behavior->getPriority());
+			foreach ($behaviors as $name=>$behavior)
+				if ($behavior instanceof TClassBehaviorEventParameter)
+					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
 		}
 	}
 
@@ -1514,11 +1514,11 @@ 
 	 */
 	public function clearBehaviors()
 	{
-		if($this->_m!==null)
+		if ($this->_m !== null)
 		{
-			foreach($this->_m->toArray() as $name=>$behavior)
+			foreach ($this->_m->toArray() as $name=>$behavior)
 				$this->detachBehavior($name);
-			$this->_m=null;
+			$this->_m = null;
 		}
 	}
 
@@ -1542,19 +1542,19 @@ 
 	 * @return IBehavior the behavior object
 	 * @since 3.2.3
 	 */
-	public function attachBehavior($name,$behavior,$priority=null)
+	public function attachBehavior($name, $behavior, $priority = null)
 	{
-		if(is_string($behavior))
-			$behavior=Prado::createComponent($behavior);
-		if(!($behavior instanceof IBaseBehavior))
-			throw new TInvalidDataTypeException('component_not_a_behavior',get_class($behavior));
-		if($behavior instanceof IBehavior)
+		if (is_string($behavior))
+			$behavior = Prado::createComponent($behavior);
+		if (!($behavior instanceof IBaseBehavior))
+			throw new TInvalidDataTypeException('component_not_a_behavior', get_class($behavior));
+		if ($behavior instanceof IBehavior)
 			$behavior->setEnabled(true);
-		if($this->_m===null)
-			$this->_m=new TPriorityMap;
+		if ($this->_m === null)
+			$this->_m = new TPriorityMap;
 		$behavior->attach($this);
-		$this->dyAttachBehavior($name,$behavior);
-		$this->_m->add($name,$behavior,$priority);
+		$this->dyAttachBehavior($name, $behavior);
+		$this->_m->add($name, $behavior, $priority);
 		return $behavior;
 	}
 
@@ -1575,14 +1575,14 @@ 
 	 * @return IBehavior the detached behavior. Null if the behavior does not exist.
 	 * @since 3.2.3
 	 */
-	public function detachBehavior($name,$priority=false)
+	public function detachBehavior($name, $priority = false)
 	{
-		if($this->_m!=null&&isset($this->_m[$name]))
+		if ($this->_m != null && isset($this->_m[$name]))
 		{
 			$this->_m[$name]->detach($this);
-			$behavior=$this->_m->itemAt($name);
-			$this->_m->remove($name,$priority);
-			$this->dyDetachBehavior($name,$behavior);
+			$behavior = $this->_m->itemAt($name);
+			$this->_m->remove($name, $priority);
+			$this->dyDetachBehavior($name, $behavior);
 			return $behavior;
 		}
 	}
@@ -1601,9 +1601,9 @@ 
 	 */
 	public function enableBehaviors()
 	{
-		if(!$this->_behaviorsenabled)
+		if (!$this->_behaviorsenabled)
 		{
-			$this->_behaviorsenabled=true;
+			$this->_behaviorsenabled = true;
 			$this->dyEnableBehaviors();
 		}
 	}
@@ -1622,10 +1622,10 @@ 
 	 */
 	public function disableBehaviors()
 	{
-		if($this->_behaviorsenabled)
+		if ($this->_behaviorsenabled)
 		{
 			$this->dyDisableBehaviors();
-			$this->_behaviorsenabled=false;
+			$this->_behaviorsenabled = false;
 		}
 	}
 
@@ -1658,10 +1658,10 @@ 
 	 */
 	public function enableBehavior($name)
 	{
-		if($this->_m!=null&&isset($this->_m[$name])){
-			if($this->_m[$name] instanceof IBehavior) {
+		if ($this->_m != null && isset($this->_m[$name])) {
+			if ($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(true);
-				$this->dyEnableBehavior($name,$this->_m[$name]);
+				$this->dyEnableBehavior($name, $this->_m[$name]);
 				return true;
 			}
 			return false;
@@ -1686,10 +1686,10 @@ 
 	 */
 	public function disableBehavior($name)
 	{
-		if($this->_m!=null&&isset($this->_m[$name])){
-			if($this->_m[$name] instanceof IBehavior) {
+		if ($this->_m != null && isset($this->_m[$name])) {
+			if ($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(false);
-				$this->dyDisableBehavior($name,$this->_m[$name]);
+				$this->dyDisableBehavior($name, $this->_m[$name]);
 				return true;
 			}
 			return false;
@@ -1704,7 +1704,7 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
+		$a = (array) $this;
 		$a = array_keys($a);
 		$exprops = array();
 		$this->__getZappableSleepProps($exprops);
@@ -1719,13 +1719,13 @@ 
 	 */
 	protected function __getZappableSleepProps(&$exprops)
 	{
-		if($this->_listeningenabled===false)
+		if ($this->_listeningenabled === false)
 			$exprops[] = "\0TComponent\0_listeningenabled";
-		if($this->_behaviorsenabled===true)
+		if ($this->_behaviorsenabled === true)
 			$exprops[] = "\0TComponent\0_behaviorsenabled";
-		if ($this->_e===array())
+		if ($this->_e === array())
 			$exprops[] = "\0TComponent\0_e";
-		if ($this->_m===null)
+		if ($this->_m === null)
 			$exprops[] = "\0TComponent\0_m";
 	}
 }
@@ -1742,7 +1742,7 @@ 
  */
 interface IDynamicMethods
 {
-	public function __dycall($method,$args);
+	public function __dycall($method, $args);
 }
 
 
@@ -1769,12 +1769,12 @@ 
 	 *	@param string $name the name of the behavior
 	 *	@param object $behavior this is the behavior to implement the class behavior
 	 */
-	public function __construct($class,$name,$behavior,$priority)
+	public function __construct($class, $name, $behavior, $priority)
 	{
-		$this->_class=$class;
-		$this->_name=$name;
-		$this->_behavior=$behavior;
-		$this->_priority=$priority;
+		$this->_class = $class;
+		$this->_name = $name;
+		$this->_behavior = $behavior;
+		$this->_priority = $priority;
 	}
 
 	/**
@@ -1838,11 +1838,11 @@ 
  */
 class TEnumerable implements Iterator
 {
-	private $_enums=array();
+	private $_enums = array();
 
 	public function __construct() {
-		$reflection=new ReflectionClass($this);
-		$this->_enums=$reflection->getConstants();
+		$reflection = new ReflectionClass($this);
+		$this->_enums = $reflection->getConstants();
 	}
 
 	public function current() {
@@ -1862,7 +1862,7 @@ 
 	}
 
 	public function valid() {
-		return $this->current()!==false;
+		return $this->current() !== false;
 	}
 }
 
@@ -1911,9 +1911,9 @@ 
 	public static function ensureBoolean($value)
 	{
 		if (is_string($value))
-			return strcasecmp($value,'true')==0 || $value!=0;
+			return strcasecmp($value, 'true') == 0 || $value != 0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -1928,9 +1928,9 @@ 
 		if (TJavaScript::isJsLiteral($value))
 			return $value;
 		if (is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -1940,7 +1940,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -1950,7 +1950,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -1964,20 +1964,20 @@ 
 	 */
 	public static function ensureArray($value)
 	{
-		if(is_string($value))
+		if (is_string($value))
 		{
 			$value = trim($value);
 			$len = strlen($value);
-			if ($len >= 2 && $value[0] == '(' && $value[$len-1] == ')')
+			if ($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
 			{
-				eval('$array=array'.$value.';');
+				eval('$array=array' . $value . ';');
 				return $array;
 			}
 			else
-				return $len>0?array($value):array();
+				return $len > 0 ? array($value) : array();
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -1987,7 +1987,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -2006,29 +2006,29 @@ 
 	 * @return string the valid enumeration value
 	 * @throws TInvalidDataValueException if the original value is not in the string array.
 	 */
-	public static function ensureEnum($value,$enums)
+	public static function ensureEnum($value, $enums)
 	{
-		static $types=array();
-		if(func_num_args()===2 && is_string($enums))
+		static $types = array();
+		if (func_num_args() === 2 && is_string($enums))
 		{
-			if(!isset($types[$enums]))
-				$types[$enums]=new ReflectionClass($enums);
-			if($types[$enums]->hasConstant($value))
+			if (!isset($types[$enums]))
+				$types[$enums] = new ReflectionClass($enums);
+			if ($types[$enums]->hasConstant($value))
 				return $value;
 			else
 				throw new TInvalidDataValueException(
-					'propertyvalue_enumvalue_invalid',$value,
-						implode(' | ',$types[$enums]->getConstants()));
+					'propertyvalue_enumvalue_invalid', $value,
+						implode(' | ', $types[$enums]->getConstants()));
 		}
-		else if(!is_array($enums))
+		else if (!is_array($enums))
 		{
-			$enums=func_get_args();
+			$enums = func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value,$enums,true))
+		if (in_array($value, $enums, true))
 			return $value;
 		else
-			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid',$value,implode(' | ',$enums));
+			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
 	}
 
 	/**
@@ -2038,7 +2038,7 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ? null : $value;
 	}
 }
 
@@ -2055,9 +2055,9 @@ 
 }
 
 class TEventResults extends TEnumerable {
-	const EVENT_RESULT_FEED_FORWARD=1;
-	const EVENT_RESULT_FILTER=2;
-	const EVENT_RESULT_ALL=4;
+	const EVENT_RESULT_FEED_FORWARD = 1;
+	const EVENT_RESULT_FILTER = 2;
+	const EVENT_RESULT_ALL = 4;
 }
 
 /**
@@ -2080,9 +2080,9 @@ 
 class TComponentReflection extends TComponent
 {
 	private $_className;
-	private $_properties=array();
-	private $_events=array();
-	private $_methods=array();
+	private $_properties = array();
+	private $_events = array();
+	private $_methods = array();
 
 	/**
 	 * Constructor.
@@ -2091,10 +2091,10 @@ 
 	 */
 	public function __construct($component)
 	{
-		if(is_string($component) && class_exists($component,false))
-			$this->_className=$component;
-		else if(is_object($component))
-			$this->_className=get_class($component);
+		if (is_string($component) && class_exists($component, false))
+			$this->_className = $component;
+		else if (is_object($component))
+			$this->_className = get_class($component);
 		else
 			throw new TInvalidDataTypeException('componentreflection_class_invalid');
 		$this->reflect();
@@ -2102,74 +2102,74 @@ 
 
 	private function isPropertyMethod($method)
 	{
-		$methodName=$method->getName();
-		return $method->getNumberOfRequiredParameters()===0
-				&& strncasecmp($methodName,'get',3)===0
+		$methodName = $method->getName();
+		return $method->getNumberOfRequiredParameters() === 0
+				&& strncasecmp($methodName, 'get', 3) === 0
 				&& isset($methodName[3]);
 	}
 
 	private function isEventMethod($method)
 	{
-		$methodName=$method->getName();
-		return strncasecmp($methodName,'on',2)===0
+		$methodName = $method->getName();
+		return strncasecmp($methodName, 'on', 2) === 0
 				&& isset($methodName[2]);
 	}
 
 	private function reflect()
 	{
-		$class=new ReflectionClass($this->_className);
-		$properties=array();
-		$events=array();
-		$methods=array();
-		$isComponent=is_subclass_of($this->_className,'TComponent') || strcasecmp($this->_className,'TComponent')===0;
-		foreach($class->getMethods() as $method)
+		$class = new ReflectionClass($this->_className);
+		$properties = array();
+		$events = array();
+		$methods = array();
+		$isComponent = is_subclass_of($this->_className, 'TComponent') || strcasecmp($this->_className, 'TComponent') === 0;
+		foreach ($class->getMethods() as $method)
 		{
-			if($method->isPublic() || $method->isProtected())
+			if ($method->isPublic() || $method->isProtected())
 			{
-				$methodName=$method->getName();
-				if(!$method->isStatic() && $isComponent)
+				$methodName = $method->getName();
+				if (!$method->isStatic() && $isComponent)
 				{
-					if($this->isPropertyMethod($method))
-						$properties[substr($methodName,3)]=$method;
-					else if($this->isEventMethod($method))
+					if ($this->isPropertyMethod($method))
+						$properties[substr($methodName, 3)] = $method;
+					else if ($this->isEventMethod($method))
 					{
-						$methodName[0]='O';
-						$events[$methodName]=$method;
+						$methodName[0] = 'O';
+						$events[$methodName] = $method;
 					}
 				}
-				if(strncmp($methodName,'__',2)!==0)
-					$methods[$methodName]=$method;
+				if (strncmp($methodName, '__', 2) !== 0)
+					$methods[$methodName] = $method;
 			}
 		}
-		$reserved=array();
+		$reserved = array();
 		ksort($properties);
-		foreach($properties as $name=>$method)
+		foreach ($properties as $name=>$method)
 		{
-			$this->_properties[$name]=array(
+			$this->_properties[$name] = array(
 				'type'=>$this->determinePropertyType($method),
-				'readonly'=>!$class->hasMethod('set'.$name),
+				'readonly'=>!$class->hasMethod('set' . $name),
 				'protected'=>$method->isProtected(),
 				'class'=>$method->getDeclaringClass()->getName(),
 				'comments'=>$method->getDocComment()
 			);
-			$reserved['get'.strtolower($name)]=1;
-			$reserved['set'.strtolower($name)]=1;
+			$reserved['get' . strtolower($name)] = 1;
+			$reserved['set' . strtolower($name)] = 1;
 		}
 		ksort($events);
-		foreach($events as $name=>$method)
+		foreach ($events as $name=>$method)
 		{
-			$this->_events[$name]=array(
+			$this->_events[$name] = array(
 				'class'=>$method->getDeclaringClass()->getName(),
 				'protected'=>$method->isProtected(),
 				'comments'=>$method->getDocComment()
 			);
-			$reserved[strtolower($name)]=1;
+			$reserved[strtolower($name)] = 1;
 		}
 		ksort($methods);
-		foreach($methods as $name=>$method)
+		foreach ($methods as $name=>$method)
 		{
-			if(!isset($reserved[strtolower($name)]))
-				$this->_methods[$name]=array(
+			if (!isset($reserved[strtolower($name)]))
+				$this->_methods[$name] = array(
 					'class'=>$method->getDeclaringClass()->getName(),
 					'protected'=>$method->isProtected(),
 					'static'=>$method->isStatic(),
@@ -2186,8 +2186,8 @@ 
 	 */
 	protected function determinePropertyType($method)
 	{
-		$comment=$method->getDocComment();
-		if(preg_match('/@return\\s+(.*?)\\s+/',$comment,$matches))
+		$comment = $method->getDocComment();
+		if (preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
 			return $matches[1];
 		else
 			return '{unknown}';
@@ -2345,7 +2345,7 @@ 
 	 * @return boolean|null if the this or the instance is of type class.  When null, no information could be derived and
 	 * the default mechanisms take over.
 	 */
-	public function isinstanceof($class,$instance=null);
+	public function isinstanceof($class, $instance = null);
 }
 
 /**
@@ -2380,7 +2380,7 @@ 
 
 	public function __toString()
 	{
-		return (string)$this->_s;
+		return (string) $this->_s;
 	}
 
 	public function toJavaScriptLiteral()
@@ -2400,7 +2400,7 @@ 
 {
 	public function toJavaScriptLiteral()
 	{
-		return TJavaScript::jsonEncode((string)$this->_s,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return TJavaScript::jsonEncode((string) $this->_s, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 }
 

Braces +341 added lines, -278 removed lines

@@ -327,13 +327,15 @@ 
 	 * through each parent to the top most class, TComponent.
 	 */
 	public function __construct() {
-		if($this->getAutoGlobalListen())
-			$this->listen();
+		if($this->getAutoGlobalListen()) {
+					$this->listen();
+		}
 
 		$classes=array_reverse($this->getClassHierarchy(true));
 		foreach($classes as $class) {
-			if(isset(self::$_um[$class]))
-				$this->attachBehaviors(self::$_um[$class]);
+			if(isset(self::$_um[$class])) {
+							$this->attachBehaviors(self::$_um[$class]);
+			}
 		}
 	}
 
@@ -363,8 +365,9 @@ 
 	 * called must be explicitly called.
 	 */
 	public function __destruct() {
-		if($this->_listeningenabled)
-			$this->unlisten();
+		if($this->_listeningenabled) {
+					$this->unlisten();
+		}
 	}
 
 
@@ -388,8 +391,9 @@ 
 		$class=get_class($this);
 		$classes=array($class);
 		while($class=get_parent_class($class)){array_unshift($classes,$class);}
-		if($lowercase)
-			return array_map('strtolower',$classes);
+		if($lowercase) {
+					return array_map('strtolower',$classes);
+		}
 		return $classes;
 	}
 
@@ -409,13 +413,15 @@ 
 	 * @return numeric the number of global events that were registered to the global event registry
 	 */
 	public function listen() {
-		if($this->_listeningenabled)
-			return;
+		if($this->_listeningenabled) {
+					return;
+		}
 
 		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
 
-		foreach($fx as $func)
-			$this->attachEventHandler($func,array($this,$func));
+		foreach($fx as $func) {
+					$this->attachEventHandler($func,array($this,$func));
+		}
 
 		if(is_a($this,'IDynamicMethods')) {
 			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
@@ -443,13 +449,15 @@ 
 	 * @return numeric the number of global events that were unregistered from the global event registry
 	 */
 	public function unlisten() {
-		if(!$this->_listeningenabled)
-			return;
+		if(!$this->_listeningenabled) {
+					return;
+		}
 
 		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
 
-		foreach($fx as $func)
-			$this->detachEventHandler($func,array($this,$func));
+		foreach($fx as $func) {
+					$this->detachEventHandler($func,array($this,$func));
+		}
 
 		if(is_a($this,'IDynamicMethods')) {
 			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
@@ -505,14 +513,16 @@ 
 			$jsmethod=$getset.'js'.$propname;
 			if(method_exists($this,$jsmethod))
 			{
-				if(count($args)>0)
-					if($args[0]&&!($args[0] instanceof TJavaScriptString))
+				if(count($args)>0) {
+									if($args[0]&&!($args[0] instanceof TJavaScriptString))
 						$args[0]=new TJavaScriptString($args[0]);
+				}
 				return call_user_func_array(array($this,$jsmethod),$args);
 			}
 
-			if (($getset=='set')&&method_exists($this,'getjs'.$propname))
-				throw new TInvalidOperationException('component_property_readonly',get_class($this),$method);
+			if (($getset=='set')&&method_exists($this,'getjs'.$propname)) {
+							throw new TInvalidOperationException('component_property_readonly',get_class($this),$method);
+			}
 		}
 
 		if($this->_m!==null&&$this->_behaviorsenabled)
@@ -525,23 +535,25 @@ 
 					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&(method_exists($behavior,$method)||($behavior instanceof IDynamicMethods)))
 					{
 						$behavior_args=$args;
-						if($behavior instanceof IClassBehavior)
-							array_unshift($behavior_args,$this);
+						if($behavior instanceof IClassBehavior) {
+													array_unshift($behavior_args,$this);
+						}
 						$callchain->addCall(array($behavior,$method),$behavior_args);
 					}
 
 				}
-				if($callchain->getCount()>0)
-					return call_user_func_array(array($callchain,'call'),$args);
-			}
-			else
+				if($callchain->getCount()>0) {
+									return call_user_func_array(array($callchain,'call'),$args);
+				}
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
 					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&method_exists($behavior,$method))
 					{
-						if($behavior instanceof IClassBehavior)
-							array_unshift($args,$this);
+						if($behavior instanceof IClassBehavior) {
+													array_unshift($args,$this);
+						}
 						return call_user_func_array(array($behavior,$method),$args);
 					}
 				}
@@ -550,8 +562,9 @@ 
 
 		if(strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
 		{
-			if($this instanceof IDynamicMethods)
-				return $this->__dycall($method,$args);
+			if($this instanceof IDynamicMethods) {
+							return $this->__dycall($method,$args);
+			}
 			return isset($args[0])?$args[0]:null;
 		}
 
@@ -588,40 +601,39 @@ 
 		{
 			// getting a property
 			return $this->$getter();
-		}
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		} else if(method_exists($this,$jsgetter='getjs'.$name))
 		{
 			// getting a javascript property
 			return (string)$this->$jsgetter();
-		}
-		else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
+		} else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
 		{
 			// getting an event (handler list)
 			$name=strtolower($name);
-			if(!isset($this->_e[$name]))
-				$this->_e[$name]=new TPriorityList;
+			if(!isset($this->_e[$name])) {
+							$this->_e[$name]=new TPriorityList;
+			}
 			return $this->_e[$name];
-		}
-		else if(strncasecmp($name,'fx',2)===0)
+		} else if(strncasecmp($name,'fx',2)===0)
 		{
 			// getting a global event (handler list)
 			$name=strtolower($name);
-			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name]=new TPriorityList;
+			if(!isset(self::$_ue[$name])) {
+							self::$_ue[$name]=new TPriorityList;
+			}
 			return self::$_ue[$name];
-		}
-		else if($this->_behaviorsenabled)
+		} else if($this->_behaviorsenabled)
 		{
 			// getting a behavior property/event (handler list)
-			if(isset($this->_m[$name]))
-				return $this->_m[$name];
-			else if($this->_m!==null)
+			if(isset($this->_m[$name])) {
+							return $this->_m[$name];
+			} else if($this->_m!==null)
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
 					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-						(property_exists($behavior,$name)||$behavior->canGetProperty($name)||$behavior->hasEvent($name)))
-						return $behavior->$name;
+						(property_exists($behavior,$name)||$behavior->canGetProperty($name)||$behavior->hasEvent($name))) {
+											return $behavior->$name;
+					}
 				}
 			}
 		}
@@ -647,21 +659,20 @@ 
 	{
 		if(method_exists($this,$setter='set'.$name))
 		{
-			if(strncasecmp($name,'js',2)===0&&$value&&!($value instanceof TJavaScriptLiteral))
-				$value = new TJavaScriptLiteral($value);
+			if(strncasecmp($name,'js',2)===0&&$value&&!($value instanceof TJavaScriptLiteral)) {
+							$value = new TJavaScriptLiteral($value);
+			}
 			return $this->$setter($value);
-		}
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		} else if(method_exists($this,$jssetter='setjs'.$name))
 		{
-			if($value&&!($value instanceof TJavaScriptString))
-				$value=new TJavaScriptString($value);
+			if($value&&!($value instanceof TJavaScriptString)) {
+							$value=new TJavaScriptString($value);
+			}
 			return $this->$jssetter($value);
-		}
-		else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
+		} else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
 		{
 			return $this->attachEventHandler($name,$value);
-		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		} else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
 		{
 			$sets=0;
 			foreach($this->_m->toArray() as $behavior)
@@ -672,15 +683,16 @@ 
 					$sets++;
 				}
 			}
-			if($sets)return $value;
+			if($sets) {
+				return $value;
+			}
 
 		}
 
 		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
 		{
 			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
-		}
-		else
+		} else
 		{
 			throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
 		}
@@ -700,33 +712,33 @@ 
 	 */
 	public function __isset($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
-			return $this->$getter()!==null;
-		else if(method_exists($this,$jsgetter='getjs'.$name))
-			return $this->$jsgetter()!==null;
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		if(method_exists($this,$getter='get'.$name)) {
+					return $this->$getter()!==null;
+		} else if(method_exists($this,$jsgetter='getjs'.$name)) {
+					return $this->$jsgetter()!==null;
+		} else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
 		{
 			$name=strtolower($name);
 			return isset($this->_e[$name])&&$this->_e[$name]->getCount();
-		}
-		else if(strncasecmp($name,'fx',2)===0)
+		} else if(strncasecmp($name,'fx',2)===0)
 		{
 			$name=strtolower($name);
 			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount();
-		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		} else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
-				return true;
+			if(isset($this->_m[$name])) {
+							return true;
+			}
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled()))
-					return isset($behavior->$name);
+				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())) {
+									return isset($behavior->$name);
+				}
 			}
 
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -741,19 +753,19 @@ 
 	 */
 	public function __unset($name)
 	{
-		if(method_exists($this,$setter='set'.$name))
-			$this->$setter(null);
-		else if(method_exists($this,$jssetter='setjs'.$name))
-			$this->$jssetter(null);
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
-			$this->_e[strtolower($name)]->clear();
-		else if(strncasecmp($name,'fx',2)===0)
-			$this->getEventHandlers($name)->remove(array($this, $name));
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		if(method_exists($this,$setter='set'.$name)) {
+					$this->$setter(null);
+		} else if(method_exists($this,$jssetter='setjs'.$name)) {
+					$this->$jssetter(null);
+		} else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name)) {
+					$this->_e[strtolower($name)]->clear();
+		} else if(strncasecmp($name,'fx',2)===0) {
+					$this->getEventHandlers($name)->remove(array($this, $name));
+		} else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
-				$this->detachBehavior($name);
-			else {
+			if(isset($this->_m[$name])) {
+							$this->detachBehavior($name);
+			} else {
 				$unset=0;
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -762,11 +774,13 @@ 
 						$unset++;
 					}
 				}
-				if(!$unset&&method_exists($this,'get'.$name))
-					throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+				if(!$unset&&method_exists($this,'get'.$name)) {
+									throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+				}
 			}
-		} else if(method_exists($this,'get'.$name))
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+		} else if(method_exists($this,'get'.$name)) {
+					throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+		}
 	}
 
 	/**
@@ -792,14 +806,15 @@ 
 	 */
 	public function canGetProperty($name)
 	{
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
-			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name)) {
+					return true;
+		} else if($this->_m!==null&&$this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canGetProperty($name))
-					return true;
+				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canGetProperty($name)) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -816,14 +831,15 @@ 
 	 */
 	public function canSetProperty($name)
 	{
-		if(method_exists($this,'set'.$name)||method_exists($this,'setjs'.$name))
-			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		if(method_exists($this,'set'.$name)||method_exists($this,'setjs'.$name)) {
+					return true;
+		} else if($this->_m!==null&&$this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canSetProperty($name))
-					return true;
+				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canSetProperty($name)) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -842,8 +858,9 @@ 
 	public function getSubProperty($path)
 	{
 		$object=$this;
-		foreach(explode('.',$path) as $property)
-			$object=$object->$property;
+		foreach(explode('.',$path) as $property) {
+					$object=$object->$property;
+		}
 		return $object;
 	}
 
@@ -860,9 +877,9 @@ 
 	public function setSubProperty($path,$value)
 	{
 		$object=$this;
-		if(($pos=strrpos($path,'.'))===false)
-			$property=$path;
-		else
+		if(($pos=strrpos($path,'.'))===false) {
+					$property=$path;
+		} else
 		{
 			$object=$this->getSubProperty(substr($path,0,$pos));
 			$property=substr($path,$pos+1);
@@ -884,15 +901,15 @@ 
 	 */
 	public function hasEvent($name)
 	{
-		if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0||strncasecmp($name,'dy',2)===0)
-			return true;
-
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0||strncasecmp($name,'dy',2)===0) {
+					return true;
+		} else if($this->_m!==null&&$this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
-					return true;
+				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name)) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -908,17 +925,18 @@ 
 	public function hasEventHandler($name)
 	{
 		$name=strtolower($name);
-		if(strncasecmp($name,'fx',2)===0)
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount()>0;
-		else
+		if(strncasecmp($name,'fx',2)===0) {
+					return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount()>0;
+		} else
 		{
-			if(isset($this->_e[$name])&&$this->_e[$name]->getCount()>0)
-				return true;
-			else if($this->_m!==null&&$this->_behaviorsenabled) {
+			if(isset($this->_e[$name])&&$this->_e[$name]->getCount()>0) {
+							return true;
+			} else if($this->_m!==null&&$this->_behaviorsenabled) {
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEventHandler($name))
-						return true;
+					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEventHandler($name)) {
+											return true;
+					}
 				}
 			}
 		}
@@ -936,23 +954,24 @@ 
 		if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
 		{
 			$name=strtolower($name);
-			if(!isset($this->_e[$name]))
-				$this->_e[$name]=new TPriorityList;
+			if(!isset($this->_e[$name])) {
+							$this->_e[$name]=new TPriorityList;
+			}
 			return $this->_e[$name];
-		}
-		else if(strncasecmp($name,'fx',2)===0)
+		} else if(strncasecmp($name,'fx',2)===0)
 		{
 			$name=strtolower($name);
-			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name]=new TPriorityList;
+			if(!isset(self::$_ue[$name])) {
+							self::$_ue[$name]=new TPriorityList;
+			}
 			return self::$_ue[$name];
-		}
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		} else if($this->_m!==null&&$this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
-					return $behavior->getEventHandlers($name);
+				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name)) {
+									return $behavior->getEventHandlers($name);
+				}
 			}
 		}
 		throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
@@ -1026,8 +1045,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler,$priority);
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 			}
 		}
@@ -1115,8 +1133,9 @@ 
 			$responsetype=null;
 		}
 
-		if($responsetype===null)
-			$responsetype=TEventResults::EVENT_RESULT_FILTER;
+		if($responsetype===null) {
+					$responsetype=TEventResults::EVENT_RESULT_FILTER;
+		}
 
 		$name=strtolower($name);
 		$responses=array();
@@ -1135,8 +1154,9 @@ 
 			$response=null;
 			foreach($handlerArray as $handler)
 			{
-				if($this->dyIntraRaiseEventTestHandler($handler,$sender,$param,$name)===false)
-					continue;
+				if($this->dyIntraRaiseEventTestHandler($handler,$sender,$param,$name)===false) {
+									continue;
+				}
 
 				if(is_string($handler))
 				{
@@ -1146,23 +1166,23 @@ 
 						$method=substr($handler,$pos+1);
 						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
 						{
-							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
-							else
-								$response=$object->$method($sender,$param,$name);
+							if($method=='__dycall') {
+															$response=$object->__dycall($name,array($sender,$param,$name));
+							} else {
+															$response=$object->$method($sender,$param,$name);
+							}
+						} else {
+													throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
 						}
-						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
+					} else {
+											$response=call_user_func($handler,$sender,$param,$name);
 					}
-					else
-						$response=call_user_func($handler,$sender,$param,$name);
-				}
-				else if(is_callable($handler,true))
+				} else if(is_callable($handler,true))
 				{
 					list($object,$method)=$handler;
-					if(is_string($object))
-						$response=call_user_func($handler,$sender,$param,$name);
-					else
+					if(is_string($object)) {
+											$response=call_user_func($handler,$sender,$param,$name);
+					} else
 					{
 						if(($pos=strrpos($method,'.'))!==false)
 						{
@@ -1171,38 +1191,43 @@ 
 						}
 						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
 						{
-							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
-							else
-								$response=$object->$method($sender,$param,$name);
+							if($method=='__dycall') {
+															$response=$object->__dycall($name,array($sender,$param,$name));
+							} else {
+															$response=$object->$method($sender,$param,$name);
+							}
+						} else {
+													throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
 						}
-						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
 					}
+				} else {
+									throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
 				}
-				else
-					throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
 
 				$this->dyIntraRaiseEventPostHandler($name,$sender,$param,$handler,$response);
 
-				if($postfunction)
-					$response=call_user_func_array($postfunction,array($sender,$param,$this,$response));
+				if($postfunction) {
+									$response=call_user_func_array($postfunction,array($sender,$param,$this,$response));
+				}
 
-				if($responsetype&TEventResults::EVENT_RESULT_ALL)
-					$responses[]=array('sender'=>$sender,'param'=>$param,'response'=>$response);
-				else
-					$responses[]=$response;
+				if($responsetype&TEventResults::EVENT_RESULT_ALL) {
+									$responses[]=array('sender'=>$sender,'param'=>$param,'response'=>$response);
+				} else {
+									$responses[]=$response;
+				}
 
-				if($response!==null&&($responsetype&TEventResults::EVENT_RESULT_FEED_FORWARD))
-					$param=$response;
+				if($response!==null&&($responsetype&TEventResults::EVENT_RESULT_FEED_FORWARD)) {
+									$param=$response;
+				}
 
 			}
+		} else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name)) {
+					throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
 		}
-		else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name))
-			throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
 
-		if($responsetype&TEventResults::EVENT_RESULT_FILTER)
-			$responses=array_filter($responses);
+		if($responsetype&TEventResults::EVENT_RESULT_FILTER) {
+					$responses=array_filter($responses);
+		}
 
 		$responses=$this->dyPostRaiseEvent($responses,$name,$sender,$param,$responsetype,$postfunction);
 
@@ -1231,11 +1256,11 @@ 
 		$expression=$this->dyEvaluateExpressionFilter($expression);
 		try
 		{
-			if(eval("\$result=$expression;")===false)
-				throw new Exception('');
+			if(eval("\$result=$expression;")===false) {
+							throw new Exception('');
+			}
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());
 		}
@@ -1264,13 +1289,13 @@ 
 		try
 		{
 			ob_start();
-			if(eval($statements)===false)
-				throw new Exception('');
+			if(eval($statements)===false) {
+							throw new Exception('');
+			}
 			$content=ob_get_contents();
 			ob_end_clean();
 			return $content;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());
 		}
@@ -1333,8 +1358,9 @@ 
 	 * @since 3.2.3
 	 */
 	public function fxAttachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->attachBehavior($param->getName(),$param->getBehavior(),$param->getPriority());
+		if(in_array($param->getClass(),$this->getClassHierarchy(true))) {
+					return $this->attachBehavior($param->getName(),$param->getBehavior(),$param->getPriority());
+		}
 	}
 
 
@@ -1347,8 +1373,9 @@ 
 	 * @since 3.2.3
 	 */
 	public function fxDetachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->detachBehavior($param->getName(),$param->getPriority());
+		if(in_array($param->getClass(),$this->getClassHierarchy(true))) {
+					return $this->detachBehavior($param->getName(),$param->getPriority());
+		}
 	}
 
 
@@ -1371,20 +1398,26 @@ 
 	 * @since 3.2.3
 	 */
 	public static function attachClassBehavior($name,$behavior,$class=null,$priority=null) {
-		if(!$class&&function_exists('get_called_class'))
-			$class=get_called_class();
-		if(!$class)
-			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		if(!$class&&function_exists('get_called_class')) {
+					$class=get_called_class();
+		}
+		if(!$class) {
+					throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		}
 
-		if(!is_string($name))
-			$name=get_class($name);
+		if(!is_string($name)) {
+					$name=get_class($name);
+		}
 		$class=strtolower($class);
-		if($class==='tcomponent')
-			throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
-		if(empty(self::$_um[$class]))
-			self::$_um[$class]=array();
-		if(isset(self::$_um[$class][$name]))
-			throw new TInvalidOperationException('component_class_behavior_defined',$class,$name);
+		if($class==='tcomponent') {
+					throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
+		}
+		if(empty(self::$_um[$class])) {
+					self::$_um[$class]=array();
+		}
+		if(isset(self::$_um[$class][$name])) {
+					throw new TInvalidOperationException('component_class_behavior_defined',$class,$name);
+		}
 		$param=new TClassBehaviorEventParameter($class,$name,$behavior,$priority);
 		self::$_um[$class]=array($name=>$param)+self::$_um[$class];
 		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
@@ -1405,16 +1438,20 @@ 
 	 * @since 3.2.3
 	 */
 	public static function detachClassBehavior($name,$class=null,$priority=false) {
-		if(!$class&&function_exists('get_called_class'))
-			$class=get_called_class();
-		if(!$class)
-			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		if(!$class&&function_exists('get_called_class')) {
+					$class=get_called_class();
+		}
+		if(!$class) {
+					throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		}
 
 		$class=strtolower($class);
-		if(!is_string($name))
-			$name=get_class($name);
-		if(empty(self::$_um[$class])||!isset(self::$_um[$class][$name]))
-			return false;
+		if(!is_string($name)) {
+					$name=get_class($name);
+		}
+		if(empty(self::$_um[$class])||!isset(self::$_um[$class][$name])) {
+					return false;
+		}
 		$param=self::$_um[$class][$name];
 		$behavior=$param->getBehavior();
 		unset(self::$_um[$class][$name]);
@@ -1455,18 +1492,22 @@ 
 	 */
 	public function isa($class)
 	{
-		if($this instanceof $class)
-			return true;
-		if($this->_m!==null&&$this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
+		if($this instanceof $class) {
+					return true;
+		}
+		if($this->_m!==null&&$this->_behaviorsenabled) {
+					foreach($this->_m->toArray() as $behavior){
 				if(($behavior instanceof IBehavior)&&!$behavior->getEnabled())
 					continue;
+		}
 
 				$check = null;
-				if(($behavior->isa('IInstanceCheck'))&&$check=$behavior->isinstanceof($class,$this))
-					return true;
-				if($check===null&&($behavior->isa($class)))
-					return true;
+				if(($behavior->isa('IInstanceCheck'))&&$check=$behavior->isinstanceof($class,$this)) {
+									return true;
+				}
+				if($check===null&&($behavior->isa($class))) {
+									return true;
+				}
 			}
 		return false;
 	}
@@ -1481,11 +1522,13 @@ 
 	 */
 	public function attachBehaviors($behaviors)
 	{
-		foreach($behaviors as $name=>$behavior)
-			if($behavior instanceof TClassBehaviorEventParameter)
+		foreach($behaviors as $name=>$behavior) {
+					if($behavior instanceof TClassBehaviorEventParameter)
 				$this->attachBehavior($behavior->getName(),$behavior->getBehavior(),$behavior->getPriority());
-			else
-				$this->attachBehavior($name,$behavior);
+		}
+			else {
+							$this->attachBehavior($name,$behavior);
+			}
 	}
 
 	/**
@@ -1500,11 +1543,13 @@ 
 	{
 		if($this->_m!==null)
 		{
-			foreach($behaviors as $name=>$behavior)
-				if($behavior instanceof TClassBehaviorEventParameter)
+			foreach($behaviors as $name=>$behavior) {
+							if($behavior instanceof TClassBehaviorEventParameter)
 					$this->detachBehavior($behavior->getName(),$behavior->getPriority());
-				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+			}
+				else {
+									$this->detachBehavior(is_string($behavior)?$behavior:$name);
+				}
 		}
 	}
 
@@ -1516,8 +1561,9 @@ 
 	{
 		if($this->_m!==null)
 		{
-			foreach($this->_m->toArray() as $name=>$behavior)
-				$this->detachBehavior($name);
+			foreach($this->_m->toArray() as $name=>$behavior) {
+							$this->detachBehavior($name);
+			}
 			$this->_m=null;
 		}
 	}
@@ -1544,14 +1590,18 @@ 
 	 */
 	public function attachBehavior($name,$behavior,$priority=null)
 	{
-		if(is_string($behavior))
-			$behavior=Prado::createComponent($behavior);
-		if(!($behavior instanceof IBaseBehavior))
-			throw new TInvalidDataTypeException('component_not_a_behavior',get_class($behavior));
-		if($behavior instanceof IBehavior)
-			$behavior->setEnabled(true);
-		if($this->_m===null)
-			$this->_m=new TPriorityMap;
+		if(is_string($behavior)) {
+					$behavior=Prado::createComponent($behavior);
+		}
+		if(!($behavior instanceof IBaseBehavior)) {
+					throw new TInvalidDataTypeException('component_not_a_behavior',get_class($behavior));
+		}
+		if($behavior instanceof IBehavior) {
+					$behavior->setEnabled(true);
+		}
+		if($this->_m===null) {
+					$this->_m=new TPriorityMap;
+		}
 		$behavior->attach($this);
 		$this->dyAttachBehavior($name,$behavior);
 		$this->_m->add($name,$behavior,$priority);
@@ -1719,14 +1769,18 @@ 
 	 */
 	protected function __getZappableSleepProps(&$exprops)
 	{
-		if($this->_listeningenabled===false)
-			$exprops[] = "\0TComponent\0_listeningenabled";
-		if($this->_behaviorsenabled===true)
-			$exprops[] = "\0TComponent\0_behaviorsenabled";
-		if ($this->_e===array())
-			$exprops[] = "\0TComponent\0_e";
-		if ($this->_m===null)
-			$exprops[] = "\0TComponent\0_m";
+		if($this->_listeningenabled===false) {
+					$exprops[] = "\0TComponent\0_listeningenabled";
+		}
+		if($this->_behaviorsenabled===true) {
+					$exprops[] = "\0TComponent\0_behaviorsenabled";
+		}
+		if ($this->_e===array()) {
+					$exprops[] = "\0TComponent\0_e";
+		}
+		if ($this->_m===null) {
+					$exprops[] = "\0TComponent\0_m";
+		}
 	}
 }
 
@@ -1910,10 +1964,11 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value,'true')==0 || $value!=0;
-		else
-			return (boolean)$value;
+		if (is_string($value)) {
+					return strcasecmp($value,'true')==0 || $value!=0;
+		} else {
+					return (boolean)$value;
+		}
 	}
 
 	/**
@@ -1925,12 +1980,14 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
-			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
-		else
-			return (string)$value;
+		if (TJavaScript::isJsLiteral($value)) {
+					return $value;
+		}
+		if (is_bool($value)) {
+					return $value?'true':'false';
+		} else {
+					return (string)$value;
+		}
 	}
 
 	/**
@@ -1972,12 +2029,12 @@ 
 			{
 				eval('$array=array'.$value.';');
 				return $array;
+			} else {
+							return $len>0?array($value):array();
 			}
-			else
-				return $len>0?array($value):array();
+		} else {
+					return (array)$value;
 		}
-		else
-			return (array)$value;
 	}
 
 	/**
@@ -2011,24 +2068,26 @@ 
 		static $types=array();
 		if(func_num_args()===2 && is_string($enums))
 		{
-			if(!isset($types[$enums]))
-				$types[$enums]=new ReflectionClass($enums);
-			if($types[$enums]->hasConstant($value))
-				return $value;
-			else
-				throw new TInvalidDataValueException(
+			if(!isset($types[$enums])) {
+							$types[$enums]=new ReflectionClass($enums);
+			}
+			if($types[$enums]->hasConstant($value)) {
+							return $value;
+			} else {
+							throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid',$value,
 						implode(' | ',$types[$enums]->getConstants()));
-		}
-		else if(!is_array($enums))
+			}
+		} else if(!is_array($enums))
 		{
 			$enums=func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value,$enums,true))
-			return $value;
-		else
-			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid',$value,implode(' | ',$enums));
+		if(in_array($value,$enums,true)) {
+					return $value;
+		} else {
+					throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid',$value,implode(' | ',$enums));
+		}
 	}
 
 	/**
@@ -2091,12 +2150,13 @@ 
 	 */
 	public function __construct($component)
 	{
-		if(is_string($component) && class_exists($component,false))
-			$this->_className=$component;
-		else if(is_object($component))
-			$this->_className=get_class($component);
-		else
-			throw new TInvalidDataTypeException('componentreflection_class_invalid');
+		if(is_string($component) && class_exists($component,false)) {
+					$this->_className=$component;
+		} else if(is_object($component)) {
+					$this->_className=get_class($component);
+		} else {
+					throw new TInvalidDataTypeException('componentreflection_class_invalid');
+		}
 		$this->reflect();
 	}
 
@@ -2129,16 +2189,17 @@ 
 				$methodName=$method->getName();
 				if(!$method->isStatic() && $isComponent)
 				{
-					if($this->isPropertyMethod($method))
-						$properties[substr($methodName,3)]=$method;
-					else if($this->isEventMethod($method))
+					if($this->isPropertyMethod($method)) {
+											$properties[substr($methodName,3)]=$method;
+					} else if($this->isEventMethod($method))
 					{
 						$methodName[0]='O';
 						$events[$methodName]=$method;
 					}
 				}
-				if(strncmp($methodName,'__',2)!==0)
-					$methods[$methodName]=$method;
+				if(strncmp($methodName,'__',2)!==0) {
+									$methods[$methodName]=$method;
+				}
 			}
 		}
 		$reserved=array();
@@ -2168,13 +2229,14 @@ 
 		ksort($methods);
 		foreach($methods as $name=>$method)
 		{
-			if(!isset($reserved[strtolower($name)]))
-				$this->_methods[$name]=array(
+			if(!isset($reserved[strtolower($name)])) {
+							$this->_methods[$name]=array(
 					'class'=>$method->getDeclaringClass()->getName(),
 					'protected'=>$method->isProtected(),
 					'static'=>$method->isStatic(),
 					'comments'=>$method->getDocComment()
 				);
+			}
 		}
 	}
 
@@ -2187,10 +2249,11 @@ 
 	protected function determinePropertyType($method)
 	{
 		$comment=$method->getDocComment();
-		if(preg_match('/@return\\s+(.*?)\\s+/',$comment,$matches))
-			return $matches[1];
-		else
-			return '{unknown}';
+		if(preg_match('/@return\\s+(.*?)\\s+/',$comment,$matches)) {
+					return $matches[1];
+		} else {
+					return '{unknown}';
+		}
 	}
 
 	/**

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * TComponent, TPropertyValue classes
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- *
- * Global Events, intra-object events, Class behaviors, expanded behaviors
- * @author Brad Anderson <javalizard@mac.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
- */
+	 * TComponent, TPropertyValue classes
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 *
+	 * Global Events, intra-object events, Class behaviors, expanded behaviors
+	 * @author Brad Anderson <javalizard@mac.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
+	 */
 
 /**
  * TComponent class

framework/Util/TDateTimeStamp.php

Doc Comments +5 added lines, -1 removed lines

@@ -82,6 +82,9 @@ 
 		return $y;
 	}
 
+	/**
+	 * @param integer $y
+	 */
 	public function get4DigitYear($y)
 	{
 		return $this->digitCheck($y);
@@ -172,6 +175,7 @@ 
 	}
 
 	/**
+	 * @param string $fmt
 	 * @return string formatted date based on timestamp $d
 	 */
 	function formatDate($fmt,$ts=false,$is_gmt=false)
@@ -185,7 +189,7 @@ 
 	}
 
 	/**
-	 * @return integer|float a timestamp given a local time
+	 * @return integer a timestamp given a local time
      */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{

Indentation +8 added lines, -9 removed lines

@@ -1,13 +1,12 @@ 
 <?php
 /**
- * TDateTimeStamp class file.
-
- * @author Fabio Bas ctrlaltca[AT]gmail[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.Util
- */
+	 * TDateTimeStamp class file.
+	 * @author Fabio Bas ctrlaltca[AT]gmail[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.Util
+	 */
 
 /**
  * TDateTimeStamp Class
@@ -186,7 +185,7 @@ 
 
 	/**
 	 * @return integer|float a timestamp given a local time
-     */
+	 */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();

Spacing +21 added lines, -21 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal = array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf = array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -62,11 +62,11 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
+		if ($y < 100) {
 			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+			$century = (integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
+			if ($yr % 100 > 50) {
 				$c1 = $century + 1;
 				$c0 = $century;
 			} else {
@@ -76,8 +76,8 @@ 
 			$c1 *= 100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if (($y + $c1) < $yr + 30) $y = $y + $c1;
+			else $y = $y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -90,10 +90,10 @@ 
 	/**
 	 * @return integer get local time zone offset from GMT
 	 */
-	public function getGMTDiff($ts=false)
+	public function getGMTDiff($ts = false)
 	{
 		$dt = new DateTime();
-		if($ts)
+		if ($ts)
 			$dt->setTimeStamp($ts);
 		else
 		 	$dt->setDate(1970, 1, 2);
@@ -104,7 +104,7 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function parseDate($txt=false)
+	function parseDate($txt = false)
 	{
 		if ($txt === false) return getdate();
 
@@ -128,7 +128,7 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d = false, $fast = false)
 	{
 		if ($d === false) return getdate();
 
@@ -153,12 +153,12 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
 		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+			$marr = & self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr = & self::$_month_normal;
 
 		if ($m > 12 || $m < 1) return false;
 
@@ -174,10 +174,10 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts = false, $is_gmt = false)
 	{
 		$dt = new DateTime();
-		if($is_gmt)
+		if ($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
 
@@ -187,14 +187,14 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon = false, $day = false, $year = false, $is_gmt = false)
 	{
 		$dt = new DateTime();
-		if($is_gmt)
+		if ($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
-		$dt->setDate($year!==false ? $year : date('Y'),
-			$mon!==false ? $mon : date('m'),
-			$day!==false ? $day : date('d'));
+		$dt->setDate($year !== false ? $year : date('Y'),
+			$mon !== false ? $mon : date('m'),
+			$day !== false ? $day : date('d'));
 		$dt->setTime($hr, $min, $sec);
 		return (int) $dt->format('U');
 	}

Braces +39 added lines, -20 removed lines

@@ -76,8 +76,11 @@ 
 			$c1 *= 100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if (($y + $c1) < $yr+30) {
+				$y = $y + $c1;
+			} else {
+				$y = $y + $c0*100;
+			}
 		}
 		return $y;
 	}
@@ -93,10 +96,11 @@ 
 	public function getGMTDiff($ts=false)
 	{
 		$dt = new DateTime();
-		if($ts)
-			$dt->setTimeStamp($ts);
-		else
-		 	$dt->setDate(1970, 1, 2);
+		if($ts) {
+					$dt->setTimeStamp($ts);
+		} else {
+				 	$dt->setDate(1970, 1, 2);
+		}
 
 		return (int) $dt->format('Z');
 	}
@@ -106,7 +110,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if ($txt === false) {
+			return getdate();
+		}
 
 		$dt = new DateTime($txt);
 
@@ -130,7 +136,9 @@ 
 	 */
 	function getDate($d=false,$fast=false)
 	{
-		if ($d === false) return getdate();
+		if ($d === false) {
+			return getdate();
+		}
 
 		$dt = new DateTime();
 		$dt->setTimestamp($d);
@@ -155,18 +163,27 @@ 
 	 */
 	public function isValidDate($y,$m,$d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
-		else
-			$marr =& self::$_month_normal;
+		if ($this->isLeapYear($y)) {
+					$marr =& self::$_month_leaf;
+		} else {
+					$marr =& self::$_month_normal;
+		}
 
-		if ($m > 12 || $m < 1) return false;
+		if ($m > 12 || $m < 1) {
+			return false;
+		}
 
-		if ($d > 31 || $d < 1) return false;
+		if ($d > 31 || $d < 1) {
+			return false;
+		}
 
-		if ($marr[$m] < $d) return false;
+		if ($marr[$m] < $d) {
+			return false;
+		}
 
-		if ($y < 1000 && $y > 3000) return false;
+		if ($y < 1000 && $y > 3000) {
+			return false;
+		}
 
 		return true;
 	}
@@ -177,8 +194,9 @@ 
 	function formatDate($fmt,$ts=false,$is_gmt=false)
 	{
 		$dt = new DateTime();
-		if($is_gmt)
-			$dt->setTimeZone(new DateTimeZone('UTC'));
+		if($is_gmt) {
+					$dt->setTimeZone(new DateTimeZone('UTC'));
+		}
 		$dt->setTimestamp($ts);
 
 		return $dt->format($fmt);
@@ -190,8 +208,9 @@ 
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();
-		if($is_gmt)
-			$dt->setTimeZone(new DateTimeZone('UTC'));
+		if($is_gmt) {
+					$dt->setTimeZone(new DateTimeZone('UTC'));
+		}
 		$dt->setDate($year!==false ? $year : date('Y'),
 			$mon!==false ? $mon : date('m'),
 			$day!==false ? $day : date('d'));

framework/Util/TLogger.php

Doc Comments +1 added lines

@@ -98,6 +98,7 @@
 	 * @param integer level filter
 	 * @param array category filter
 	 * @param array control filter
+	 * @param integer $levels
 	 * @return array list of messages. Each array elements represents one message
 	 * with the following structure:
 	 * array(

Spacing +49 added lines, -49 removed lines

@@ -25,17 +25,17 @@ 
 	/**
 	 * Log levels.
 	 */
-	const DEBUG=0x01;
-	const INFO=0x02;
-	const NOTICE=0x04;
-	const WARNING=0x08;
-	const ERROR=0x10;
-	const ALERT=0x20;
-	const FATAL=0x40;
+	const DEBUG = 0x01;
+	const INFO = 0x02;
+	const NOTICE = 0x04;
+	const WARNING = 0x08;
+	const ERROR = 0x10;
+	const ALERT = 0x20;
+	const FATAL = 0x40;
 	/**
 	 * @var array log messages
 	 */
-	private $_logs=array();
+	private $_logs = array();
 	/**
 	 * @var integer log levels (bits) to be filtered
 	 */
@@ -63,16 +63,16 @@ 
 	 * @param string category of the message
 	 * @param string|TControl control of the message
 	 */
-	public function log($message,$level,$category='Uncategorized', $ctl=null)
+	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
 	{
-		if($ctl) {
-			if($ctl instanceof TControl)
+		if ($ctl) {
+			if ($ctl instanceof TControl)
 				$ctl = $ctl->ClientId;
-			else if(!is_string($ctl))
+			else if (!is_string($ctl))
 				$ctl = null;
 		} else
 			$ctl = null;
-		$this->_logs[]=array($message,$level,$category,microtime(true),memory_get_usage(),$ctl);
+		$this->_logs[] = array($message, $level, $category, microtime(true), memory_get_usage(), $ctl);
 	}
 
 	/**
@@ -108,23 +108,23 @@ 
 	 *   [4] => memory in bytes
 	 *   [5] => control client id
 	 */
-	public function getLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function getLogs($levels = null, $categories = null, $controls = null, $timestamp = null)
 	{
-		$this->_levels=$levels;
-		$this->_categories=$categories;
-		$this->_controls=$controls;
-		$this->_timestamp=$timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
+		$this->_levels = $levels;
+		$this->_categories = $categories;
+		$this->_controls = $controls;
+		$this->_timestamp = $timestamp;
+		if (empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
 			return $this->_logs;
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByLevels')) ));
-		if(!empty($categories))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByCategories')) ));
-		if(!empty($controls))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByControl')) ));
-		if(!is_null($timestamp))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByTimeStamp')) ));
+		if (!empty($levels))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByLevels'))));
+		if (!empty($categories))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByCategories'))));
+		if (!empty($controls))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByControl'))));
+		if (!is_null($timestamp))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByTimeStamp'))));
 		return $logs;
 	}
 
@@ -152,27 +152,27 @@ 
 	 * @param array category filter
 	 * @param array control filter
 	 */
-	public function deleteLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function deleteLogs($levels = null, $categories = null, $controls = null, $timestamp = null)
 	{
-		$this->_levels=$levels;
-		$this->_categories=$categories;
-		$this->_controls=$controls;
-		$this->_timestamp=$timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
+		$this->_levels = $levels;
+		$this->_categories = $categories;
+		$this->_controls = $controls;
+		$this->_timestamp = $timestamp;
+		if (empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
 		{
-			$this->_logs=array();
+			$this->_logs = array();
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter( array_filter($logs,array($this,'filterByLevels')) );
-		if(!empty($categories))
-			$logs = array_filter( array_filter($logs,array($this,'filterByCategories')) );
-		if(!empty($controls))
-			$logs = array_filter( array_filter($logs,array($this,'filterByControl')) );
-		if(!is_null($timestamp))
-			$logs = array_filter( array_filter($logs,array($this,'filterByTimeStamp')) );
-		$this->_logs = array_values( array_diff_key($this->_logs, $logs) );
+		if (!empty($levels))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByLevels')));
+		if (!empty($categories))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByCategories')));
+		if (!empty($controls))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByControl')));
+		if (!is_null($timestamp))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByTimeStamp')));
+		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
 	}
 
 	/**
@@ -181,10 +181,10 @@ 
 	 */
 	private function filterByCategories($value)
 	{
-		foreach($this->_categories as $category)
+		foreach ($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2]===$category || strpos($value[2],$category.'.')===0)
+			if ($value[2] === $category || strpos($value[2], $category . '.') === 0)
 				return $value;
 		}
 		return false;
@@ -197,7 +197,7 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
+		if ($value[1] & $this->_levels)
 			return $value;
 		else
 			return false;
@@ -210,9 +210,9 @@ 
 	private function filterByControl($value)
 	{
 		// element 5 are the control client ids
-		foreach($this->_controls as $control)
+		foreach ($this->_controls as $control)
 		{
-			if($value[5]===$control || strpos($value[5],$control)===0)
+			if ($value[5] === $control || strpos($value[5], $control) === 0)
 				return $value;
 		}
 		return false;
@@ -225,7 +225,7 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
+		if ($value[3] <= $this->_timestamp)
 			return $value;
 		else
 			return false;

Braces +51 added lines, -36 removed lines

@@ -66,12 +66,14 @@ 
 	public function log($message,$level,$category='Uncategorized', $ctl=null)
 	{
 		if($ctl) {
-			if($ctl instanceof TControl)
-				$ctl = $ctl->ClientId;
-			else if(!is_string($ctl))
-				$ctl = null;
-		} else
-			$ctl = null;
+			if($ctl instanceof TControl) {
+							$ctl = $ctl->ClientId;
+			} else if(!is_string($ctl)) {
+							$ctl = null;
+			}
+		} else {
+					$ctl = null;
+		}
 		$this->_logs[]=array($message,$level,$category,microtime(true),memory_get_usage(),$ctl);
 	}
 
@@ -114,17 +116,22 @@ 
 		$this->_categories=$categories;
 		$this->_controls=$controls;
 		$this->_timestamp=$timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
-			return $this->_logs;
+		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp)) {
+					return $this->_logs;
+		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByLevels')) ));
-		if(!empty($categories))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByCategories')) ));
-		if(!empty($controls))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByControl')) ));
-		if(!is_null($timestamp))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByTimeStamp')) ));
+		if(!empty($levels)) {
+					$logs = array_values(array_filter( array_filter($logs,array($this,'filterByLevels')) ));
+		}
+		if(!empty($categories)) {
+					$logs = array_values(array_filter( array_filter($logs,array($this,'filterByCategories')) ));
+		}
+		if(!empty($controls)) {
+					$logs = array_values(array_filter( array_filter($logs,array($this,'filterByControl')) ));
+		}
+		if(!is_null($timestamp)) {
+					$logs = array_values(array_filter( array_filter($logs,array($this,'filterByTimeStamp')) ));
+		}
 		return $logs;
 	}
 
@@ -164,14 +171,18 @@ 
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter( array_filter($logs,array($this,'filterByLevels')) );
-		if(!empty($categories))
-			$logs = array_filter( array_filter($logs,array($this,'filterByCategories')) );
-		if(!empty($controls))
-			$logs = array_filter( array_filter($logs,array($this,'filterByControl')) );
-		if(!is_null($timestamp))
-			$logs = array_filter( array_filter($logs,array($this,'filterByTimeStamp')) );
+		if(!empty($levels)) {
+					$logs = array_filter( array_filter($logs,array($this,'filterByLevels')) );
+		}
+		if(!empty($categories)) {
+					$logs = array_filter( array_filter($logs,array($this,'filterByCategories')) );
+		}
+		if(!empty($controls)) {
+					$logs = array_filter( array_filter($logs,array($this,'filterByControl')) );
+		}
+		if(!is_null($timestamp)) {
+					$logs = array_filter( array_filter($logs,array($this,'filterByTimeStamp')) );
+		}
 		$this->_logs = array_values( array_diff_key($this->_logs, $logs) );
 	}
 
@@ -184,8 +195,9 @@ 
 		foreach($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2]===$category || strpos($value[2],$category.'.')===0)
-				return $value;
+			if($value[2]===$category || strpos($value[2],$category.'.')===0) {
+							return $value;
+			}
 		}
 		return false;
 	}
@@ -197,10 +209,11 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
-			return $value;
-		else
-			return false;
+		if($value[1] & $this->_levels) {
+					return $value;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -212,8 +225,9 @@ 
 		// element 5 are the control client ids
 		foreach($this->_controls as $control)
 		{
-			if($value[5]===$control || strpos($value[5],$control)===0)
-				return $value;
+			if($value[5]===$control || strpos($value[5],$control)===0) {
+							return $value;
+			}
 		}
 		return false;
 	}
@@ -225,10 +239,11 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
-			return $value;
-		else
-			return false;
+		if($value[3] <= $this->_timestamp) {
+					return $value;
+		} else {
+					return false;
+		}
 	}
 }
 

framework/Util/TRpcClient.php

Doc Comments +3 added lines

@@ -105,6 +105,9 @@
 	 * @param string RPC server URL
 	 * @param array payload data
 	 * @param string request mime type
+	 * @param string $serverUrl
+	 * @param string $mimeType
+	 * @return string
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{

Spacing +9 added lines, -9 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public static function create($type, $serverUrl, $isNotification = false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::'.strtoupper($type))) === null)
+		if (($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null)
 			throw new TApplicationException('rpcclient_unsupported_handler');
 
 		return new $_handler($serverUrl, $isNotification);
@@ -108,8 +108,8 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
+		if (($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
+			throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
 
 		return $_response;
 	}
@@ -242,15 +242,15 @@ 
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'application/json');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
+		if ($this->isNotification)
 			return true;
 
 		// decode response
-		if(($_response = json_decode($_response, true)) === null)
+		if (($_response = json_decode($_response, true)) === null)
 			throw new TRpcClientResponseException('Empty response received');
 
 		// handle error response
-		if(!is_null($_response['error']))
+		if (!is_null($_response['error']))
 			throw new TRpcClientResponseException($_response['error']);
 
 		return $_response['result'];
@@ -320,15 +320,15 @@ 
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'text/xml');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
+		if ($this->isNotification)
 			return true;
 
 		// decode response
-		if(($_response = xmlrpc_decode($_response)) === null)
+		if (($_response = xmlrpc_decode($_response)) === null)
 			throw new TRpcClientResponseException('Empty response received');
 
 		// handle error response
-		if(xmlrpc_is_fault($_response))
+		if (xmlrpc_is_fault($_response))
 			throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
 
 		return $_response;

Braces +24 added lines, -16 removed lines

@@ -78,8 +78,9 @@ 
 	 */
 	public static function create($type, $serverUrl, $isNotification = false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::'.strtoupper($type))) === null)
-			throw new TApplicationException('rpcclient_unsupported_handler');
+		if(($_handler = constant('TRpcClientTypesEnumerable::'.strtoupper($type))) === null) {
+					throw new TApplicationException('rpcclient_unsupported_handler');
+		}
 
 		return new $_handler($serverUrl, $isNotification);
 	}
@@ -108,8 +109,9 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
+		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false) {
+					throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
+		}
 
 		return $_response;
 	}
@@ -242,16 +244,19 @@ 
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'application/json');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
-			return true;
+		if($this->isNotification) {
+					return true;
+		}
 
 		// decode response
-		if(($_response = json_decode($_response, true)) === null)
-			throw new TRpcClientResponseException('Empty response received');
+		if(($_response = json_decode($_response, true)) === null) {
+					throw new TRpcClientResponseException('Empty response received');
+		}
 
 		// handle error response
-		if(!is_null($_response['error']))
-			throw new TRpcClientResponseException($_response['error']);
+		if(!is_null($_response['error'])) {
+					throw new TRpcClientResponseException($_response['error']);
+		}
 
 		return $_response['result'];
 	}
@@ -320,16 +325,19 @@ 
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'text/xml');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
-			return true;
+		if($this->isNotification) {
+					return true;
+		}
 
 		// decode response
-		if(($_response = xmlrpc_decode($_response)) === null)
-			throw new TRpcClientResponseException('Empty response received');
+		if(($_response = xmlrpc_decode($_response)) === null) {
+					throw new TRpcClientResponseException('Empty response received');
+		}
 
 		// handle error response
-		if(xmlrpc_is_fault($_response))
-			throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
+		if(xmlrpc_is_fault($_response)) {
+					throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
+		}
 
 		return $_response;
 	}