pradosoft / prado

framework/pradolite.php

Doc Comments +655 added lines

@@ -78,6 +78,10 @@ 
 		}
 		exit(1);
 	}
+
+	/**
+	 * @param TApplication $application
+	 */
 	public static function setApplication($application)
 	{
 		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
@@ -371,14 +375,26 @@ 
 interface IModule
 {
 	public function init($config);
+
+	/**
+	 * @return string
+	 */
 	public function getID();
 	public function setID($id);
 }
 interface IService
 {
 	public function init($config);
+
+	/**
+	 * @return string
+	 */
 	public function getID();
 	public function setID($id);
+
+	/**
+	 * @return boolean
+	 */
 	public function getEnabled();
 	public function setEnabled($value);
 	public function run();
@@ -390,14 +406,37 @@ 
 }
 interface IUser
 {
+	/**
+	 * @return string
+	 */
 	public function getName();
 	public function setName($value);
+
+	/**
+	 * @return boolean
+	 */
 	public function getIsGuest();
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setIsGuest($value);
 	public function getRoles();
 	public function setRoles($value);
+
+	/**
+	 * @return boolean
+	 */
 	public function isInRole($role);
+
+	/**
+	 * @return string
+	 */
 	public function saveToString();
+
+	/**
+	 * @return TUser
+	 */
 	public function loadFromString($string);
 }
 interface IStatePersister
@@ -409,6 +448,12 @@ 
 {
 	public function get($id);
 	public function set($id,$value,$expire=0,$dependency=null);
+
+	/**
+	 * @param string $id
+	 *
+	 * @return boolean
+	 */
 	public function add($id,$value,$expire=0,$dependency=null);
 	public function delete($id);
 	public function flush();
@@ -427,12 +472,22 @@ 
 }
 interface IStyleable
 {
+	/**
+	 * @return boolean
+	 */
 	public function getHasStyle();
+
+	/**
+	 * @return TStyle
+	 */
 	public function getStyle();
 	public function clearStyle();
 }
 interface IActiveControl
 {
+	/**
+	 * @return TBaseActiveControl
+	 */
 	public function getActiveControl();
 }
 interface ICallbackEventHandler
@@ -442,6 +497,10 @@ 
 interface IDataRenderer
 {
 	public function getData();
+
+	/**
+	 * @param TActiveRecord $value
+	 */
 	public function setData($value);
 }
 class TApplicationComponent extends TComponent
@@ -470,6 +529,10 @@ 
 	{
 		return Prado::getApplication()->getUser();
 	}
+
+	/**
+	 * @param string $assetPath
+	 */
 	public function publishAsset($assetPath,$className=null)
 	{
 		if($className===null)
@@ -478,6 +541,10 @@ 
 		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);
 	}
+
+	/**
+	 * @param string $fullPath
+	 */
 	public function publishFilePath($fullPath, $checkTimestamp=false)
 	{
 		return Prado::getApplication()->getAssetManager()->publishFilePath($fullPath, $checkTimestamp);
@@ -509,6 +576,10 @@ 
 	{
 		return $this->_id;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setID($value)
 	{
 		$this->_id=$value;
@@ -548,6 +619,10 @@ 
 		else
 			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
 	}
+
+	/**
+	 * @param null|TApplication $sender
+	 */
 	public function handleError($sender,$param)
 	{
 		static $handling=false;
@@ -570,6 +645,10 @@ 
 				$this->handleExternalError(500,$param);
 		}
 	}
+
+	/**
+	 * @return string
+	 */
 	protected static function hideSecurityRelated($value, $exception=null)
 	{
 		$aRpl = array();
@@ -589,6 +668,10 @@ 
 		$aRpl = array_reverse($aRpl, true);
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
+
+	/**
+	 * @param integer $statusCode
+	 */
 	protected function handleExternalError($statusCode,$exception)
 	{
 		if(!($exception instanceof THttpException))
@@ -722,6 +805,10 @@ 
 			return null;
 		return $result;
 	}
+
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace,$pattern)
 	{
 		$result=null;
@@ -751,6 +838,10 @@ 
 		}
 		return $source;
 	}
+
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
@@ -772,6 +863,10 @@ 
 	{
 		return $this->_r;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	protected function setReadOnly($value)
 	{
 		$this->_r=TPropertyValue::ensureBoolean($value);
@@ -1018,9 +1113,27 @@ 
 	{
 		throw new TNotSupportedException('cache_flush_unsupported');
 	}
+
+	/**
+	 * @param string $key
+	 */
 	abstract protected function getValue($key);
+
+	/**
+	 * @param string $key
+	 * @param integer $expire
+	 */
 	abstract protected function setValue($key,$value,$expire);
+
+	/**
+	 * @param string $key
+	 * @param integer $expire
+	 */
 	abstract protected function addValue($key,$value,$expire);
+
+	/**
+	 * @param string $key
+	 */
 	abstract protected function deleteValue($key);
 	public function offsetExists($id)
 	{
@@ -1109,14 +1222,26 @@ 
 	{
 		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
 	}
+
+	/**
+	 * @param string $fileName
+	 */
 	protected function validateFile($fileName)
 	{
 		return true;
 	}
+
+	/**
+	 * @param string $directory
+	 */
 	protected function validateDirectory($directory)
 	{
 		return true;
 	}
+
+	/**
+	 * @param string $directory
+	 */
 	protected function generateTimestamps($directory,$level=0)
 	{
 		if(($dir=opendir($directory))===false)
@@ -1207,6 +1332,10 @@ 
 		$this->_str='';
 		return $str;
 	}
+
+	/**
+	 * @param string $str
+	 */
 	public function write($str)
 	{
 		$this->_str.=$str;
@@ -1254,6 +1383,10 @@ 
 	{
 		return $this->_dp;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setDefaultPriority($value)
 	{
 		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
@@ -1262,6 +1395,10 @@ 
 	{
 		return $this->_p;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setPrecision($value)
 	{
 		$this->_p=TPropertyValue::ensureInteger($value);
@@ -1500,6 +1637,10 @@ 
 		$this->sortPriorities();
 		return $this->_d;
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function toArrayBelowPriority($priority,$inclusive=false)
 	{
 		$this->sortPriorities();
@@ -1512,6 +1653,10 @@ 
 		}
 		return $items;
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function toArrayAbovePriority($priority,$inclusive=true)
 	{
 		$this->sortPriorities();
@@ -1609,6 +1754,10 @@ 
 	{
 		return $this->_r;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	protected function setReadOnly($value)
 	{
 		$this->_r=TPropertyValue::ensureBoolean($value);
@@ -1681,6 +1830,10 @@ 
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
+
+	/**
+	 * @param TMap $data
+	 */
 	public function mergeWith($data)
 	{
 		if(is_array($data) || $data instanceof Traversable)
@@ -1732,6 +1885,10 @@ 
 	{
 		return $this->_r;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	protected function setReadOnly($value)
 	{
 		$this->_r=TPropertyValue::ensureBoolean($value);
@@ -1740,6 +1897,10 @@ 
 	{
 		return $this->_dp;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setDefaultPriority($value)
 	{
 		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
@@ -1748,6 +1909,10 @@ 
 	{
 		return $this->_p;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setPrecision($value)
 	{
 		$this->_p=TPropertyValue::ensureInteger($value);
@@ -2133,6 +2298,10 @@ 
 	{
 		return $this->_parent;
 	}
+
+	/**
+	 * @param TXmlElement|null $parent
+	 */
 	public function setParent($parent)
 	{
 		$this->_parent=$parent;
@@ -2194,6 +2363,10 @@ 
 		}
 		return null;
 	}
+
+	/**
+	 * @param string $tagName
+	 */
 	public function getElementsByTagName($tagName)
 	{
 		$list=new TList;
@@ -2263,6 +2436,10 @@ 
 	{
 		return $this->_version;
 	}
+
+	/**
+	 * @param string $version
+	 */
 	public function setVersion($version)
 	{
 		$this->_version=$version;
@@ -2271,6 +2448,10 @@ 
 	{
 		return $this->_encoding;
 	}
+
+	/**
+	 * @param string $encoding
+	 */
 	public function setEncoding($encoding)
 	{
 		$this->_encoding=$encoding;
@@ -2499,10 +2680,18 @@ 
 		}
 		return 0;
 	}
+
+	/**
+	 * @param IUser $user
+	 */
 	private function isUserMatched($user)
 	{
 		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
 	}
+
+	/**
+	 * @param IUser $user
+	 */
 	private function isRoleMatched($user)
 	{
 		foreach($this->_roles as $role)
@@ -2519,6 +2708,11 @@ 
 }
 class TAuthorizationRuleCollection extends TList
 {
+	/**
+	 * @param IUser $user
+	 * @param string $verb
+	 * @param string $ip
+	 */
 	public function isUserAllowed($user,$verb,$ip)
 	{
 		if($user instanceof IUser)
@@ -2626,6 +2820,10 @@ 
 	{
 		$this->_cryptAlgorithm = $value;
 	}
+
+	/**
+	 * @param string $data
+	 */
 	public function encrypt($data)
 	{
 		$module=$this->openCryptModule();
@@ -2638,6 +2836,10 @@ 
 		mcrypt_module_close($module);
 		return $encrypted;
 	}
+
+	/**
+	 * @param string $data
+	 */
 	public function decrypt($data)
 	{
 		$module=$this->openCryptModule();
@@ -2699,6 +2901,11 @@ 
 	{
 		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
 	}
+
+	/**
+	 * @param integer $start
+	 * @param integer $length
+	 */
 	private function substr($string,$start,$length)
 	{
 		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
@@ -2858,6 +3065,10 @@ 
 		self::checkJsonError();
 		return $s;
 	}
+
+	/**
+	 * @param string $sourceEncoding
+	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
@@ -2867,6 +3078,10 @@ 
 				self::convertToUtf8($element, $sourceEncoding);
 		}
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
 	{
 		$s= @json_decode($value, $assoc, $depth);
@@ -2901,6 +3116,10 @@ 
 		}
 		throw new Exception("JSON error ($err): $msg");
 	}
+
+	/**
+	 * @param string $code
+	 */
 	public static function JSMin($code)
 	{
 		Prado::using('System.Web.Javascripts.JSMin');
@@ -3088,6 +3307,10 @@ 
 	{
 		return $this->getID();
 	}
+
+	/**
+	 * @param TUrlManager $manager
+	 */
 	protected function cacheUrlManager($manager)
 	{
 		if($this->getEnableCache())
@@ -3337,6 +3560,10 @@ 
 	{
 		return $_ENV;
 	}
+
+	/**
+	 * @param string $serviceID
+	 */
 	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
 		if ($this->_cookieOnly===null)
@@ -3457,6 +3684,10 @@ 
 class THttpCookieCollection extends TList
 {
 	private $_o;
+
+	/**
+	 * @param THttpResponse $owner
+	 */
 	public function __construct($owner=null)
 	{
 		$this->_o=$owner;
@@ -3520,6 +3751,10 @@ 
 	{
 		return $this->_expire;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	public function setExpire($value)
 	{
 		$this->_expire=TPropertyValue::ensureInteger($value);
@@ -3586,6 +3821,10 @@ 
 	private $_query;
 	private $_fragment;
 	private $_uri;
+
+	/**
+	 * @param string $uri
+	 */
 	public function __construct($uri)
 	{
 		if(($ret=@parse_url($uri))!==false)
@@ -3651,6 +3890,10 @@ 
 class THttpResponseAdapter extends TApplicationComponent
 {
 	private $_response;
+
+	/**
+	 * @param THttpResponse $response
+	 */
 	public function __construct($response)
 	{
 		$this->_response=$response;
@@ -3746,6 +3989,10 @@ 
 	{
 		return $this->_charset;
 	}
+
+	/**
+	 * @param string $charset
+	 */
 	public function setCharset($charset)
 	{
 		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
@@ -3969,6 +4216,10 @@ 
 			return array_change_key_case($result, $case);
 		return $result;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function appendHeader($value, $replace=true)
 	{
 		header($value, $replace);
@@ -3977,6 +4228,10 @@ 
 	{
 		error_log($message,$messageType,$destination,$extraHeaders);
 	}
+
+	/**
+	 * @param THttpCookie $cookie
+	 */
 	public function addCookie($cookie)
 	{
 		$request=$this->getRequest();
@@ -4034,6 +4289,10 @@ 
 		else
 			return $this->createNewHtmlWriter($type, $this);
 	}
+
+	/**
+	 * @param THttpResponse $writer
+	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
 		return Prado::createComponent($type, $writer);
@@ -4143,6 +4402,10 @@ 
 	{
 		return $this->_customStorage;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setUseCustomStorage($value)
 	{
 		$this->_customStorage=TPropertyValue::ensureBoolean($value);
@@ -4285,10 +4548,18 @@ 
 	{
 		return array_keys($_SESSION);
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function itemAt($key)
 	{
 		return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function add($key,$value)
 	{
 		$_SESSION[$key]=$value;
@@ -4395,6 +4666,10 @@ 
 	{
 		return $this->_caseSensitive;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setCaseSensitive($value)
 	{
 		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
@@ -4407,6 +4682,10 @@ 
 	{
 		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function remove($key)
 	{
 		return parent::remove($this->_caseSensitive?$key:strtolower($key));
@@ -4557,6 +4836,10 @@ 
 		}
 		return $this->_page;
 	}
+
+	/**
+	 * @param TPage $page
+	 */
 	public function setPage($page)
 	{
 		$this->_page=$page;
@@ -4700,6 +4983,10 @@ 
 		else
 			return $this->getViewState('Visible',true);
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setVisible($value)
 	{
 		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
@@ -4738,6 +5025,10 @@ 
 			return $attributes;
 		}
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function hasAttribute($name)
 	{
 		if($attributes=$this->getViewState('Attributes',null))
@@ -4745,6 +5036,10 @@ 
 		else
 			return false;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function getAttribute($name)
 	{
 		if($attributes=$this->getViewState('Attributes',null))
@@ -4752,6 +5047,10 @@ 
 		else
 			return null;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function setAttribute($name,$value)
 	{
 		$this->getAttributes()->add($name,$value);
@@ -4775,6 +5074,10 @@ 
 		else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setEnableViewState($value)
 	{
 		if(TPropertyValue::ensureBoolean($value))
@@ -4782,10 +5085,20 @@ 
 		else
 			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
 	}
+
+	/**
+	 * @param string $key
+	 * @param integer $defaultValue
+	 */
 	protected function getControlState($key,$defaultValue=null)
 	{
 		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
 	}
+
+	/**
+	 * @param string $key
+	 * @param integer $defaultValue
+	 */
 	protected function setControlState($key,$value,$defaultValue=null)
 	{
 		if($value===$defaultValue)
@@ -4797,6 +5110,10 @@ 
 	{
 		unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 	}
+
+	/**
+	 * @param boolean $enabled
+	 */
 	public function trackViewState($enabled)
 	{
 		$this->_trackViewState=TPropertyValue::ensureBoolean($enabled);
@@ -4814,6 +5131,10 @@ 
 		else
 			return $defaultValue;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function setViewState($key,$value,$defaultValue=null)
 	{
 		if($this->_trackViewState)
@@ -4833,6 +5154,10 @@ 
 				$this->_tempState[$key]=$value;
 		}
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function clearViewState($key)
 	{
 		unset($this->_viewState[$key]);
@@ -4889,6 +5214,10 @@ 
 	{
 		return ($this->_flags & self::IS_CHILD_CREATED)!==0;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	final protected function setChildControlsCreated($value)
 	{
 		if($value)
@@ -4948,6 +5277,10 @@ 
 				return null;
 		}
 	}
+
+	/**
+	 * @param string $type
+	 */
 	public function findControlsByType($type,$strict=true)
 	{
 		$controls=array();
@@ -4985,6 +5318,10 @@ 
 		unset($this->_rf[self::RF_NAMED_CONTROLS_ID]);
 		$this->clearNameTable();
 	}
+
+	/**
+	 * @param TCheckBox $object
+	 */
 	public function registerObject($name,$object)
 	{
 		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
@@ -5019,6 +5356,10 @@ 
 	{
 		return $this->getControlStage() >= self::CS_PRERENDERED;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function getRegisteredObject($name)
 	{
 		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
@@ -5042,6 +5383,10 @@ 
 			$control=$control->_parent;
 		return $control===$ancestor;
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	public function addedControl($control)
 	{
 		if($control->_parent)
@@ -5080,6 +5425,10 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	public function removedControl($control)
 	{
 		if($this->_namingContainer)
@@ -5225,6 +5574,10 @@ 
 		$rootControl=(($page=$this->getPage())===null)?$this:$page;
 		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
 	}
+
+	/**
+	 * @param TBroadcastEventParameter $param
+	 */
 	private function broadcastEventInternal($name,$sender,$param)
 	{
 		if($this->hasEvent($name))
@@ -5370,6 +5723,10 @@ 
 		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
+
+	/**
+	 * @param boolean $recursive
+	 */
 	private function clearCachedUniqueID($recursive)
 	{
 		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
@@ -5393,6 +5750,10 @@ 
 	{
 		unset($this->_rf[self::RF_NAMED_CONTROLS]);
 	}
+
+	/**
+	 * @param TControl $container
+	 */
 	private function fillNameTable($container,$controls)
 	{
 		foreach($controls as $control)
@@ -5465,11 +5826,18 @@ 
 }
 interface IPostBackEventHandler
 {
+	/**
+	 * @return void
+	 */
 	public function raisePostBackEvent($param);
 }
 interface IPostBackDataHandler
 {
 	public function loadPostData($key,$values);
+
+	/**
+	 * @return void
+	 */
 	public function raisePostDataChangedEvent();
 	public function getDataChanged();
 }
@@ -5477,8 +5845,16 @@ 
 {
 	public function validate();
 	public function getIsValid();
+
+	/**
+	 * @return void
+	 */
 	public function setIsValid($value);
 	public function getErrorMessage();
+
+	/**
+	 * @return void
+	 */
 	public function setErrorMessage($value);
 }
 interface IValidatable
@@ -5493,26 +5869,66 @@ 
 }
 interface ITheme
 {
+	/**
+	 * @return boolean
+	 */
 	public function applySkin($control);
 }
 interface ITemplate
 {
+	/**
+	 * @return void
+	 */
 	public function instantiateIn($parent);
 }
 interface IButtonControl
 {
 	public function getText();
+
+	/**
+	 * @param string $value
+	 *
+	 * @return void
+	 */
 	public function setText($value);
 	public function getCausesValidation();
+
+	/**
+	 * @return void
+	 */
 	public function setCausesValidation($value);
 	public function getCommandName();
+
+	/**
+	 * @return void
+	 */
 	public function setCommandName($value);
 	public function getCommandParameter();
+
+	/**
+	 * @return void
+	 */
 	public function setCommandParameter($value);
 	public function getValidationGroup();
+
+	/**
+	 * @return void
+	 */
 	public function setValidationGroup($value);
+
+	/**
+	 * @return void
+	 */
 	public function onClick($param);
+
+	/**
+	 * @return void
+	 */
 	public function onCommand($param);
+
+	/**
+	 * @return void
+	 */
 	public function setIsDefaultButton($value);
 	public function getIsDefaultButton();
 }
@@ -5970,6 +6386,10 @@ 
 	{
 		return $this->_customStyle===null?'':$this->_customStyle;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setCustomStyle($value)
 	{
 		$this->_customStyle=$value;
@@ -5978,6 +6398,11 @@ 
 	{
 		return isset($this->_fields[$name])?$this->_fields[$name]:'';
 	}
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	public function setStyleField($name,$value)
 	{
 		$this->_fields[$name]=$value;
@@ -6473,6 +6898,10 @@ 
 {
 	private $_ensureid=false;
 	protected $_decorator;
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setEnsureId($value)
 	{
 		$this->_ensureid |= TPropertyValue::ensureBoolean($value);
@@ -6562,6 +6991,10 @@ 
 		else
 			return '';
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setForeColor($value)
 	{
 		$this->getStyle()->setForeColor($value);
@@ -6592,6 +7025,10 @@ 
 		else
 			return '';
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setHeight($value)
 	{
 		$this->getStyle()->setHeight($value);
@@ -6653,6 +7090,10 @@ 
 		else
 			return '';
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setWidth($value)
 	{
 		$this->getStyle()->setWidth($value);
@@ -6780,6 +7221,10 @@ 
 			$tpl->instantiateIn($this);
 		}
 	}
+
+	/**
+	 * @param string $id
+	 */
 	public function registerContent($id,TContent $object)
 	{
 		if(isset($this->_contents[$id]))
@@ -6787,6 +7232,10 @@ 
 		else
 			$this->_contents[$id]=$object;
 	}
+
+	/**
+	 * @param string $id
+	 */
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
@@ -6983,6 +7432,10 @@ 
 	{
 		return $this->getViewState('Enctype','');
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setEnctype($value)
 	{
 		$this->setViewState('Enctype',$value,'');
@@ -7102,6 +7555,10 @@ 
 		$scripts = array_unique($scripts);
 		return $scripts;
 	}
+
+	/**
+	 * @param string $base
+	 */
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
@@ -7251,6 +7708,11 @@ 
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
 	}
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	public function registerHiddenField($name,$value)
 	{
 		$this->_hiddenFields[$name]=$value;
@@ -7388,6 +7850,10 @@ 
 			$this->renderAllPendingScriptFiles($writer);
 		}
 	}
+
+	/**
+	 * @param boolean $initial
+	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
 		if ($initial) $this->_renderedHiddenFields = array();
@@ -7423,12 +7889,20 @@ 
 abstract class TClientSideOptions extends TComponent
 {
 	private $_options;
+
+	/**
+	 * @param string $name
+	 */
 	protected function setFunction($name, $code)
 	{
 		if(!TJavaScript::isJsLiteral($code))
 			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
+
+	/**
+	 * @param string $name
+	 */
 	protected function getOption($name)
 	{
 		if ($this->_options)
@@ -7551,6 +8025,10 @@ 
 		$this->renderControl($writer);
 		$this->unloadRecursive();
 	}
+
+	/**
+	 * @param string $enc
+	 */
 	protected static function decodeUTF8($data, $enc)
 	{
 		if(is_array($data))
@@ -7633,6 +8111,10 @@ 
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
 	}
+
+	/**
+	 * @param string $validationGroup
+	 */
 	public function getValidators($validationGroup=null)
 	{
 		if(!$this->_validators)
@@ -7703,6 +8185,10 @@ 
 	{
 		$this->_styleSheet=empty($value)?null:$value;
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	public function applyControlSkin($control)
 	{
 		if(($theme=$this->getTheme())!==null)
@@ -7850,6 +8336,10 @@ 
 	{
 		$this->_postBackEventParameter=$value;
 	}
+
+	/**
+	 * @param boolean $beforeLoad
+	 */
 	protected function processPostData($postData,$beforeLoad)
 	{
 		$this->_isLoadingPostData=true;
@@ -7938,6 +8428,10 @@ 
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
+
+	/**
+	 * @param TControl $value
+	 */
 	public function setFocus($value)
 	{
 		$this->_focus=$value;
@@ -7983,6 +8477,10 @@ 
 	{
 		return $this->_clientState;
 	}
+
+	/**
+	 * @param string $state
+	 */
 	public function setClientState($state)
 	{
 		$this->_clientState=$state;
@@ -8042,6 +8540,11 @@ 
 	{
 		$this->_pagePath=$value;
 	}
+
+	/**
+	 * @param string $context
+	 * @param string $funcName
+	 */
 	public function registerCachingAction($context,$funcName,$funcParams)
 	{
 		if($this->_cachingStack)
@@ -8064,13 +8567,27 @@ 
 }
 interface IPageStatePersister
 {
+	/**
+	 * @return TPage
+	 */
 	public function getPage();
+
+	/**
+	 * @return void
+	 */
 	public function setPage(TPage $page);
+
+	/**
+	 * @return void
+	 */
 	public function save($state);
 	public function load();
 }
 class TPageStateFormatter
 {
+	/**
+	 * @param TPage $page
+	 */
 	public static function serialize($page,$data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
@@ -8084,6 +8601,10 @@ 
 			$str=$sm->encrypt($str);
 		return base64_encode($str);
 	}
+
+	/**
+	 * @param TPage $page
+	 */
 	public static function unserialize($page,$data)
 	{
 		$str=base64_decode($data);
@@ -8277,6 +8798,10 @@ 
 	{
 		$this->_cacheModuleID=$value;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setCacheKeyPrefix($value)
 	{
 		$this->_keyPrefix=$value;
@@ -8327,10 +8852,18 @@ 
 	{
 		$this->_cachePostBack=TPropertyValue::ensureBoolean($value);
 	}
+
+	/**
+	 * @param TOutputCacheCheckDependencyEventParameter $param
+	 */
 	public function onCheckDependency($param)
 	{
 		$this->raiseEvent('OnCheckDependency',$this,$param);
 	}
+
+	/**
+	 * @param TOutputCacheCalculateKeyEventParameter $param
+	 */
 	public function onCalculateKey($param)
 	{
 		$this->raiseEvent('OnCalculateKey',$this,$param);
@@ -8422,6 +8955,10 @@ 
 		$tplFile=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$className.self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
+
+	/**
+	 * @param string $fileName
+	 */
 	public function getTemplateByFileName($fileName)
 	{
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
@@ -8461,6 +8998,10 @@ 
 		else
 			return null;
 	}
+
+	/**
+	 * @return string
+	 */
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app=$this->getApplication()->getGlobalization(false))===null)
@@ -8626,12 +9167,20 @@ 
 				$parentControl->addParsedObject($control);
 		}
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	protected function configureControl($control,$name,$value)
 	{
 		if(strncasecmp($name,'on',2)===0)					$this->configureEvent($control,$name,$value,$control);
 		else if(($pos=strrpos($name,'.'))===false)				$this->configureProperty($control,$name,$value);
 		else				$this->configureSubProperty($control,$name,$value);
 	}
+
+	/**
+	 * @param TComponent $component
+	 */
 	protected function configureComponent($component,$name,$value)
 	{
 		if(strpos($name,'.')===false)				$this->configureProperty($component,$name,$value);
@@ -8941,6 +9490,11 @@ 
 		$tpl=$objects;
 		return $objects;
 	}
+
+	/**
+	 * @param string $str
+	 * @param string $offset
+	 */
 	protected function parseAttributes($str,$offset)
 	{
 		if($str==='')
@@ -8972,11 +9526,19 @@ 
 		}
 		return $attributes;
 	}
+
+	/**
+	 * @param string $content
+	 */
 	protected function parseTemplateProperty($content,$offset)
 	{
 		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
 		return array(self::CONFIG_TEMPLATE,new TTemplate($content,$this->_contextPath,$this->_tplFile,$line,false));
 	}
+
+	/**
+	 * @param string $value
+	 */
 	protected function parseAttribute($value)
 	{
 		if(($n=preg_match_all('/<%[#=].*?%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0)
@@ -9099,6 +9661,11 @@ 
 	{
 		return $this->_includedFiles;
 	}
+
+	/**
+	 * @param Exception $e
+	 * @param integer $line
+	 */
 	protected function handleException($e,$line,$input=null)
 	{
 		$srcFile=$this->_tplFile;
@@ -9155,6 +9722,10 @@ 
 		}
 		return $input;
 	}
+
+	/**
+	 * @param string $method
+	 */
 	protected function isClassBehaviorMethod(ReflectionClass $class,$method)
 	{
 	  $component=new ReflectionClass('TComponent');
@@ -9237,6 +9808,10 @@ 
 				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
 		}
 	}
+
+	/**
+	 * @return string
+	 */
 	public function getBaseUrl()
 	{
 		if($this->_baseUrl===null)
@@ -9635,6 +10210,10 @@ 
 	{
 		return $this->_defaultPage;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setDefaultPage($value)
 	{
 		if($this->_initialized)
@@ -9723,6 +10302,10 @@ 
 			$page->setSubProperty($name,$value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
+
+	/**
+	 * @param string $pagePath
+	 */
 	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
@@ -9794,11 +10377,20 @@ 
 				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
 		}
 	}
+
+	/**
+	 * @param string $configPath
+	 */
 	public function loadFromPhp($config,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromPhp($config,$configPath);
 		$this->loadPageConfigurationFromPhp($config,$configPath,$configPagePath);
 	}
+
+	/**
+	 * @param TXmlDocument $dom
+	 * @param string $configPath
+	 */
 	public function loadFromXml($dom,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromXml($dom,$configPath);
@@ -10055,6 +10647,10 @@ 
 		else
 			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
 	}
+
+	/**
+	 * @param string $path
+	 */
 	public function getPublishedUrl($path)
 	{
 		$path=realpath($path);
@@ -10063,10 +10659,19 @@ 
 		else
 			return $this->_baseUrl.'/'.$this->hash($path);
 	}
+
+	/**
+	 * @param string $dir
+	 */
 	protected function hash($dir)
 	{
 		return sprintf('%x',crc32($dir.Prado::getVersion()));
 	}
+
+	/**
+	 * @param string $src
+	 * @param string $dst
+	 */
 	protected function copyFile($src,$dst)
 	{
 		if(!is_dir($dst))
@@ -10080,6 +10685,11 @@ 
 			@copy($src,$dstFile);
 		}
 	}
+
+	/**
+	 * @param string $src
+	 * @param string $dst
+	 */
 	public function copyDirectory($src,$dst)
 	{
 		if(!is_dir($dst))
@@ -10109,6 +10719,11 @@ 
 			throw new TInvalidDataValueException('assetmanager_source_directory_invalid', $src);
 		}
 	}
+
+	/**
+	 * @param string $tarfile
+	 * @param string $md5sum
+	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$md5sum]))
@@ -10131,6 +10746,10 @@ 
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
 		}
 	}
+
+	/**
+	 * @param string $destination
+	 */
 	protected function deployTarFile($path,$destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
@@ -10352,6 +10971,10 @@ 
 		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
 		Prado::setPathOfAlias('Application',$this->_basePath);
 	}
+
+	/**
+	 * @param string $basePath
+	 */
 	protected function resolvePaths($basePath)
 	{
 				if(empty($basePath) || ($basePath=realpath($basePath))===false)
@@ -10417,10 +11040,18 @@ 
 	{
 		return $this->_requestCompleted;
 	}
+
+	/**
+	 * @param integer $defaultValue
+	 */
 	public function getGlobalState($key,$defaultValue=null)
 	{
 		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
 		$this->_stateChanged=true;
@@ -10480,6 +11111,10 @@ 
 	{
 		return $this->_basePath;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setBasePath($value)
 	{
 		$this->_basePath=$value;
@@ -10488,6 +11123,10 @@ 
 	{
 		return $this->_configFile;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setConfigurationFile($value)
 	{
 		$this->_configFile=$value;
@@ -10496,6 +11135,10 @@ 
 	{
 		return $this->_configType;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setConfigurationType($value)
 	{
 		$this->_configType = $value;
@@ -10535,6 +11178,10 @@ 
 	{
 		return $this->_runtimePath;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath=$value;
@@ -10546,6 +11193,10 @@ 
 	{
 		return $this->_service;
 	}
+
+	/**
+	 * @param IService $value
+	 */
 	public function setService($value)
 	{
 		$this->_service=$value;
@@ -10826,6 +11477,10 @@ 
 		else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
+
+	/**
+	 * @param Exception $param
+	 */
 	public function onError($param)
 	{
 		Prado::log($param->getMessage(),TLogger::ERROR,'System.TApplication');

Braces +430 added lines, -507 removed lines

@@ -46,8 +46,7 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
-		}
-		else
+		} else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
@@ -71,8 +70,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -120,14 +118,14 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					for($i=2;$i<$n;++$i) {
+											$s.=",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 	public static function using($namespace,$checkClassExistence=true)
@@ -138,31 +136,27 @@ 
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				if($checkClassExistence && !class_exists($namespace,false))
 					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
 				else
 					throw $e;
 			}
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
 			if($className==='*')  			{
 				self::$_usings[$namespace]=$path;
 				set_include_path(get_include_path().PATH_SEPARATOR.$path);
-			}
-			else  			{
+			} else  			{
 				self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || !class_exists($className,false))
 				{
 					try
 					{
 						include_once($path);
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className,false))
 							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
@@ -171,8 +165,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 	public static function getPathOfNamespace($namespace, $ext='')
@@ -208,8 +201,7 @@ 
 				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 	public static function fatalError($msg)
@@ -246,8 +238,7 @@ 
 							echo "'". substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					else if (is_int($item) || is_float($item))
+					} else if (is_int($item) || is_float($item))
 						echo $item;
 					else if (is_object($item))
 						echo get_class($item);
@@ -316,8 +307,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level=TLogger::DEBUG;
-		}
-		else
+		} else
 			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}
@@ -343,8 +333,9 @@ 
 		Prado::using('System.I18N.Translation');
 		$app = Prado::getApplication()->getGlobalization(false);
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+		foreach($parameters as $key => $value) {
+					$params['{'.$key.'}'] = $value;
+		}
 				if($app===null || ($config = $app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
 		if ($catalogue===null)
@@ -622,8 +613,7 @@ 
 			echo "<body><h1>Recursive Error</h1>\n";
 			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
@@ -645,15 +635,13 @@ 
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
-		}
-		else
+		} else
 		{
 			if(($trace=$this->getExactTrace($exception))!==null)
 			{
 				$fileName=$trace['file'];
 				$errorLine=$trace['line'];
-			}
-			else
+			} else
 			{
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
@@ -712,8 +700,7 @@ 
 				$result=$trace[0];
 			elseif(isset($trace[1]))
 				$result=$trace[1];
-		}
-		else if($exception instanceof TInvalidOperationException)
+		} else if($exception instanceof TInvalidOperationException)
 		{
 						if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
 				$result=$this->getPropertyAccessTrace($trace,'__set');
@@ -745,8 +732,7 @@ 
 			{
 				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
-			}
-			else
+			} else
 				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;
@@ -810,11 +796,9 @@ 
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function remove($item)
@@ -825,11 +809,9 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_item_inexistent');
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function removeAt($index)
@@ -847,17 +829,16 @@ 
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
-			$this->removeAt($i);
+		for($i=$this->_c-1;$i>=0;--$i) {
+					$this->removeAt($i);
+		}
 	}
 	public function contains($item)
 	{
@@ -878,8 +859,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index, $item);
 			return $index;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function insertAfter($baseitem, $item)
@@ -890,8 +870,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index + 1, $item);
 			return $index + 1;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function toArray()
@@ -904,20 +883,20 @@ 
 		{
 			if($this->_c>0)
 				$this->clear();
-			foreach($data as $item)
-				$this->add($item);
-		}
-		else if($data!==null)
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			foreach($data as $item)
-				$this->add($item);
-		}
-		else if($data!==null)
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1131,8 +1110,7 @@ 
 			{
 				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
-			}
-			else if($this->validateFile($path))
+			} else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
@@ -1174,9 +1152,10 @@ 
 	{
 		if($this->_dependencies!==null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach($this->_dependencies as $dependency) {
+							if($dependency->getHasChanged())
 					return true;
+			}
 		}
 		return false;
 	}
@@ -1286,8 +1265,9 @@ 
 			return $this->_fd;
 		$this->sortPriorities();
 		$this->_fd=array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		}
 		return $this->_fd;
 	}
 	public function itemAt($index)
@@ -1339,9 +1319,10 @@ 
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc=0;
-			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+			foreach($this->_d as $prioritykey=>$items) {
+							if($prioritykey>=$priority)
 					break;
+			}
 				else
 					$cc+=count($items);
 			if($index===false&&isset($this->_d[$priority])) {
@@ -1393,8 +1374,7 @@ 
 			}
 			$this->removeAtIndexInPriority($p[1],$p[0]);
 			return $p[2];
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 	public function removeAt($index)
@@ -1428,8 +1408,9 @@ 
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 		$d=array_reverse($this->_d,true);
 		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+			for($index=count($items)-1;$index>=0;$index--) {
+							$this->removeAtIndexInPriority($index,$priority);
+			}
 			unset($this->_d[$priority]);
 		}
 	}
@@ -1532,14 +1513,16 @@ 
 				$this->clear();
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+				foreach($data->itemsAtPriority($priority) as $index=>$item) {
+									$this->insertAtIndexInPriority($item,$index,$priority);
+				}
 			}
 		} else if(is_array($data)||$data instanceof Traversable) {
 			if($this->getCount()>0)
 				$this->clear();
-			foreach($data as $key=>$item)
-				$this->add($item);
+			foreach($data as $key=>$item) {
+							$this->add($item);
+			}
 		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
@@ -1549,16 +1532,16 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+				foreach($data->itemsAtPriority($priority) as $index=>$item) {
+									$this->insertAtIndexInPriority($item,false,$priority);
+				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
-			foreach($data as $priority=>$item)
-				$this->add($item);
-		}
-		else if($data!==null)
+			foreach($data as $priority=>$item) {
+							$this->add($item);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1649,17 +1632,16 @@ 
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
-			}
-			else
+			} else
 				return null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 	public function clear()
 	{
-		foreach(array_keys($this->_d) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_d) as $key) {
+					$this->remove($key);
+		}
 	}
 	public function contains($key)
 	{
@@ -1675,20 +1657,20 @@ 
 		{
 			if($this->getCount()>0)
 				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
-		}
-		else if($data!==null)
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
-		}
-		else if($data!==null)
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1767,8 +1749,9 @@ 
 			return $this->_fd;
 		$this->sortPriorities();
 		$this->_fd = array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		}
 		return $this->_fd;
 	}
 	public function count()
@@ -1831,17 +1814,19 @@ 
 	public function priorityOf($item)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+		foreach($this->_d as $priority=>$items) {
+					if(($index=array_search($item,$items,true))!==false)
 				return $priority;
+		}
 		return false;
 	}
 	public function priorityAt($key)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+		foreach($this->_d as $priority=>$items) {
+					if(array_key_exists($key,$items))
 				return $priority;
+		}
 		return false;
 	}
 	public function add($key,$value,$priority=null)
@@ -1851,10 +1836,11 @@ 
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 		if(!$this->_r)
 		{
-			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+			foreach($this->_d as $innerpriority=>$items) {
+							if(array_key_exists($key,$items))
 				{
 					unset($this->_d[$innerpriority][$key]);
+			}
 					$this->_c--;
 					if(count($this->_d[$innerpriority])===0)
 						unset($this->_d[$innerpriority]);
@@ -1862,13 +1848,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
@@ -1881,10 +1865,11 @@ 
 			if($priority===false)
 			{
 				$this->sortPriorities();
-				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+				foreach($this->_d as $priority=>$items) {
+									if(array_key_exists($key,$items))
 					{
 						$value=$this->_d[$priority][$key];
+				}
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
 						if(count($this->_d[$priority])===0)
@@ -1896,8 +1881,7 @@ 
 						return $value;
 					}
 				return null;
-			}
-			else
+			} else
 			{
 				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
@@ -1911,19 +1895,18 @@ 
 					}
 					$this->_fd=null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 	public function clear()
 	{
-		foreach($this->_d as $priority=>$items)
-			foreach(array_keys($items) as $key)
+		foreach($this->_d as $priority=>$items) {
+					foreach(array_keys($items) as $key)
 				$this->remove($key);
+		}
 	}
 	public function contains($key)
 	{
@@ -1969,15 +1952,14 @@ 
 					$this->add($key,$value,$priority);
 				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
 			if($this->getCount()>0)
 				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
-		}
-		else if($data!==null)
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
@@ -1986,16 +1968,16 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+				foreach($data->itemsAtPriority($priority) as $key => $value) {
+									$this->add($key,$value,$priority);
+				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
-		}
-		else if($data!==null)
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -2038,8 +2020,7 @@ 
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 	public function clear()
@@ -2188,9 +2169,10 @@ 
 	{
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName===$tagName)
 					return $element;
+			}
 		}
 		return null;
 	}
@@ -2199,9 +2181,10 @@ 
 		$list=new TList;
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName===$tagName)
 					$list->add($element);
+			}
 		}
 		return $list;
 	}
@@ -2220,17 +2203,16 @@ 
 		if($this->getHasElement())
 		{
 			$str=$prefix."<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
+			foreach($this->getElements() as $element) {
+							$str.=$element->toString($indent+1)."\n";
+			}
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
-		}
-		else if(($value=$this->getValue())!=='')
+		} else if(($value=$this->getValue())!=='')
 		{
 			$value=$this->xmlEncode($value);
 			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
-		}
-		else
+		} else
 			return $prefix."<{$this->_tagName}$attr />";
 	}
 	public function __toString()
@@ -2312,8 +2294,9 @@ 
    					$attributes->add('xmlns:'.$prefix, $uri);
 			}
 		}
-		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+		foreach($element->attributes as $name=>$attr) {
+					$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+		}
 		foreach($element->childNodes as $child)
 		{
 			if($child instanceof DOMElement)
@@ -2327,8 +2310,7 @@ 
 		{
 			fwrite($fw,$this->saveToString());
 			fclose($fw);
-		}
-		else
+		} else
 			throw new TIOException('xmldocument_file_write_failed',$file);
 	}
 	public function saveToString()
@@ -2345,8 +2327,9 @@ 
 	{
 		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		foreach($node->attributes as $name=>$attr) {
+					$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		}
 		foreach($node->childNodes as $child)
 		{
 			if($child instanceof DOMElement)
@@ -2374,8 +2357,7 @@ 
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 	public function removeAt($index)
@@ -2419,8 +2401,7 @@ 
 				{
 					$this->_everyone=true;
 					break;
-				}
-				else if($user==='?')
+				} else if($user==='?')
 					$this->_guest=true;
 				else if($user==='@')
 					$this->_authenticated=true;
@@ -2530,8 +2511,7 @@ 
 					return ($decision>0);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 	public function insertAt($index,$item)
@@ -2661,8 +2641,7 @@ 
 			if($module===false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
 			return $module;
-		}
-		else
+		} else
 			throw new TNotSupportedException('securitymanager_mcryptextension_required');
 	}
 	public function hashData($data)
@@ -2732,8 +2711,9 @@ 
 	public static function renderScriptFiles($files)
 	{
 		$str='';
-		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+		foreach($files as $file) {
+					$str.= self::renderScriptFile($file);
+		}
 		return $str;
 	}
 	public static function renderScriptFile($file)
@@ -2802,8 +2782,7 @@ 
 					}
 				}
 				return '{'.$results.'}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
@@ -2816,8 +2795,7 @@ 
 				}
 				return '['.$results.']';
 			}
-		}
-		else if(is_integer($value))
+		} else if(is_integer($value))
 			return "$value";
 		else if(is_float($value))
 		{
@@ -2837,8 +2815,7 @@ 
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
-		}
-		else if(is_object($value))
+		} else if(is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
@@ -2863,8 +2840,9 @@ 
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
 		else if (is_array($value))
 		{
-			foreach($value as &$element)
-				self::convertToUtf8($element, $sourceEncoding);
+			foreach($value as &$element) {
+							self::convertToUtf8($element, $sourceEncoding);
+			}
 		}
 	}
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
@@ -2923,23 +2901,22 @@ 
 					if(is_array($value))
 					{
 						$name=urlencode($name.'[]');
-						foreach($value as $v)
-							$url.=$amp.$name.'='.urlencode($v);
-					}
-					else
+						foreach($value as $v) {
+													$url.=$amp.$name.'='.urlencode($v);
+						}
+					} else
 						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
 					if(is_array($value))
 					{
-						foreach($value as $v)
-							$url.=$amp.$name.'[]='.$v;
-					}
-					else
+						foreach($value as $v) {
+													$url.=$amp.$name.'[]='.$v;
+						}
+					} else
 						$url.=$amp.$name.'='.$value;
 				}
 			}
@@ -2977,14 +2954,12 @@ 
 							$getVariables[substr($name,0,$pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
-					}
-					else
+					} else
 						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return array();
 	}
 }
@@ -3068,8 +3043,7 @@ 
 				$port=$_SERVER['SERVER_PORT'];
 				if(($port!=80 && !$secure) || ($port!=443 && $secure))
 					$url.=':'.$port;
-			}
-			else
+			} else
 				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
@@ -3139,8 +3113,7 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
@@ -3205,8 +3178,7 @@ 
 		static $result;
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -3261,8 +3233,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -3316,11 +3287,11 @@ 
 					if(($value=$sm->validateData($value))!==false)
 						$this->_cookies->add(new THttpCookie($key,$value));
 				}
-			}
-			else
+			} else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach($_COOKIE as $key=>$value) {
+									$this->_cookies->add(new THttpCookie($key,$value));
+				}
 			}
 		}
 		return $this->_cookies;
@@ -3354,8 +3325,9 @@ 
 	public function resolveRequest($serviceIDs)
 	{
 		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
+		foreach($getParams as $name=>$value) {
+					$_GET[$name]=$value;
+		}
 		$this->_items=array_merge($_GET,$_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
@@ -3420,14 +3392,14 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_items) as $key) {
+					$this->remove($key);
+		}
 	}
 	public function contains($key)
 	{
@@ -3468,8 +3440,7 @@ 
 			parent::insertAt($index,$item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 	public function removeAt($index)
@@ -3488,9 +3459,10 @@ 
 	}
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach($this as $cookie) {
+					if($cookie->getName()===$name)
 				return $cookie;
+		}
 		return null;
 	}
 }
@@ -3599,8 +3571,7 @@ 
 			$this->_query=isset($ret['query'])?$ret['query']:'';
 			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri=$uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid',$uri);
 		}
@@ -3772,7 +3743,7 @@ 
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -3834,10 +3805,10 @@ 
 		$this->sendHttpHeader();
 		if(is_array($headers))
 		{
-			foreach($headers as $h)
-				header($h);
-		}
-		else
+			foreach($headers as $h) {
+							header($h);
+			}
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -3900,13 +3871,11 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
-				}
-				else
+				} else
 					ob_flush();
 				flush();
 			}
-		}
-		else
+		} else
 			flush();
 	}
 	protected function ensureHttpHeaderSent()
@@ -3992,8 +3961,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -4173,13 +4141,11 @@ 
       {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
-			else if($value===THttpSessionCookieMode::Allow)
+      } else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','1');
@@ -4213,8 +4179,7 @@ 
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
@@ -4300,14 +4265,14 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
-			unset($_SESSION[$key]);
+		foreach(array_keys($_SESSION) as $key) {
+					unset($_SESSION[$key]);
+		}
 	}
 	public function contains($key)
 	{
@@ -4617,10 +4582,8 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
-			}
-			else					return $this->_id;
-		}
-		else
+			} else					return $this->_id;
+		} else
 			return $this->_uid;
 	}
 	public function focus()
@@ -4692,12 +4655,12 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getVisible(false))
+			for($control=$this;$control;$control=$control->_parent) {
+							if(!$control->getVisible(false))
 					return false;
+			}
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible',true);
 	}
 	public function setVisible($value)
@@ -4708,12 +4671,12 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for($control=$this;$control;$control=$control->_parent) {
+							if(!$control->getViewState('Enabled',true))
 					return false;
+			}
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled',true);
 	}
 	public function setEnabled($value)
@@ -4767,12 +4730,12 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for($control=$this;$control!==null;$control=$control->getParent()) {
+							if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
+			}
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 	public function setEnableViewState($value)
@@ -4810,8 +4773,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 	public function setViewState($key,$value,$defaultValue=null)
@@ -4823,8 +4785,7 @@ 
 				unset($this->_viewState[$key]);
 			else
 				$this->_viewState[$key]=$value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value===$defaultValue)
@@ -4862,8 +4823,9 @@ 
 		{
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression) {
+							$this->setSubProperty($property,$context->evaluateExpression($expression));
+			}
 		}
 	}
 	protected function autoDataBindProperties()
@@ -4872,17 +4834,19 @@ 
 		{
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression) {
+							$this->setSubProperty($property,$context->evaluateExpression($expression));
+			}
 		}
 	}
 	protected function dataBindChildren()
 	{
 		if(isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof IBindable)
 					$control->dataBind();
+			}
 		}
 	}
 	final protected function getChildControlsCreated()
@@ -4913,8 +4877,7 @@ 
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -5038,8 +5001,9 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
+		while($control!==$ancestor && $control->_parent) {
+					$control=$control->_parent;
+		}
 		return $control===$ancestor;
 	}
 	public function addedControl($control)
@@ -5067,8 +5031,7 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
-				}
-				else
+				} else
 					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
@@ -5178,9 +5141,10 @@ 
 			$this->_id='';
 		if($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->unloadRecursive();
+			}
 		}
 		if(isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->onUnload(null);
@@ -5301,8 +5265,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -5366,17 +5329,17 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 	private function clearCachedUniqueID($recursive)
 	{
 		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
+			}
 		}
 		$this->_uid=null;
 	}
@@ -5430,8 +5393,7 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
-		}
-		else if(is_string($item) || ($item instanceof IRenderable))
+		} else if(is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index,$item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
@@ -5591,8 +5553,7 @@ 
 				else if($item[0]===self::TYPE_DATABINDING)
 					$this->_bindings[$id]=$item[1];
 				$this->_items[$id]='';
-			}
-			else
+			} else
 				$this->_items[$id]=$item;
 		}
 	}
@@ -5607,16 +5568,19 @@ 
 	public function evaluateDynamicContent()
 	{
 		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_expressions as $id=>$expression)
-			$this->_items[$id]=$context->evaluateExpression($expression);
-		foreach($this->_statements as $id=>$statement)
-			$this->_items[$id]=$context->evaluateStatements($statement);
+		foreach($this->_expressions as $id=>$expression) {
+					$this->_items[$id]=$context->evaluateExpression($expression);
+		}
+		foreach($this->_statements as $id=>$statement) {
+					$this->_items[$id]=$context->evaluateStatements($statement);
+		}
 	}
 	public function dataBind()
 	{
 		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_bindings as $id=>$binding)
-			$this->_items[$id]=$context->evaluateExpression($binding);
+		foreach($this->_bindings as $id=>$binding) {
+					$this->_items[$id]=$context->evaluateExpression($binding);
+		}
 	}
 	public function render($writer)
 	{
@@ -6678,8 +6642,9 @@ 
 			$style->addAttributesToRender($writer);
 		if($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+			foreach($this->getAttributes() as $name=>$value) {
+							$writer->addAttribute($name,$value);
+			}
 		}
 	}
 	public function render($writer)
@@ -6739,8 +6704,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 	public function setTemplate($value)
@@ -6814,8 +6778,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 	protected function initRecursive($namingContainer=null)
@@ -6830,10 +6793,10 @@ 
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+			foreach($this->_contents as $id=>$content) {
+							$master->injectContent($id,$content);
+			}
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -6853,8 +6816,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -6876,8 +6838,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -6900,8 +6861,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -6952,8 +6912,7 @@ 
  			$page->endFormRender($writer);
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$page->beginFormRender($writer);
@@ -7059,10 +7018,11 @@ 
 				{
 					foreach (self::$_pradoScripts[$p] as $dep)
 					{
-						foreach (self::$_pradoPackages[$dep] as $script)
-						if (!isset($this->_expandedPradoScripts[$script]))
+						foreach (self::$_pradoPackages[$dep] as $script) {
+												if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
+						}
 							if($isDebug)
 							{
 								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
@@ -7084,8 +7044,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url,$url);
+				}
 			}
 		}
 	}
@@ -7111,8 +7072,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -7208,9 +7168,10 @@ 
 				return is_array($e) ? $e[0] : $e;
 			}, $this->_styleSheetFiles)
 		);
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
+		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url) {
+					if (substr($url,strlen($url)-4)=='.css')
 				$stylesheets[] = $url;
+		}
 		$stylesheets = array_unique($stylesheets);
 		return $stylesheets;
 	}
@@ -7398,10 +7359,10 @@ 
 			$id=strtr($name,':','_');
 			if(is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+				foreach($value as $v) {
+									$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				}
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
@@ -7510,8 +7471,7 @@ 
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
-		}
-		else
+		} else
 			$this->processNormalRequest($writer);
 		$this->_writer = null;
 	}
@@ -7555,8 +7515,9 @@ 
 	{
 		if(is_array($data))
 		{
-			foreach($data as $k=>$v)
-				$data[$k]=self::decodeUTF8($v, $enc);
+			foreach($data as $k=>$v) {
+							$data[$k]=self::decodeUTF8($v, $enc);
+			}
 			return $data;
 		} elseif(is_string($data)) {
 			return iconv('UTF-8',$enc.'//IGNORE',$data);
@@ -7574,8 +7535,9 @@ 
             $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
                 if (($g=$this->getApplication()->getGlobalization(false))!==null &&
             strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+                foreach ($this->_postData as $k=>$v) {
+                                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+                }
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
@@ -7642,9 +7604,10 @@ 
 		else
 		{
 			$list=new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup()===$validationGroup)
+			foreach($this->_validators as $validator) {
+							if($validator->getValidationGroup()===$validationGroup)
 					$list->add($validator);
+			}
 			return $list;
 		}
 	}
@@ -7655,10 +7618,10 @@ 
 		{
 			if($validationGroup===null)
 			{
-				foreach($this->_validators as $validator)
-					$validator->validate();
-			}
-			else
+				foreach($this->_validators as $validator) {
+									$validator->validate();
+				}
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
@@ -7674,13 +7637,13 @@ 
 		{
 			if($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach($this->_validators as $validator) {
+									if(!$validator->getIsValid())
 						return false;
+				}
 			}
 			return true;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 	public function getTheme()
@@ -7749,18 +7712,22 @@ 
 		$theme=$this->getTheme();
 		if($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach($theme->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+			}
+			foreach($theme->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url,$url);
+			}
 		}
 		$styleSheet=$this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach($styleSheet->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+			}
+			foreach($styleSheet->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url,$url);
+			}
 		}
 		if($cs->getRequiresHead() && $this->getHead()===null)
 			throw new TConfigurationException('page_head_required');
@@ -7820,8 +7787,9 @@ 
 		$id=is_string($control)?$control:$control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id]=true;
 		$params=func_get_args();
-		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page','registerRequiresPostData',array($id));
+		foreach($this->getCachingStack() as $item) {
+					$item->registerAction('Page','registerRequiresPostData',array($id));
+		}
 	}
 	public function getPostBackEventTarget()
 	{
@@ -7865,14 +7833,12 @@ 
 				{
 					if($control->loadPostData($key,$postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else if($control instanceof IPostBackEventHandler &&
+				} else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  				}
 				unset($this->_controlsRequiringPostData[$key]);
-			}
-			else if($beforeLoad)
+			} else if($beforeLoad)
 				$this->_restPostData->add($key,$value);
 		}
 		foreach($this->_controlsRequiringPostData as $key=>$value)
@@ -7883,8 +7849,7 @@ 
 				{
 					if($control->loadPostData($key,$this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -7897,8 +7862,9 @@ 
 	}
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
-			$control->raisePostDataChangedEvent();
+		foreach($this->_controlsPostDataChanged as $control) {
+					$control->raisePostDataChangedEvent();
+		}
 	}
 	protected function raisePostBackEvent()
 	{
@@ -7933,8 +7899,7 @@ 
 			else
 				$focus=$this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
-		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
+		} else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
@@ -8046,8 +8011,9 @@ 
 	{
 		if($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+			foreach($this->_cachingStack as $cache) {
+							$cache->registerAction($context,$funcName,$funcParams);
+			}
 		}
 	}
 	public function getCachingStack()
@@ -8100,8 +8066,7 @@ 
 			{
 				if(($str=$sm->validateData($str))!==false)
 					return unserialize($str);
-			}
-			else
+			} else
 				return unserialize($str);
 		}
 		return null;
@@ -8142,8 +8107,7 @@ 
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
 					if(!($this->_cache instanceof ICache))
 						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
-				}
-				else
+				} else
 					$this->_cache=$this->getApplication()->getCache();
 				if($this->_cache!==null)
 				{
@@ -8155,8 +8119,7 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached=$param->getIsValid();
-					}
-					else
+					} else
 						$this->_dataCached=false;
 					if($this->_dataCached)
 						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
@@ -8172,8 +8135,7 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
-		}
-		else
+		} else
 			parent::initRecursive($namingContainer);
 	}
 	protected function loadRecursive()
@@ -8184,8 +8146,7 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
 			if($this->_dataCached)
 				$this->performActions();
@@ -8214,8 +8175,7 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 			parent::preRenderRecursive();
 	}
 	protected function loadStateRecursive(&$state,$needViewState=true)
@@ -8351,8 +8311,7 @@ 
 			$content=$textwriter->flush();
 			$data=array($content,$this->_state,$this->_actions,time());
 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }
@@ -8398,13 +8357,15 @@ 
 	}
 	public function write($s)
 	{
-		foreach($this->_writers as $writer)
-			$writer->write($s);
+		foreach($this->_writers as $writer) {
+					$writer->write($s);
+		}
 	}
 	public function flush()
 	{
-		foreach($this->_writers as $writer)
-			$s = $writer->flush();
+		foreach($this->_writers as $writer) {
+					$s = $writer->flush();
+		}
 		return $s;
 	}
 }
@@ -8452,13 +8413,13 @@ 
 				$includedFiles=$template->getIncludedFiles();
 				$timestamps=array();
 				$timestamps[$fileName]=filemtime($fileName);
-				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile]=filemtime($includedFile);
+				foreach($includedFiles as $includedFile) {
+									$timestamps[$includedFile]=filemtime($includedFile);
+				}
 				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
 				return $template;
 			}
-		}
-		else
+		} else
 			return null;
 	}
 	protected function getLocalizedTemplate($filename)
@@ -8569,8 +8530,9 @@ 
 					}
 					$component->trackViewState(false);
 					$component->applyStyleSheetSkin($page);
-					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+					foreach($properties as $name=>$value) {
+											$this->configureControl($component,$name,$value);
+					}
 					$component->trackViewState(true);
 					if($parent===$parentControl)
 						$directChildren[]=$component;
@@ -8578,8 +8540,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key]=$component;
-				}
-				else if($component instanceof TComponent)
+				} else if($component instanceof TComponent)
 				{
 					$controls[$key]=$component;
 					if(isset($properties['id']))
@@ -8590,15 +8551,15 @@ 
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
-					foreach($properties as $name=>$value)
-						$this->configureComponent($component,$name,$value);
+					foreach($properties as $name=>$value) {
+											$this->configureComponent($component,$name,$value);
+					}
 					if($parent===$parentControl)
 						$directChildren[]=$component;
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -8608,8 +8569,7 @@ 
 						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent===$parentControl)
 						$directChildren[]=$object[1];
@@ -8680,8 +8640,7 @@ 
 				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			if (substr($name,0,2)=='js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
@@ -8717,8 +8676,7 @@ 
 				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name,$value);
 	}
 	protected function parse($input)
@@ -8755,8 +8713,7 @@ 
 						$stack[] = $type;
 						$container=$c-1;
 					}
-				}
-				else if(strpos($str,'</com:')===0)					{
+				} else if(strpos($str,'</com:')===0)					{
 					if($expectPropEnd)
 						continue;
 					if($matchStart>$textStart)
@@ -8772,8 +8729,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag);
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)					{
+				} else if(strpos($str,'<%@')===0)					{
 					if($expectPropEnd)
 						continue;
 					if($matchStart>$textStart)
@@ -8782,8 +8738,7 @@ 
 					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
-				}
-				else if(strpos($str,'<%')===0)					{
+				} else if(strpos($str,'<%')===0)					{
 					if($expectPropEnd)
 						continue;
 					if($matchStart>$textStart)
@@ -8805,8 +8760,7 @@ 
 						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
 						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
 					}
-				}
-				else if(strpos($str,'<prop:')===0)					{
+				} else if(strpos($str,'<prop:')===0)					{
 					if(strrpos($str,'/>')===strlen($str)-2)  					{
 						if($expectPropEnd)
 							continue;
@@ -8816,8 +8770,9 @@ 
 						$prop=strtolower($match[6][0]);
 						$attrs=$this->parseAttributes($match[7][0],$match[7][1]);
 						$attributes=array();
-						foreach($attrs as $name=>$value)
-							$attributes[$prop.'.'.$name]=$value;
+						foreach($attrs as $name=>$value) {
+													$attributes[$prop.'.'.$name]=$value;
+						}
 						$type=$tpl[$container][1];
 						$this->validateAttributes($type,$attributes);
 						foreach($attributes as $name=>$value)
@@ -8826,8 +8781,7 @@ 
 								throw new TConfigurationException('template_property_duplicated',$name);
 							$tpl[$container][2][$name]=$value;
 						}
-					}
-					else  					{
+					} else  					{
 						$prop=strtolower($match[3][0]);
 						$stack[] = '@'.$prop;
 						if(!$expectPropEnd)
@@ -8838,8 +8792,7 @@ 
 							$expectPropEnd=true;
 						}
 					}
-				}
-				else if(strpos($str,'</prop:')===0)					{
+				} else if(strpos($str,'</prop:')===0)					{
 					$prop=strtolower($match[3][0]);
 					if(empty($stack))
 						throw new TConfigurationException('template_closingtag_unexpected',"</prop:$prop>");
@@ -8865,21 +8818,18 @@ 
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated',$prop);
 								$tpl[$container][2][$prop]=$value;
-							}
-							else									$this->_directive[$prop]=$value;
+							} else									$this->_directive[$prop]=$value;
 							$textStart=$matchEnd+1;
 						}
 						$expectPropEnd=false;
 					}
-				}
-				else if(strpos($str,'<!--')===0)					{
+				} else if(strpos($str,'<!--')===0)					{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart>$textStart)
 						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
 					$textStart=$matchEnd+1;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected',$match);
 			}
 			if(!empty($stack))
@@ -8890,8 +8840,7 @@ 
 			}
 			if($textStart<strlen($input))
 				$tpl[$c++]=array($container,substr($input,$textStart));
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -8921,14 +8870,12 @@ 
 				{
 					$parent=null;
 					$objects[$id]=$object;
-				}
-				else
+				} else
 				{
 					$parent=$object[0];
 					$merged=array($parent,array($object[1]));
 				}
-			}
-			else
+			} else
 				$merged[1][]=$object[1];
 		}
 		if($parent!==null)
@@ -8961,8 +8908,7 @@ 
 					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
 				else
 					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
-			}
-			else
+			} else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
 					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
@@ -9004,8 +8950,7 @@ 
 				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
 			else
 				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
-		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		} else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
@@ -9018,8 +8963,7 @@ 
 				$literal = trim(substr($value,3,strlen($value)-5));
 				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 	protected function validateAttributes($type,$attributes)
@@ -9039,15 +8983,13 @@ 
 										$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 				{
 										if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown',$type,$name);
 					else if(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
-				}
-				else
+				} else
 				{
 										if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
 					{
@@ -9055,8 +8997,7 @@ 
 							throw new TConfigurationException('template_property_readonly',$type,$name);
 						else
 							throw new TConfigurationException('template_property_unknown',$type,$name);
-					}
-					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
+					} else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name,'id')===0)
 							throw new TConfigurationException('template_controlid_invalid',$type);
@@ -9065,8 +9006,7 @@ 
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		} else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
@@ -9077,8 +9017,7 @@ 
 										$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 					throw new TConfigurationException('template_event_forbidden',$type,$name);
 				else
 				{
@@ -9091,8 +9030,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required',$type);
 	}
 	public function getIncludedFiles()
@@ -9112,8 +9050,7 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}
@@ -9299,8 +9236,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins=$skins;
-				}
-				else
+				} else
 				{
 					$cacheValid=true;
 					$this->_cssFiles=$cssFiles;
@@ -9425,19 +9361,15 @@ 
 							{
 								$setter='set'.$name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly',$type,$name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined',$type,$name);
-					}
-					else							$control->setSubProperty($name,$value);
+					} else							$control->setSubProperty($name,$value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 	public function getStyleSheetFiles()
@@ -9484,8 +9416,9 @@ 
 	protected function initPageContext($pageConfig)
 	{
 		$application=$this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
-			$application->applyConfiguration($appConfig);
+		foreach($pageConfig->getApplicationConfigurations() as $appConfig) {
+					$application->applyConfiguration($appConfig);
+		}
 		$this->applyConfiguration($pageConfig);
 	}
 	protected function applyConfiguration($config)
@@ -9530,8 +9463,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -9548,8 +9480,7 @@ 
 							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
 							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
 								$configCached=false;
-						}
-						else
+						} else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
 							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
@@ -9557,8 +9488,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -9701,8 +9631,7 @@ 
 			$className=basename($path);
 			if(!class_exists($className,false))
 				include_once($path.Prado::CLASS_FILE_EXT);
-		}
-		else
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
@@ -9719,8 +9648,9 @@ 
 	}
 	protected function runPage($page,$properties)
 	{
-		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+		foreach($properties as $name=>$value) {
+					$page->setSubProperty($name,$value);
+		}
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
@@ -9784,8 +9714,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
@@ -10028,8 +9957,7 @@ 
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath,$dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -10100,8 +10028,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
@@ -10230,8 +10157,7 @@ 
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
 					chmod($config['source'], PRADO_CHMOD); 				}
-			}
-			else
+			} else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
@@ -10261,8 +10187,9 @@ 
 		if($culture===null) $culture = $this->getCulture();
 		$variants = explode('_', $culture);
 		$result = array();
-		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+		for(; count($variants) > 0; array_pop($variants)) {
+					$result[] = implode('_', $variants);
+		}
 		return $result;
 	}
 	public function getLocalizedResource($file,$culture=null)
@@ -10270,11 +10197,13 @@ 
 		$files = array();
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		}
 		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		}
 		$files[] = $file;
 		return $files;
 	}
@@ -10362,8 +10291,7 @@ 
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
-		}
-		else
+		} else
 			$configFile=null;
 				$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
 		if(is_writable($runtimePath))
@@ -10380,8 +10308,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 	}
 	public function run()
@@ -10402,8 +10329,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -10728,14 +10654,17 @@ 
 	{
 		if($config->getIsEmpty())
 			return;
-				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);
+		}
 				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));
@@ -10744,11 +10673,11 @@ 
 			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
+			} else
 				$this->_parameters->add($id,$parameter);
 		}
 				$modules=array();
@@ -10760,10 +10689,12 @@ 
 			if($module = $this->internalLoadModule($id))
 				$modules[]=$module;
 		}
-		foreach($modules as $module)
-			$module[0]->init($module[1]);
-				foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
+		foreach($modules as $module) {
+					$module[0]->init($module[1]);
+		}
+				foreach($config->getServices() as $serviceID=>$serviceConfig) {
+							$this->_services[$serviceID]=$serviceConfig;
+				}
 				foreach($config->getExternalConfigurations() as $filePath=>$condition)
 		{
 			if($condition!==true)
@@ -10789,8 +10720,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
-			}
-			else
+			} else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 			$this->applyConfiguration($config,false);
 		}
@@ -10810,8 +10740,9 @@ 
 				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;
@@ -10822,8 +10753,7 @@ 
 				$this->applyConfiguration($config,true);
 			}
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 	public function onError($param)
@@ -10915,8 +10845,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -11023,8 +10952,7 @@ 
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined',$id);
 						$this->_aliases[$id]=$p;
-					}
-					else
+					} else
 						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty=false;
 					break;
@@ -11079,8 +11007,7 @@ 
 				else
 					$this->_modules[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 		}
 	}
@@ -11112,8 +11039,7 @@ 
 				$element->setParent(null);
 				$this->_services[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 		}
 	}
@@ -11131,8 +11057,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -11153,12 +11078,10 @@ 
 						$this->_parameters[$id]=$element;
 					else
 						$this->_parameters[$id]=$value;
-				}
-				else
+				} else
 					$this->_parameters[$id]=array($type,$properties->toArray());
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 		}
 	}