pradosoft / prado

framework/Web/UI/ActiveControls/TActiveTableRowEventParameter.php

Doc Comments +1 added lines

@@ -37,6 +37,7 @@
 
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
+	 * @param \Prado\Web\THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index = -1)
 	{

Spacing +3 added lines, -3 removed lines

@@ -33,15 +33,15 @@
 	/**
 	 * @var integer the zero-based index of the row.
 	 */
-	private $_selectedRowIndex = -1;
+	private $_selectedRowIndex=-1;
 
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
 	 */
-	public function __construct($response, $parameter, $index = -1)
+	public function __construct($response, $parameter, $index=-1)
 	{
 		parent::__construct($response, $parameter);
-		$this->_selectedRowIndex = $index;
+		$this->_selectedRowIndex=$index;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php

Doc Comments +2 added lines

@@ -60,6 +60,7 @@ 
 	/**
 	 * Sets the client side options. Can only be set when client side is null.
 	 * @param TCallbackClientSide client side options.
+	 * @param TActiveCustomValidatorClientSide $client
 	 */
 	public function setClientSide($client)
 	{
@@ -226,6 +227,7 @@ 
 	 * {@link getClientSide ClientSide} property.
 	 * @param string client side javascript class name.
 	 * @param array additional callback options.
+	 * @param string $class
 	 */
 	public function registerCallbackClientScript($class, $options = null)
 	{

Spacing +25 added lines, -25 removed lines

@@ -49,9 +49,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if(($client = $this->getOption('ClientSide')) === null)
+		if(($client=$this->getOption('ClientSide'))===null)
 		{
-			$client = $this->createClientSide();
+			$client=$this->createClientSide();
 			$this->setOption('ClientSide', $client);
 		}
 		return $client;
@@ -63,7 +63,7 @@ 
 	 */
 	public function setClientSide($client)
 	{
-		if($this->getOption('ClientSide') === null)
+		if($this->getOption('ClientSide')===null)
 			$this->setOption('ClientSide', $client);
 		else
 			throw new TConfigurationException(
@@ -108,20 +108,20 @@ 
 	 */
 	protected function getDefaultClientSideOptions()
 	{
-		if(($id = $this->getCallbackOptions()) !== '')
+		if(($id=$this->getCallbackOptions())!=='')
 		{
-			if(($pos = strrpos($id, '.')) !== false)
+			if(($pos=strrpos($id, '.'))!==false)
 			{
-				$control = $this->getControl()->getSubProperty(substr($id, 0, $pos));
-				$newid = substr($id, $pos + 1);
-				if ($control !== null)
-					$control = $control->$newid;
+				$control=$this->getControl()->getSubProperty(substr($id, 0, $pos));
+				$newid=substr($id, $pos + 1);
+				if($control!==null)
+					$control=$control->$newid;
 			}
 			else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
-				$control = $this->getControl()->findControl($id, true);
+				$control=$this->getControl()->findControl($id, true);
 			}
 
 			if($control instanceof TCallbackOptions)
@@ -177,7 +177,7 @@ 
 	{
 		if($this->getCausesValidation())
 		{
-			$group = $this->getValidationGroup();
+			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
@@ -206,15 +206,15 @@ 
 	 */
 	protected function getClientSideOptions()
 	{
-		$default = $this->getDefaultClientSideOptions();
-		$options = array_merge($default, $this->getClientSide()->getOptions()->toArray());
-		$validate = $this->getCausesValidation();
-		$options['CausesValidation'] = $validate ? '' : false;
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CallbackParameter'] = $this->getCallbackParameter();
+		$default=$this->getDefaultClientSideOptions();
+		$options=array_merge($default, $this->getClientSide()->getOptions()->toArray());
+		$validate=$this->getCausesValidation();
+		$options['CausesValidation']=$validate ? '' : false;
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CallbackParameter']=$this->getCallbackParameter();
 		// needed for TCallback
 		if(!isset($options['EventTarget']))
-			$options['EventTarget'] = $this->getControl()->getUniqueID();
+			$options['EventTarget']=$this->getControl()->getUniqueID();
 		return $options;
 	}
 
@@ -227,17 +227,17 @@ 
 	 * @param string client side javascript class name.
 	 * @param array additional callback options.
 	 */
-	public function registerCallbackClientScript($class, $options = null)
+	public function registerCallbackClientScript($class, $options=null)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		if(is_array($options))
-			$options = array_merge($this->getClientSideOptions(), $options);
+			$options=array_merge($this->getClientSideOptions(), $options);
 		else
-			$options = $this->getClientSideOptions();
+			$options=$this->getClientSideOptions();
 
 		//remove true as default to save bytes
-		if($options['CausesValidation'] === true)
-			$options['CausesValidation'] = '';
+		if($options['CausesValidation']===true)
+			$options['CausesValidation']='';
 		$cs->registerCallbackControl($class, $options);
 	}
 
@@ -262,7 +262,7 @@ 
 	 */
 	public function getJavascript()
 	{
-		$client = $this->getPage()->getClientScript();
+		$client=$this->getPage()->getClientScript();
 		return $client->getCallbackReference($this->getControl(), $this->getClientSideOptions());
 	}
 

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
 				$newid = substr($id, $pos + 1);
 				if ($control !== null)
 					$control = $control->$newid;
-			}
-			else
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
@@ -179,8 +178,7 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/ActiveControls/TBaseActiveControl.php

Doc Comments +5 added lines, -1 removed lines

@@ -58,6 +58,8 @@ 
 	 * @param string option name.
 	 * @param mixed new value.
 	 * @param mixed default value.
+	 * @param string $name
+	 * @param string|boolean $default
 	 * @return mixed options value.
 	 */
 	protected function setOption($name, $value, $default = null)
@@ -72,6 +74,8 @@ 
 	 * named values for the base active controls.
 	 * @param string option name.
 	 * @param mixed default value.
+	 * @param string $name
+	 * @param string|boolean $default
 	 * @return mixed options value.
 	 */
 	protected function getOption($name, $default = null)
@@ -89,7 +93,7 @@ 
 	}
 
 	/**
-	 * @return TPage the page containing the attached control.
+	 * @return \Prado\Web\UI\TPage the page containing the attached control.
 	 */
 	protected function getPage()
 	{

Spacing +10 added lines, -10 removed lines

@@ -48,8 +48,8 @@ 
 	 */
 	public function __construct($control)
 	{
-		$this->_control = $control;
-		$this->_options = new TMap;
+		$this->_control=$control;
+		$this->_options=new TMap;
 	}
 
 	/**
@@ -60,10 +60,10 @@ 
 	 * @param mixed default value.
 	 * @return mixed options value.
 	 */
-	protected function setOption($name, $value, $default = null)
+	protected function setOption($name, $value, $default=null)
 	{
-		$value = ($value === null) ? $default : $value;
-		if($value !== null)
+		$value=($value===null) ? $default : $value;
+		if($value!==null)
 			$this->_options->add($name, $value);
 	}
 
@@ -74,10 +74,10 @@ 
 	 * @param mixed default value.
 	 * @return mixed options value.
 	 */
-	protected function getOption($name, $default = null)
+	protected function getOption($name, $default=null)
 	{
-		$item = $this->_options->itemAt($name);
-		return ($item === null) ? $default : $item;
+		$item=$this->_options->itemAt($name);
+		return ($item===null) ? $default : $item;
 	}
 
 	/**
@@ -128,10 +128,10 @@ 
 	 * @return boolean true if the callback response is allowed update
 	 * client-side contents.
 	 */
-	public function canUpdateClientSide($bDontRequireVisibility = false)
+	public function canUpdateClientSide($bDontRequireVisibility=false)
 	{
 		return 	$this->getControl()->getHasChildInitialized()
-				&& $this->getPage()->getIsLoadingPostData() == false
+				&& $this->getPage()->getIsLoadingPostData()==false
 				&& $this->getPage()->getIsCallback()
 				&& $this->getEnableUpdate()
 				&& ($bDontRequireVisibility || $this->getControl()->getVisible());

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Doc Comments +8 added lines

@@ -95,6 +95,7 @@ 
 	 * Executes a client-side statement.
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
+	 * @param string $function
 	 */
 	public function callClientFunction($function, $params = [])
 	{
@@ -155,6 +156,7 @@ 
 	 * @param string selection method
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
+	 * @param string $type
 	 */
 	public function select($control, $method = 'Value', $value = null, $type = null)
 	{
@@ -424,6 +426,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content.
+	 * @param boolean $self
 	 * @see insertAbout
 	 * @see insertBelow
 	 * @see insertBefore
@@ -482,6 +485,7 @@ 
 	 * Similar to to evaluateScript(), but functions declared in the
 	 * inline block will be available to page elements.
 	 * @param THtmlWriter writer for the content.
+	 * @param \Prado\TComponent $content
 	 */
 	public function appendScriptBlock($content)
 	{
@@ -503,6 +507,7 @@ 
 	 * component developers. The render() method is defered to be called in the
 	 * TActivePageAdapter class.
 	 * @param TControl control to be rendered on callback response.
+	 * @param TControl $control
 	 * @return string the boundary for which the rendered content is wrapped.
 	 */
 	private function getRenderedContentBoundary($control)
@@ -515,6 +520,7 @@ 
 
 	/**
 	 * @param THtmlWriter the writer responsible for rendering html content.
+	 * @param THtmlWriter $html
 	 * @return string content boundary.
 	 */
 	private function getResponseContentBoundary($html)
@@ -534,6 +540,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
+	 * @param string $type
 	 */
 	public function visualEffect($type, $element, $options = [])
 	{
@@ -641,6 +648,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array effect options.
+	 * @param string $effect
 	 */
 	public function juiEffect($element, $effect, $options = [])
 	{

Spacing +83 added lines, -83 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_actions = new TList;
+		$this->_actions=new TList;
 	}
 
 	/**
@@ -96,17 +96,17 @@ 
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
 	 */
-	public function callClientFunction($function, $params = [])
+	public function callClientFunction($function, $params=[])
 	{
 		if(!is_array($params))
-			$params = [$params];
+			$params=[$params];
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
+			if($params[0] instanceof ISurroundable)
+				$params[0]=$params[0]->getSurroundingTagID();
 			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+				$params[0]=$params[0]->getClientID();
 		}
 		$this->_actions->add([$function => $params]);
 	}
@@ -117,15 +117,15 @@ 
 	 * @param string jQuery method name
 	 * @param array list of arguments for the function
 	 */
-	public function jQuery($element, $method, $params = [])
+	public function jQuery($element, $method, $params=[])
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
+		if($element instanceof ISurroundable)
+			$element=$element->getSurroundingTagID();
 		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+			$element=$element->getClientID();
 
 		if(!is_array($params))
-			$params = [$params];
+			$params=[$params];
 
 		$this->_actions->add(['Prado.Element.j' => [$element, $method, $params]]);
 	}
@@ -156,19 +156,19 @@ 
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
 	 */
-	public function select($control, $method = 'Value', $value = null, $type = null)
+	public function select($control, $method='Value', $value=null, $type=null)
 	{
-		$method = TPropertyValue::ensureEnum($method,
+		$method=TPropertyValue::ensureEnum($method,
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
-		$type = ($type === null) ? $this->getSelectionControlType($control) : $type;
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
 		if($control instanceof TControl)
-			$control = $control->getClientID();
+			$control=$control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
-				[$control, $type . $method, $value, $total]);
+				[$control, $type.$method, $value, $total]);
 	}
 
 	private function getSelectionControlType($control)
@@ -201,7 +201,7 @@ 
 	 * @param TControl control element or element id
 	 * @param boolean check or uncheck the checkbox or radio button.
 	 */
-	public function check($checkbox, $checked = true)
+	public function check($checkbox, $checked=true)
 	{
 		$this->select($checkbox, "Value", $checked);
 	}
@@ -225,8 +225,8 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name) !== 'disabled')
-			$control = $control->getSurroundingTagID();
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
+			$control=$control->getSurroundingTagID();
 		$this->callClientFunction('Prado.Element.setAttribute', [$control, $name, $value]);
 	}
 
@@ -237,25 +237,25 @@ 
 	 */
 	public function setListItems($control, $items)
 	{
-		$options = [];
+		$options=[];
 		if($control instanceof TListControl)
 		{
-			$promptText = $control->getPromptText();
-			$promptValue = $control->getPromptValue();
+			$promptText=$control->getPromptText();
+			$promptValue=$control->getPromptValue();
 
-			if($promptValue === '')
-				$promptValue = $promptText;
+			if($promptValue==='')
+				$promptValue=$promptText;
 
-			if($promptValue !== '')
-				$options[] = [$promptText, $promptValue];
+			if($promptValue!=='')
+				$options[]=[$promptText, $promptValue];
 		}
 
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
-				$options[] = [$item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group')];
+				$options[]=[$item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group')];
 			else
-				$options[] = [$item->getText(),$item->getValue()];
+				$options[]=[$item->getText(), $item->getValue()];
 		}
 		$this->callClientFunction('Prado.Element.setOptions', [$control, $options]);
 	}
@@ -284,21 +284,21 @@ 
 	 * @param string visual effect, such as, 'fade' or 'slide'.
 	 * @param array additional options.
 	 */
-	public function toggle($element, $effect = null, $options = [])
+	public function toggle($element, $effect=null, $options=[])
 	{
 		switch(strtolower($effect))
 		{
 			case 'fade':
-				$method = 'fadeToggle';
+				$method='fadeToggle';
 				break;
 			case 'slide':
-				$method = 'slideToggle';
+				$method='slideToggle';
 				break;
 			default:
-				$method = 'toggle';
+				$method='toggle';
 				// avoid fancy effect by default
 				if(!array_key_exists('duration', $options))
-					$options['duration'] = 0;
+					$options['duration']=0;
 				break;
 		}
 		$this->jQuery($element, $method, $options);
@@ -351,7 +351,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array additional options: 'duration' in ms, 'offset' from the top in pixels
 	 */
-	public function scrollTo($element, $options = [])
+	public function scrollTo($element, $options=[])
 	{
 		$this->callClientFunction('Prado.Element.scrollTo', [$element, $options]);
 	}
@@ -433,16 +433,16 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
-			$content = null;
+			$boundary=$this->getRenderedContentBoundary($content);
+			$content=null;
 		}
 		elseif($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($content);
+			$content=null;
 		}
 		else
-			$boundary = null;
+			$boundary=null;
 
 		$this->callClientFunction('Prado.Element.replace', [$element, $content, $boundary, $self]);
 	}
@@ -453,7 +453,7 @@ 
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content, defaults to true.
 	 */
-	public function replaceContent($element, $content, $self = true)
+	public function replaceContent($element, $content, $self=true)
 	{
 		$this->replace($element, $content, $self);
 	}
@@ -467,11 +467,11 @@ 
 	{
 		if($writer instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($writer);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($writer);
+			$content=null;
 		} else {
-			$boundary = null;
-			$content = $writer;
+			$boundary=null;
+			$content=$writer;
 		}
 
 		$this->callClientFunction('Prado.Element.evaluateScript', [$content, $boundary]);
@@ -487,11 +487,11 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
+			$boundary=$this->getRenderedContentBoundary($content);
 		}
 		elseif($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
+			$boundary=$this->getResponseContentBoundary($content);
 		}
 
 		$this->callClientFunction('Prado.Element.appendScriptBlock', [$boundary]);
@@ -507,8 +507,8 @@ 
 	 */
 	private function getRenderedContentBoundary($control)
 	{
-		$writer = $this->getResponse()->createHtmlWriter();
-		$adapter = $control->getPage()->getAdapter();
+		$writer=$this->getResponse()->createHtmlWriter();
+		$adapter=$control->getPage()->getAdapter();
 		$adapter->registerControlToRender($control, $writer);
 		return $writer->getWriter()->getBoundary();
 	}
@@ -535,7 +535,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function visualEffect($type, $element, $options = [])
+	public function visualEffect($type, $element, $options=[])
 	{
 		$this->jQuery($element, $type, $options);
 	}
@@ -548,7 +548,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fadeIn($element, $options = [])
+	public function fadeIn($element, $options=[])
 	{
 		$this->visualEffect('fadeIn', $element, $options);
 	}
@@ -559,7 +559,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fadeOut($element, $options = [])
+	public function fadeOut($element, $options=[])
 	{
 		$this->visualEffect('fadeOut', $element, $options);
 	}
@@ -570,9 +570,9 @@ 
 	 * @param TControl control element or element id
 	 * @param float opacity value between 1 and 0
 	 */
-	public function fadeTo($element, $value, $duration = 500)
+	public function fadeTo($element, $value, $duration=500)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->visualEffect('fadeTo', $element, [$duration, $value]);
 	}
 
@@ -582,7 +582,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function slideDown($element, $options = [])
+	public function slideDown($element, $options=[])
 	{
 		$this->visualEffect('slideDown', $element, $options);
 	}
@@ -593,7 +593,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function slideUp($element, $options = [])
+	public function slideUp($element, $options=[])
 	{
 		$this->visualEffect('slideUp', $element, $options);
 	}
@@ -606,7 +606,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function appear($element, $options = [])
+	public function appear($element, $options=[])
 	{
 		$this->fadeIn($element, $options);
 	}
@@ -617,7 +617,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fade($element, $options = [])
+	public function fade($element, $options=[])
 	{
 		$this->fadeOut($element, $options);
 	}
@@ -642,9 +642,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array effect options.
 	 */
-	public function juiEffect($element, $effect, $options = [])
+	public function juiEffect($element, $effect, $options=[])
 	{
-		$options['effect'] = $effect;
+		$options['effect']=$effect;
 		$this->jQuery($element, 'effect', [$options]);
 	}
 
@@ -654,7 +654,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function blind($element, $options = [])
+	public function blind($element, $options=[])
 	{
 		$this->juiEffect($element, 'blind', $options);
 	}
@@ -665,7 +665,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function drop($element, $options = [])
+	public function drop($element, $options=[])
 	{
 		$this->juiEffect($element, 'drop', $options);
 	}
@@ -676,7 +676,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fold($element, $options = [])
+	public function fold($element, $options=[])
 	{
 		$this->juiEffect($element, 'fold', $options);
 	}
@@ -687,7 +687,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function size($element, $options = [])
+	public function size($element, $options=[])
 	{
 		$this->juiEffect($element, 'size', $options);
 	}
@@ -698,7 +698,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function puff($element, $options = [])
+	public function puff($element, $options=[])
 	{
 		$this->juiEffect($element, 'puff', $options);
 	}
@@ -709,7 +709,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function pulsate($element, $options = [])
+	public function pulsate($element, $options=[])
 	{
 		$this->juiEffect($element, 'pulsate', $options);
 	}
@@ -720,7 +720,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function shake($element, $options = [])
+	public function shake($element, $options=[])
 	{
 		$this->juiEffect($element, 'shake', $options);
 	}
@@ -731,7 +731,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function scale($element, $options = [])
+	public function scale($element, $options=[])
 	{
 		$this->juiEffect($element, 'scale', $options);
 	}
@@ -742,7 +742,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function highlight($element, $options = [])
+	public function highlight($element, $options=[])
 	{
 		$this->juiEffect($element, 'highlight', $options);
 	}
@@ -755,9 +755,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function blindDown($element, $options = [])
+	public function blindDown($element, $options=[])
 	{
-		$options['direction'] = 'down';
+		$options['direction']='down';
 		$this->blind($element, $options);
 	}
 
@@ -767,9 +767,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function blindUp($element, $options = [])
+	public function blindUp($element, $options=[])
 	{
-		$options['direction'] = 'up';
+		$options['direction']='up';
 		$this->blind($element, $options);
 	}
 
@@ -779,7 +779,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function dropOut($element, $options = [])
+	public function dropOut($element, $options=[])
 	{
 		$this->drop($element, $options);
 	}
@@ -790,7 +790,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function grow($element, $options = [])
+	public function grow($element, $options=[])
 	{
 		$this->size($element, $options);
 	}
@@ -801,9 +801,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function shrink($element, $options = [])
+	public function shrink($element, $options=[])
 	{
-		$options['percent'] = 0;
+		$options['percent']=0;
 		$this->scale($element, $options);
 	}
 
@@ -813,10 +813,10 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function squish($element, $options = [])
+	public function squish($element, $options=[])
 	{
-		$options['origin'] = ['top', 'left'];
-		$options['percent'] = 0;
+		$options['origin']=['top', 'left'];
+		$options['percent']=0;
 		$this->scale($element, $options);
 	}
 
@@ -826,10 +826,10 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function switchOff($element, $options = [])
+	public function switchOff($element, $options=[])
 	{
-		$options['direction'] = 'vertical';
-		$options['percent'] = 0;
+		$options['direction']='vertical';
+		$options['percent']=0;
 		$this->scale($element, $options);
 	}
 

framework/Web/UI/JuiControls/TJuiAutoCompleteEventParameter.php

Doc Comments +1 added lines

@@ -30,6 +30,7 @@
 
 	/**
 	 * Creates a new TCallbackEventParameter.
+	 * @param \Prado\Web\THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index = -1)
 	{

Spacing +3 added lines, -3 removed lines

@@ -26,15 +26,15 @@
  */
 class TJuiAutoCompleteEventParameter extends TCallbackEventParameter
 {
-	private $_selectedIndex = -1;
+	private $_selectedIndex=-1;
 
 	/**
 	 * Creates a new TCallbackEventParameter.
 	 */
-	public function __construct($response, $parameter, $index = -1)
+	public function __construct($response, $parameter, $index=-1)
 	{
 		parent::__construct($response, $parameter);
-		$this->_selectedIndex = $index;
+		$this->_selectedIndex=$index;
 	}
 
 	/**

framework/Web/UI/TClientScriptManager.php

Doc Comments +10 added lines, -1 removed lines

@@ -154,6 +154,7 @@ 
 	 * Registers Prado javascript by library name. See "Web/Javascripts/packages.php"
 	 * for library names.
 	 * @param string script library name.
+	 * @param string $name
 	 */
 	public function registerPradoScript($name)
 	{
@@ -267,7 +268,7 @@ 
 
 	/**
 	 * @param string javascript or css package path.
-	 * @return array tuple($path,$url).
+	 * @return string[] tuple($path,$url).
 	 */
 	protected function getPackagePathUrl($base)
 	{
@@ -359,6 +360,7 @@ 
 	 * the javascript code registration.
 	 * @param string javascript class responsible for the control being registered for postback
 	 * @param array postback options
+	 * @param string $class
 	 */
 	public function registerPostBackControl($class, $options)
 	{
@@ -438,6 +440,7 @@ 
 	 * Registers Prado style by library name. See "Web/Javascripts/packages.php"
 	 * for library names.
 	 * @param string style library name.
+	 * @param string $name
 	 */
 	public function registerPradoStyle($name)
 	{
@@ -618,6 +621,7 @@ 
 	 * Registers a javascript script block at the beginning of the form
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
+	 * @param string $key
 	 */
 	public function registerBeginScript($key, $script)
 	{
@@ -646,6 +650,7 @@ 
 	 * @param string a unique key identifying the hidden field
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
+	 * @param string $name
 	 */
 	public function registerHiddenField($name, $value)
 	{
@@ -657,6 +662,7 @@ 
 
 	/**
 	 * @param string a unique key
+	 * @param string $key
 	 * @return boolean whether there is a CSS file registered with the specified key
 	 */
 	public function isStyleSheetFileRegistered($key)
@@ -693,6 +699,7 @@ 
 
 	/**
 	 * @param string a unique key
+	 * @param string $key
 	 * @return boolean whether there is a javascript file registered with the specified key
 	 */
 	public function isScriptFileRegistered($key)
@@ -873,6 +880,7 @@ 
 	 * Flushes all pending script registrations
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param TControl the control forcing the flush (used only in error messages)
+	 * @param WebControls\TClientScript $control
 	 */
 	public function flushScriptFiles($writer, $control = null)
 	{
@@ -889,6 +897,7 @@ 
 	 * Unfortunately this attribute is invalid for hidden fields, so text fields are
 	 * rendered instead (#642).
 	 * @param THtmlWriter writer for the rendering purpose
+	 * @param boolean $initial
 	 */
 
 	protected function renderHiddenFieldsInt($writer, $initial)

Spacing +156 added lines, -156 removed lines

@@ -34,11 +34,11 @@ 
 	/**
 	 * file containing javascript packages and their cross dependencies
 	 */
-	const PACKAGES_FILE = 'Web/Javascripts/packages.php';
+	const PACKAGES_FILE='Web/Javascripts/packages.php';
 	/**
 	 * file containing css packages and their cross dependencies
 	 */
-	const CSS_PACKAGES_FILE = 'Web/Javascripts/css-packages.php';
+	const CSS_PACKAGES_FILE='Web/Javascripts/css-packages.php';
 	/**
 	 * @var TPage page who owns this manager
 	 */
@@ -46,39 +46,39 @@ 
 	/**
 	 * @var array registered hidden fields, indexed by hidden field names
 	 */
-	private $_hiddenFields = [];
+	private $_hiddenFields=[];
 	/**
 	 * @var array javascript blocks to be rendered at the beginning of the form
 	 */
-	private $_beginScripts = [];
+	private $_beginScripts=[];
 	/**
 	 * @var array javascript blocks to be rendered at the end of the form
 	 */
-	private $_endScripts = [];
+	private $_endScripts=[];
 	/**
 	 * @var array javascript files to be rendered in the form
 	 */
-	private $_scriptFiles = [];
+	private $_scriptFiles=[];
 	/**
 	 * @var array javascript files to be rendered in page head section
 	 */
-	private $_headScriptFiles = [];
+	private $_headScriptFiles=[];
 	/**
 	 * @var array javascript blocks to be rendered in page head section
 	 */
-	private $_headScripts = [];
+	private $_headScripts=[];
 	/**
 	 * @var array CSS files
 	 */
-	private $_styleSheetFiles = [];
+	private $_styleSheetFiles=[];
 	/**
 	 * @var array CSS declarations
 	 */
-	private $_styleSheets = [];
+	private $_styleSheets=[];
 	/**
 	 * @var array registered PRADO script libraries
 	 */
-	private $_registeredScripts = [];
+	private $_registeredScripts=[];
 	/**
 	 * Client-side javascript library dependencies, loads from PACKAGES_FILE;
 	 * @var array
@@ -97,7 +97,7 @@ 
 	/**
 	 * @var array registered PRADO style libraries
 	 */
-	private $_registeredStyles = [];
+	private $_registeredStyles=[];
 	/**
 	 * Client-side style library dependencies, loads from CSS_PACKAGES_FILE;
 	 * @var array
@@ -116,7 +116,7 @@ 
 
 	private $_renderedHiddenFields;
 
-	private $_renderedScriptFiles = [];
+	private $_renderedScriptFiles=[];
 
 	private $_expandedScripts;
 	private $_expandedStyles;
@@ -127,7 +127,7 @@ 
 	 */
 	public function __construct(TPage $owner)
 	{
-		$this->_page = $owner;
+		$this->_page=$owner;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	public function registerPradoScript($name)
 	{
 		$this->registerPradoScriptInternal($name);
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
@@ -170,50 +170,50 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredScripts[$name]))
 		{
-			if(self::$_scripts === null)
+			if(self::$_scripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
-				list($folders, $packages, $deps) = include($packageFile);
-				self::$_scriptsFolders = $folders;
-				self::$_scripts = $deps;
-				self::$_scriptsPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($folders, $packages, $deps)=include($packageFile);
+				self::$_scriptsFolders=$folders;
+				self::$_scripts=$deps;
+				self::$_scriptsPackages=$packages;
 			}
 
-			if (isset(self::$_scripts[$name]))
-				$this->_registeredScripts[$name] = true;
+			if(isset(self::$_scripts[$name]))
+				$this->_registeredScripts[$name]=true;
 			else
 				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
-			if(($packages = array_keys($this->_registeredScripts)) !== [])
+			if(($packages=array_keys($this->_registeredScripts))!==[])
 			{
-				$packagesUrl = [];
-				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
-				foreach ($packages as $p)
+				$packagesUrl=[];
+				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				foreach($packages as $p)
 				{
-					foreach (self::$_scripts[$p] as $dep)
+					foreach(self::$_scripts[$p] as $dep)
 					{
-						foreach (self::$_scriptsPackages[$dep] as $script)
+						foreach(self::$_scriptsPackages[$dep] as $script)
 						{
-							if (!isset($this->_expandedScripts[$script]))
+							if(!isset($this->_expandedScripts[$script]))
 							{
-								list($base, $subPath) = $this->getScriptPackageFolder($script);
-								list($path, $baseUrl) = $this->getPackagePathUrl($base);
+								list($base, $subPath)=$this->getScriptPackageFolder($script);
+								list($path, $baseUrl)=$this->getPackagePathUrl($base);
 
-								$this->_expandedScripts[$script] = true;
+								$this->_expandedScripts[$script]=true;
 								if($isDebug)
 								{
-									if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
-										$packagesUrl[] = $url;
+									if(!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
+										$packagesUrl[]=$url;
 								} else {
-								  $minPath = preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
-								  if (!in_array($url = $baseUrl . '/' . $minPath, $packagesUrl))
+								  $minPath=preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
+								  if(!in_array($url=$baseUrl.'/'.$minPath, $packagesUrl))
 									{
-										if(!is_file($filePath = $path . DIRECTORY_SEPARATOR . $minPath))
+										if(!is_file($filePath=$path.DIRECTORY_SEPARATOR.$minPath))
 										{
-											file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base . '/' . $subPath)));
+											file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$subPath)));
 											chmod($filePath, PRADO_CHMOD);
 										}
-										$packagesUrl[] = $url;
+										$packagesUrl[]=$url;
 									}
 								}
 							}
@@ -229,26 +229,26 @@ 
 	/**
 	 * @return string Prado javascript library base asset url.
 	 */
-	public function getPradoScriptAssetUrl($script = 'prado')
+	public function getPradoScriptAssetUrl($script='prado')
 	{
 		if(!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
-		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 
 	/**
 	 * @return string Prado javascript library base asset path in local filesystem.
 	 */
-	public function getPradoScriptAssetPath($script = 'prado')
+	public function getPradoScriptAssetPath($script='prado')
 	{
 		if(!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
-		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedPath($base);
 	}
 
@@ -258,9 +258,9 @@ 
 	 */
 	public function getScriptUrls()
 	{
-		$scripts = array_values($this->_headScriptFiles);
-		$scripts = array_merge($scripts, array_values($this->_scriptFiles));
-		$scripts = array_unique($scripts);
+		$scripts=array_values($this->_headScriptFiles);
+		$scripts=array_merge($scripts, array_values($this->_scriptFiles));
+		$scripts=array_unique($scripts);
 
 		return $scripts;
 	}
@@ -271,14 +271,14 @@ 
 	 */
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl()) === false)
+		$assets=Prado::getApplication()->getAssetManager();
+		if(strpos($base, $assets->getBaseUrl())===false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
 		}
 		else
 		{
-			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
+			return [$assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
 	}
 
@@ -288,14 +288,14 @@ 
 	 */
 	protected function getScriptPackageFolder($script)
 	{
-		list($base, $subPath) = explode("/", $script, 2);
+		list($base, $subPath)=explode("/", $script, 2);
 
 		if(!array_key_exists($base, self::$_scriptsFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
-		$namespace = self::$_scriptsFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
-		  $namespace = $dir;
+		$namespace=self::$_scriptsFolders[$base];
+		if(($dir=Prado::getPathOfNameSpace($namespace))!==null) {
+		  $namespace=$dir;
 		}
 
 		return [$namespace, $subPath];
@@ -307,14 +307,14 @@ 
 	 */
 	protected function getStylePackageFolder($script)
 	{
-		list($base, $subPath) = explode("/", $script, 2);
+		list($base, $subPath)=explode("/", $script, 2);
 
 		if(!array_key_exists($base, self::$_stylesFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
-		$namespace = self::$_stylesFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
-		  $namespace = $dir;
+		$namespace=self::$_stylesFolders[$base];
+		if(($dir=Prado::getPathOfNameSpace($namespace))!==null) {
+		  $namespace=$dir;
 		}
 
 		return [$namespace, $subPath];
@@ -326,15 +326,15 @@ 
 	 * @param array additional callback options
 	 * @return string javascript statement that creates a new callback request.
 	 */
-	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options = null)
+	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
 	{
-		$options = !is_array($options) ? [] : $options;
-		$class = new \ReflectionClass($callbackHandler);
-		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
-		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavaScript::encode($options);
+		$options=!is_array($options) ? [] : $options;
+		$class=new \ReflectionClass($callbackHandler);
+		$clientSide=$callbackHandler->getActiveControl()->getClientSide();
+		$options=array_merge($options, $clientSide->getOptions()->toArray());
+		$optionString=TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
-		$id = $callbackHandler->getUniqueID();
+		$id=$callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
 	}
 
@@ -345,12 +345,12 @@ 
 	 */
 	public function registerCallbackControl($class, $options)
 	{
-		$optionString = TJavaScript::encode($options);
-		$code = "new {$class}({$optionString});";
-		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
+		$optionString=TJavaScript::encode($options);
+		$code="new {$class}({$optionString});";
+		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
 		$this->registerPradoScriptInternal('ajax');
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
@@ -362,18 +362,18 @@ 
 	 */
 	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if($class===null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
-			$options['FormID'] = $form->getClientID();
-		$optionString = TJavaScript::encode($options);
-		$code = "new {$class}({$optionString});";
+		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
+			$options['FormID']=$form->getClientID();
+		$optionString=TJavaScript::encode($options);
+		$code="new {$class}({$optionString});";
 
-		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
+		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
@@ -385,22 +385,22 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID = is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID=is_string($panel) ? $panel : $panel->getUniqueID();
 
 		if(is_string($button))
-			$buttonID = $button;
+			$buttonID=$button;
 		else
 		{
 			$button->setIsDefaultButton(true);
-			$buttonID = $button->getUniqueID();
+			$buttonID=$button->getUniqueID();
 		}
-		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
-		$code = "new Prado.WebUI.DefaultButton($options);";
+		$options=TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
+		$code="new Prado.WebUI.DefaultButton($options);";
 
-		$this->_endScripts['prado:' . $panelID] = $code;
+		$this->_endScripts['prado:'.$panelID]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params = [$panelID,$buttonID];
+		$params=[$panelID, $buttonID];
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
@@ -411,11 +411,11 @@ 
 	 */
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
-		$options['ID'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
-		$options['EventTarget'] = $buttonID;
-		$options['Event'] = 'click';
+		$options['ID']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Panel']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Target']=TControl::convertUniqueIdToClientId($buttonID);
+		$options['EventTarget']=$buttonID;
+		$options['Event']='click';
 		return $options;
 	}
 
@@ -427,10 +427,10 @@ 
 	{
 		$this->registerPradoScriptInternal('jquery');
 		if($target instanceof TControl)
-			$target = $target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
+			$target=$target->getClientID();
+		$this->_endScripts['prado:focus']='jQuery(\'#'.$target.'\').focus();';
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
@@ -442,7 +442,7 @@ 
 	public function registerPradoStyle($name)
 	{
 		$this->registerPradoStyleInternal($name);
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoStyle', $params);
 	}
 
@@ -454,39 +454,39 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredStyles[$name]))
 		{
-			if(self::$_styles === null)
+			if(self::$_styles===null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::CSS_PACKAGES_FILE;
-				list($folders, $packages, $deps) = include($packageFile);
-				self::$_stylesFolders = $folders;
-				self::$_styles = $deps;
-				self::$_stylesPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
+				list($folders, $packages, $deps)=include($packageFile);
+				self::$_stylesFolders=$folders;
+				self::$_styles=$deps;
+				self::$_stylesPackages=$packages;
 			}
 
-			if (isset(self::$_styles[$name]))
-				$this->_registeredStyles[$name] = true;
+			if(isset(self::$_styles[$name]))
+				$this->_registeredStyles[$name]=true;
 			else
 				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
-			if(($packages = array_keys($this->_registeredStyles)) !== [])
+			if(($packages=array_keys($this->_registeredStyles))!==[])
 			{
-				$packagesUrl = [];
-				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
-				foreach ($packages as $p)
+				$packagesUrl=[];
+				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				foreach($packages as $p)
 				{
-					foreach (self::$_styles[$p] as $dep)
+					foreach(self::$_styles[$p] as $dep)
 					{
-						foreach (self::$_stylesPackages[$dep] as $style)
+						foreach(self::$_stylesPackages[$dep] as $style)
 						{
-							if (!isset($this->_expandedStyles[$style]))
+							if(!isset($this->_expandedStyles[$style]))
 							{
-								list($base, $subPath) = $this->getStylePackageFolder($style);
-								list($path, $baseUrl) = $this->getPackagePathUrl($base);
+								list($base, $subPath)=$this->getStylePackageFolder($style);
+								list($path, $baseUrl)=$this->getPackagePathUrl($base);
 
-								$this->_expandedStyles[$style] = true;
+								$this->_expandedStyles[$style]=true;
 								// TODO minify css?
-								if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
-									$packagesUrl[] = $url;
+								if(!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
+									$packagesUrl[]=$url;
 							}
 						}
 					}
@@ -519,14 +519,14 @@ 
 	 * @param string URL to the CSS file
 	 * @param string media type of the CSS (such as 'print', 'screen', etc.). Defaults to empty, meaning the CSS applies to all media types.
 	 */
-	public function registerStyleSheetFile($key, $url, $media = '')
+	public function registerStyleSheetFile($key, $url, $media='')
 	{
-		if($media === '')
-			$this->_styleSheetFiles[$key] = $url;
+		if($media==='')
+			$this->_styleSheetFiles[$key]=$url;
 		else
-			$this->_styleSheetFiles[$key] = [$url,$media];
+			$this->_styleSheetFiles[$key]=[$url, $media];
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
@@ -535,11 +535,11 @@ 
 	 * @param string a unique key identifying the CSS block
 	 * @param string CSS block
 	 */
-	public function registerStyleSheet($key, $css, $media = '')
+	public function registerStyleSheet($key, $css, $media='')
 	{
-		$this->_styleSheets[$key] = $css;
+		$this->_styleSheets[$key]=$css;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
@@ -549,17 +549,17 @@ 
 	 */
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(function($e) {
 				return is_array($e) ? $e[0] : $e;
 			}, $this->_styleSheetFiles)
 		);
 
 		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
-			if (substr($url, strlen($url) - 4) == '.css')
-				$stylesheets[] = $url;
+			if(substr($url, strlen($url) - 4)=='.css')
+				$stylesheets[]=$url;
 
-		$stylesheets = array_unique($stylesheets);
+		$stylesheets=array_unique($stylesheets);
 
 		return $stylesheets;
 	}
@@ -581,9 +581,9 @@ 
 	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScriptFiles[$key] = $url;
+		$this->_headScriptFiles[$key]=$url;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
@@ -595,9 +595,9 @@ 
 	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScripts[$key] = $script;
+		$this->_headScripts[$key]=$script;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
@@ -608,9 +608,9 @@ 
 	 */
 	public function registerScriptFile($key, $url)
 	{
-		$this->_scriptFiles[$key] = $url;
+		$this->_scriptFiles[$key]=$url;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
@@ -622,9 +622,9 @@ 
 	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_beginScripts[$key] = $script;
+		$this->_beginScripts[$key]=$script;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
@@ -635,9 +635,9 @@ 
 	 */
 	public function registerEndScript($key, $script)
 	{
-		$this->_endScripts[$key] = $script;
+		$this->_endScripts[$key]=$script;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
@@ -649,9 +649,9 @@ 
 	 */
 	public function registerHiddenField($name, $value)
 	{
-		$this->_hiddenFields[$name] = $value;
+		$this->_hiddenFields[$name]=$value;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
@@ -748,13 +748,13 @@ 
 	 */
 	public function renderStyleSheetFiles($writer)
 	{
-		$str = '';
+		$str='';
 		foreach($this->_styleSheetFiles as $url)
 		{
 			if(is_array($url))
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
+				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
 			else
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
+				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
 		}
 		$writer->write($str);
 	}
@@ -765,7 +765,7 @@ 
 	public function renderStyleSheets($writer)
 	{
 		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -796,8 +796,8 @@ 
 
 	public function markScriptFileAsRendered($url)
 	{
-		$this->_renderedScriptFiles[$url] = $url;
-		$params = func_get_args();
+		$this->_renderedScriptFiles[$url]=$url;
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
@@ -822,7 +822,7 @@ 
 	{
 		if(!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$addedScripts=array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
 			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
@@ -874,7 +874,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param TControl the control forcing the flush (used only in error messages)
 	 */
-	public function flushScriptFiles($writer, $control = null)
+	public function flushScriptFiles($writer, $control=null)
 	{
 		if(!$this->_page->getIsCallback())
 		{
@@ -893,25 +893,25 @@ 
 
 	protected function renderHiddenFieldsInt($writer, $initial)
 	{
-		if ($initial) $this->_renderedHiddenFields = [];
-		$str = '';
+		if($initial) $this->_renderedHiddenFields=[];
+		$str='';
 		foreach($this->_hiddenFields as $name => $value)
 		{
-			if (in_array($name, $this->_renderedHiddenFields)) continue;
-			$id = strtr($name, ':', '_');
+			if(in_array($name, $this->_renderedHiddenFields)) continue;
+			$id=strtr($name, ':', '_');
 			if(is_array($value))
 			{
 				foreach($value as $v)
-					$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+					$str.='<input type="text" style="display:none" autocomplete="off" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			else
 			{
-				$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+				$str.='<input type="text" style="display:none" autocomplete="off" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
-			$this->_renderedHiddenFields[] = $name;
+			$this->_renderedHiddenFields[]=$name;
 		}
-		if($str !== '')
-			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
+		if($str!=='')
+			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
 	}
 
 	public function getHiddenFields()
@@ -924,7 +924,7 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new \Exception('Operation invalid when page is already rendering');
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -275,8 +275,7 @@ 
 		if(strpos($base, $assets->getBaseUrl()) === false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
-		}
-		else
+		} else
 		{
 			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
@@ -903,8 +902,7 @@ 
 			{
 				foreach($value as $v)
 					$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
-			}
-			else
+			} else
 			{
 				$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}

framework/Web/UI/TControl.php

Doc Comments +24 added lines, -2 removed lines

@@ -213,7 +213,7 @@ 
 	 * the control ID will take the precedence.
 	 *
 	 * @param string the property name or control ID
-	 * @return bool wether the control or property exists
+	 * @return boolean|null wether the control or property exists
 	 * @see __get
 	 */
 	public function __isset($name) {
@@ -290,6 +290,7 @@ 
 	 * Sets the page for a control.
 	 * Only framework developers should use this method.
 	 * @param TPage the page that contains this control
+	 * @param TPage $page
 	 */
 	public function setPage($page)
 	{
@@ -571,6 +572,7 @@ 
 
 	/**
 	 * @param boolean whether the control is visible
+	 * @param boolean $value
 	 */
 	public function setVisible($value)
 	{
@@ -638,6 +640,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return boolean whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -649,6 +652,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -663,6 +667,7 @@ 
 	 * Sets a custom control attribute.
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name, $value)
 	{
@@ -700,6 +705,7 @@ 
 
 	/**
 	 * @param boolean set whether to enable viewstate
+	 * @param boolean $value
 	 */
 	public function setEnableViewState($value)
 	{
@@ -716,6 +722,8 @@ 
 	 * that must be kept in controlstate.
 	 * @param string the name of the controlstate value to be returned
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
+	 * @param string $key
+	 * @param integer $defaultValue
 	 * @return mixed the controlstate value corresponding to $key
 	 */
 	protected function getControlState($key, $defaultValue = null)
@@ -732,6 +740,8 @@ 
 	 * @param string the name of the controlstate value
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
+	 * @param string $key
+	 * @param integer $defaultValue
 	 */
 	protected function setControlState($key, $value, $defaultValue = null)
 	{
@@ -755,6 +765,7 @@ 
 	 * When it is false, data saved via setViewState() will not be persisted.
 	 * By default, it is true, meaning data will be persisted across postbacks.
 	 * @param boolean whether data should be persisted
+	 * @param boolean $enabled
 	 */
 	public function trackViewState($enabled)
 	{
@@ -768,6 +779,7 @@ 
 	 * that must be kept in viewstate.
 	 * @param string the name of the viewstate value to be returned
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
+	 * @param string $key
 	 * @return mixed the viewstate value corresponding to $key
 	 */
 	public function getViewState($key, $defaultValue = null)
@@ -793,6 +805,7 @@ 
 	 * @param string the name of the viewstate value
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
+	 * @param string $key
 	 */
 	public function setViewState($key, $value, $defaultValue = null)
 	{
@@ -814,6 +827,7 @@ 
 	/**
 	 * Clears a viewstate value.
 	 * @param string the name of the viewstate value to be cleared
+	 * @param string $key
 	 */
 	public function clearViewState($key)
 	{
@@ -919,6 +933,7 @@ 
 	 * Sets a value indicating whether child controls are created.
 	 * If false, any existing child controls will be cleared up.
 	 * @param boolean whether child controls are created
+	 * @param boolean $value
 	 */
 	final protected function setChildControlsCreated($value)
 	{
@@ -1009,6 +1024,7 @@ 
 	 * Finds all child and grand-child controls that are of the specified type.
 	 * @param string the class name
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
+	 * @param string $type
 	 * @return array list of controls found
 	 */
 	public function findControlsByType($type, $strict = true)
@@ -1069,7 +1085,7 @@ 
 	 * A registered object can be accessed like a public member variable.
 	 * This method should only be used by framework and control developers.
 	 * @param string name of the object
-	 * @param object object to be declared
+	 * @param object WebControls\TCheckBox to be declared
 	 * @see __get
 	 */
 	public function registerObject($name, $object)
@@ -1143,6 +1159,7 @@ 
 	 * A component with explicit ID on a template will be registered to
 	 * the template owner. This method allows you to obtain this component
 	 * with the ID.
+	 * @param string $name
 	 * @return mixed the named registered object. Null if object is not found.
 	 */
 	public function getRegisteredObject($name)
@@ -1200,6 +1217,7 @@ 
 	 * Control lifecycles will be caught up during the addition.
 	 * Only framework developers should use this method.
 	 * @param TControl the new child control
+	 * @param TControl $control
 	 */
 	public function addedControl($control)
 	{
@@ -1245,6 +1263,7 @@ 
 	 * Removes a control from the child collection of the control.
 	 * Only framework developers should use this method.
 	 * @param TControl the child control removed
+	 * @param TControl $control
 	 */
 	public function removedControl($control)
 	{
@@ -1496,6 +1515,7 @@ 
 	 * @param string name of the broadcast event
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
+	 * @param TBroadcastEventParameter $param
 	 */
 	private function broadcastEventInternal($name, $sender, $param)
 	{
@@ -1720,6 +1740,7 @@ 
 	 * Clears the cached UniqueID.
 	 * If $recursive=true, all children's cached UniqueID will be cleared as well.
 	 * @param boolean whether the clearing is recursive.
+	 * @param boolean $recursive
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
@@ -1757,6 +1778,7 @@ 
 	 * Updates the list of the controls whose IDs are managed by the specified naming container.
 	 * @param TControl the naming container
 	 * @param TControlCollection list of controls
+	 * @param TControl $container
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
 	private function fillNameTable($container, $controls)

Spacing +181 added lines, -181 removed lines

@@ -75,61 +75,61 @@ 
 	/**
 	 * format of control ID
 	 */
-	const ID_FORMAT = '/^[a-zA-Z_]\\w*$/';
+	const ID_FORMAT='/^[a-zA-Z_]\\w*$/';
 	/**
 	 * separator char between IDs in a UniqueID
 	 */
-	const ID_SEPARATOR = '$';
+	const ID_SEPARATOR='$';
 	/**
 	 * separator char between IDs in a ClientID
 	 */
-	const CLIENT_ID_SEPARATOR = '_';
+	const CLIENT_ID_SEPARATOR='_';
 	/**
 	 * prefix to an ID automatically generated
 	 */
-	const AUTOMATIC_ID_PREFIX = 'ctl';
+	const AUTOMATIC_ID_PREFIX='ctl';
 
 	/**
 	 * the stage of lifecycles that the control is currently at
 	 */
-	const CS_CONSTRUCTED = 0;
-	const CS_CHILD_INITIALIZED = 1;
-	const CS_INITIALIZED = 2;
-	const CS_STATE_LOADED = 3;
-	const CS_LOADED = 4;
-	const CS_PRERENDERED = 5;
+	const CS_CONSTRUCTED=0;
+	const CS_CHILD_INITIALIZED=1;
+	const CS_INITIALIZED=2;
+	const CS_STATE_LOADED=3;
+	const CS_LOADED=4;
+	const CS_PRERENDERED=5;
 
 	/**
 	 * State bits.
 	 */
-	const IS_ID_SET = 0x01;
-	const IS_DISABLE_VIEWSTATE = 0x02;
-	const IS_SKIN_APPLIED = 0x04;
-	const IS_STYLESHEET_APPLIED = 0x08;
-	const IS_DISABLE_THEMING = 0x10;
-	const IS_CHILD_CREATED = 0x20;
-	const IS_CREATING_CHILD = 0x40;
+	const IS_ID_SET=0x01;
+	const IS_DISABLE_VIEWSTATE=0x02;
+	const IS_SKIN_APPLIED=0x04;
+	const IS_STYLESHEET_APPLIED=0x08;
+	const IS_DISABLE_THEMING=0x10;
+	const IS_CHILD_CREATED=0x20;
+	const IS_CREATING_CHILD=0x40;
 
 	/**
 	 * Indexes for the rare fields.
 	 * In order to save memory, rare fields will only be created if they are needed.
 	 */
-	const RF_CONTROLS = 0;			// child controls
-	const RF_CHILD_STATE = 1;			// child state field
-	const RF_NAMED_CONTROLS = 2;		// list of controls whose namingcontainer is this control
-	const RF_NAMED_CONTROLS_ID = 3;	// counter for automatic id
-	const RF_SKIN_ID = 4;				// skin ID
-	const RF_DATA_BINDINGS = 5;		// data bindings
-	const RF_EVENTS = 6;				// event handlers
-	const RF_CONTROLSTATE = 7;		// controlstate
-	const RF_NAMED_OBJECTS = 8;		// controls declared with ID on template
-	const RF_ADAPTER = 9;				// adapter
-	const RF_AUTO_BINDINGS = 10;		// auto data bindings
+	const RF_CONTROLS=0; // child controls
+	const RF_CHILD_STATE=1; // child state field
+	const RF_NAMED_CONTROLS=2; // list of controls whose namingcontainer is this control
+	const RF_NAMED_CONTROLS_ID=3; // counter for automatic id
+	const RF_SKIN_ID=4; // skin ID
+	const RF_DATA_BINDINGS=5; // data bindings
+	const RF_EVENTS=6; // event handlers
+	const RF_CONTROLSTATE=7; // controlstate
+	const RF_NAMED_OBJECTS=8; // controls declared with ID on template
+	const RF_ADAPTER=9; // adapter
+	const RF_AUTO_BINDINGS=10; // auto data bindings
 
 	/**
 	 * @var string control ID
 	 */
-	private $_id = '';
+	private $_id='';
 	/**
 	 * @var string control unique ID
 	 */
@@ -153,27 +153,27 @@ 
 	/**
 	 * @var array viewstate data
 	 */
-	private $_viewState = [];
+	private $_viewState=[];
 	/**
 	 * @var array temporary state (usually set in template)
 	 */
-	private $_tempState = [];
+	private $_tempState=[];
 	/**
 	 * @var boolean whether we should keep state in viewstate
 	 */
-	private $_trackViewState = true;
+	private $_trackViewState=true;
 	/**
 	 * @var integer the current stage of the control lifecycles
 	 */
-	private $_stage = 0;
+	private $_stage=0;
 	/**
 	 * @var integer representation of the state bits
 	 */
-	private $_flags = 0;
+	private $_flags=0;
 	/**
 	 * @var array a collection of rare control data
 	 */
-	private $_rf = [];
+	private $_rf=[];
 
 	/**
 	 * Returns a property value by name or a control by ID.
@@ -237,7 +237,7 @@ 
 	 */
 	public function getAdapter()
 	{
-		return isset($this->_rf[self::RF_ADAPTER])?$this->_rf[self::RF_ADAPTER]:null;
+		return isset($this->_rf[self::RF_ADAPTER]) ? $this->_rf[self::RF_ADAPTER] : null;
 	}
 
 	/**
@@ -245,7 +245,7 @@ 
 	 */
 	public function setAdapter(TControlAdapter $adapter)
 	{
-		$this->_rf[self::RF_ADAPTER] = $adapter;
+		$this->_rf[self::RF_ADAPTER]=$adapter;
 	}
 
 	/**
@@ -264,9 +264,9 @@ 
 		if(!$this->_namingContainer && $this->_parent)
 		{
 			if($this->_parent instanceof INamingContainer)
-				$this->_namingContainer = $this->_parent;
+				$this->_namingContainer=$this->_parent;
 			else
-				$this->_namingContainer = $this->_parent->getNamingContainer();
+				$this->_namingContainer=$this->_parent->getNamingContainer();
 		}
 		return $this->_namingContainer;
 	}
@@ -279,9 +279,9 @@ 
 		if(!$this->_page)
 		{
 			if($this->_parent)
-				$this->_page = $this->_parent->getPage();
+				$this->_page=$this->_parent->getPage();
 			elseif($this->_tplControl)
-				$this->_page = $this->_tplControl->getPage();
+				$this->_page=$this->_tplControl->getPage();
 		}
 		return $this->_page;
 	}
@@ -293,7 +293,7 @@ 
 	 */
 	public function setPage($page)
 	{
-		$this->_page = $page;
+		$this->_page=$page;
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function setTemplateControl($control)
 	{
-		$this->_tplControl = $control;
+		$this->_tplControl=$control;
 	}
 
 	/**
@@ -312,7 +312,7 @@ 
 	public function getTemplateControl()
 	{
 		if(!$this->_tplControl && $this->_parent)
-			$this->_tplControl = $this->_parent->getTemplateControl();
+			$this->_tplControl=$this->_parent->getTemplateControl();
 		return $this->_tplControl;
 	}
 
@@ -323,8 +323,8 @@ 
 	 */
 	public function getSourceTemplateControl()
 	{
-		$control = $this;
-		while(($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
+		$control=$this;
+		while(($control instanceof TControl) && ($control=$control->getTemplateControl())!==null)
 		{
 			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
 				return $control;
@@ -353,7 +353,7 @@ 
 	 */
 	protected function setControlStage($value)
 	{
-		$this->_stage = $value;
+		$this->_stage=$value;
 	}
 
 	/**
@@ -363,7 +363,7 @@ 
 	 * @param boolean whether to hide automatically generated ID
 	 * @return string the ID of the control
 	 */
-	public function getID($hideAutoID = true)
+	public function getID($hideAutoID=true)
 	{
 		if($hideAutoID)
 			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
@@ -379,8 +379,8 @@ 
 	{
 		if(!preg_match(self::ID_FORMAT, $id))
 			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
-		$this->_id = $id;
-		$this->_flags |= self::IS_ID_SET;
+		$this->_id=$id;
+		$this->_flags|=self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
 		if($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
@@ -395,17 +395,17 @@ 
 	 */
 	public function getUniqueID()
 	{
-		if($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
+		if($this->_uid==='' || $this->_uid===null)	// need to build the UniqueID
 		{
-			$this->_uid = '';  // set to not-null, so that clearCachedUniqueID() may take action
-			if($namingContainer = $this->getNamingContainer())
+			$this->_uid=''; // set to not-null, so that clearCachedUniqueID() may take action
+			if($namingContainer=$this->getNamingContainer())
 			{
-				if($this->getPage() === $namingContainer)
-					return ($this->_uid = $this->_id);
-				elseif(($prefix = $namingContainer->getUniqueID()) === '')
+				if($this->getPage()===$namingContainer)
+					return ($this->_uid=$this->_id);
+				elseif(($prefix=$namingContainer->getUniqueID())==='')
 					return $this->_id;
 				else
-					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
+					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
 			}
 			else	// no naming container
 				return $this->_id;
@@ -449,7 +449,7 @@ 
 	 */
 	public function getSkinID()
 	{
-		return isset($this->_rf[self::RF_SKIN_ID])?$this->_rf[self::RF_SKIN_ID]:'';
+		return isset($this->_rf[self::RF_SKIN_ID]) ? $this->_rf[self::RF_SKIN_ID] : '';
 	}
 
 	/**
@@ -461,7 +461,7 @@ 
 		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
 			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
-			$this->_rf[self::RF_SKIN_ID] = $value;
+			$this->_rf[self::RF_SKIN_ID]=$value;
 	}
 
 	/**
@@ -482,7 +482,7 @@ 
 		if($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 
 	/**
@@ -494,9 +494,9 @@ 
 		if($this->_stage >= self::CS_CHILD_INITIALIZED)
 			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
 		elseif(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
+			$this->_flags&=~self::IS_DISABLE_THEMING;
 		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+			$this->_flags|=self::IS_DISABLE_THEMING;
 	}
 
 	/**
@@ -535,7 +535,7 @@ 
 	public function getControls()
 	{
 		if(!isset($this->_rf[self::RF_CONTROLS]))
-			$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
+			$this->_rf[self::RF_CONTROLS]=$this->createControlCollection();
 		return $this->_rf[self::RF_CONTROLS];
 	}
 
@@ -546,7 +546,7 @@ 
 	 */
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 
 	/**
@@ -556,11 +556,11 @@ 
 	 * @param boolean whether the parents should also be checked if visible
 	 * @return boolean whether the control is visible (default=true).
 	 */
-	public function getVisible($checkParents = true)
+	public function getVisible($checkParents=true)
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
+			for($control=$this; $control; $control=$control->_parent)
 				if(!$control->getVisible(false))
 					return false;
 			return true;
@@ -587,11 +587,11 @@ 
 	 * @param boolean whether the parents should also be checked enabled
 	 * @return boolean whether the control is enabled.
 	 */
-	public function getEnabled($checkParents = false)
+	public function getEnabled($checkParents=false)
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
+			for($control=$this; $control; $control=$control->_parent)
 				if(!$control->getViewState('Enabled', true))
 					return false;
 			return true;
@@ -613,7 +613,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->getCount() > 0;
 		else
 			return false;
@@ -627,11 +627,11 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
-			$attributes = new TAttributeCollection;
+			$attributes=new TAttributeCollection;
 			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
@@ -642,7 +642,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -653,7 +653,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -676,7 +676,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -685,11 +685,11 @@ 
 	/**
 	 * @return boolean whether viewstate is enabled
 	 */
-	public function getEnableViewState($checkParents = false)
+	public function getEnableViewState($checkParents=false)
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control !== null;$control = $control->getParent())
+			for($control=$this; $control!==null; $control=$control->getParent())
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
@@ -704,9 +704,9 @@ 
 	public function setEnableViewState($value)
 	{
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+			$this->_flags&=~self::IS_DISABLE_VIEWSTATE;
 		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+			$this->_flags|=self::IS_DISABLE_VIEWSTATE;
 	}
 
 	/**
@@ -718,9 +718,9 @@ 
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
 	 * @return mixed the controlstate value corresponding to $key
 	 */
-	protected function getControlState($key, $defaultValue = null)
+	protected function getControlState($key, $defaultValue=null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
 
 	/**
@@ -733,12 +733,12 @@ 
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
 	 */
-	protected function setControlState($key, $value, $defaultValue = null)
+	protected function setControlState($key, $value, $defaultValue=null)
 	{
-		if($value === $defaultValue)
+		if($value===$defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 		else
-			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
+			$this->_rf[self::RF_CONTROLSTATE][$key]=$value;
 	}
 
 	/**
@@ -758,7 +758,7 @@ 
 	 */
 	public function trackViewState($enabled)
 	{
-		$this->_trackViewState = TPropertyValue::ensureBoolean($enabled);
+		$this->_trackViewState=TPropertyValue::ensureBoolean($enabled);
 	}
 
 	/**
@@ -770,14 +770,14 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	public function getViewState($key, $defaultValue = null)
+	public function getViewState($key, $defaultValue=null)
 	{
 		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
+			return $this->_viewState[$key]!==null ? $this->_viewState[$key] : $defaultValue;
 		elseif(isset($this->_tempState[$key]))
 		{
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key] = $this->_tempState[$key];
+				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
 		}
 		else
@@ -794,20 +794,20 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	public function setViewState($key, $value, $defaultValue = null)
+	public function setViewState($key, $value, $defaultValue=null)
 	{
 		if($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
-			$this->_viewState[$key] = $value;
+			$this->_viewState[$key]=$value;
 		}
 		else
 		{
 			unset($this->_viewState[$key]);
-			if($value === $defaultValue)
+			if($value===$defaultValue)
 				unset($this->_tempState[$key]);
 			else
-				$this->_tempState[$key] = $value;
+				$this->_tempState[$key]=$value;
 		}
 	}
 
@@ -829,7 +829,7 @@ 
 	 */
 	public function bindProperty($name, $expression)
 	{
-		$this->_rf[self::RF_DATA_BINDINGS][$name] = $expression;
+		$this->_rf[self::RF_DATA_BINDINGS][$name]=$expression;
 	}
 
 	/**
@@ -851,7 +851,7 @@ 
 	 */
 	public function autoBindProperty($name, $expression)
 	{
-		$this->_rf[self::RF_AUTO_BINDINGS][$name] = $expression;
+		$this->_rf[self::RF_AUTO_BINDINGS][$name]=$expression;
 	}
 
 	/**
@@ -872,8 +872,8 @@ 
 		Prado::trace("Data bind properties", 'Prado\Web\UI\TControl');
 		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
-				$context = $this;
+			if(($context=$this->getTemplateControl())===null)
+				$context=$this;
 			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
 				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
@@ -886,8 +886,8 @@ 
 	{
 		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
-				$context = $this;
+			if(($context=$this->getTemplateControl())===null)
+				$context=$this;
 			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
 				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
@@ -912,7 +912,7 @@ 
 	 */
 	final protected function getChildControlsCreated()
 	{
-		return ($this->_flags & self::IS_CHILD_CREATED) !== 0;
+		return ($this->_flags & self::IS_CHILD_CREATED)!==0;
 	}
 
 	/**
@@ -923,12 +923,12 @@ 
 	final protected function setChildControlsCreated($value)
 	{
 		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
+			$this->_flags|=self::IS_CHILD_CREATED;
 		else
 		{
 			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
-			$this->_flags &= ~self::IS_CHILD_CREATED;
+			$this->_flags&=~self::IS_CHILD_CREATED;
 		}
 	}
 
@@ -943,18 +943,18 @@ 
 		{
 			try
 			{
-				$this->_flags |= self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CREATING_CHILD;
 				if(isset($this->_rf[self::RF_ADAPTER]))
 					$this->_rf[self::RF_ADAPTER]->createChildControls();
 				else
 					$this->createChildControls();
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 			}
 			catch(Exception $e)
 			{
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 				throw $e;
 			}
 		}
@@ -983,21 +983,21 @@ 
 	 */
 	public function findControl($id)
 	{
-		$id = strtr($id, '.', self::ID_SEPARATOR);
-		$container = ($this instanceof INamingContainer)?$this:$this->getNamingContainer();
+		$id=strtr($id, '.', self::ID_SEPARATOR);
+		$container=($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
 		if(!$container || !$container->getHasControls())
 			return null;
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
-			$container->_rf[self::RF_NAMED_CONTROLS] = [];
+			$container->_rf[self::RF_NAMED_CONTROLS]=[];
 			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos = strpos($id, self::ID_SEPARATOR)) === false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if(($pos=strpos($id, self::ID_SEPARATOR))===false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
-			$cid = substr($id, 0, $pos);
-			$sid = substr($id, $pos + 1);
+			$cid=substr($id, 0, $pos);
+			$sid=substr($id, $pos + 1);
 			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
@@ -1011,17 +1011,17 @@ 
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
 	 * @return array list of controls found
 	 */
-	public function findControlsByType($type, $strict = true)
+	public function findControlsByType($type, $strict=true)
 	{
-		$controls = [];
+		$controls=[];
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
-					$controls[] = $control;
+				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type))))
+					$controls[]=$control;
 				if(($control instanceof TControl) && $control->getHasControls())
-					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
+					$controls=array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
 		return $controls;
@@ -1038,16 +1038,16 @@ 
 	 */
 	public function findControlsByID($id)
 	{
-		$controls = [];
+		$controls=[];
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
 				{
-					if($control->_id === $id)
-						$controls[] = $control;
-					$controls = array_merge($controls, $control->findControlsByID($id));
+					if($control->_id===$id)
+						$controls[]=$control;
+					$controls=array_merge($controls, $control->findControlsByID($id));
 				}
 			}
 		}
@@ -1076,7 +1076,7 @@ 
 	{
 		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
 			throw new TInvalidOperationException('control_object_reregistered', $name);
-		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
+		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
 	}
 
 	/**
@@ -1147,7 +1147,7 @@ 
 	 */
 	public function getRegisteredObject($name)
 	{
-		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
+		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name]) ? $this->_rf[self::RF_NAMED_OBJECTS][$name] : null;
 	}
 
 	/**
@@ -1189,10 +1189,10 @@ 
 	 */
 	final protected function isDescendentOf($ancestor)
 	{
-		$control = $this;
-		while($control !== $ancestor && $control->_parent)
-			$control = $control->_parent;
-		return $control === $ancestor;
+		$control=$this;
+		while($control!==$ancestor && $control->_parent)
+			$control=$control->_parent;
+		return $control===$ancestor;
 	}
 
 	/**
@@ -1205,13 +1205,13 @@ 
 	{
 		if($control->_parent)
 			$control->_parent->getControls()->remove($control);
-		$control->_parent = $this;
-		$control->_page = $this->getPage();
-		$namingContainer = ($this instanceof INamingContainer)?$this:$this->_namingContainer;
+		$control->_parent=$this;
+		$control->_page=$this->getPage();
+		$namingContainer=($this instanceof INamingContainer) ? $this : $this->_namingContainer;
 		if($namingContainer)
 		{
-			$control->_namingContainer = $namingContainer;
-			if($control->_id === '')
+			$control->_namingContainer=$namingContainer;
+			if($control->_id==='')
 				$control->generateAutomaticID();
 			else
 				$namingContainer->clearNameTable();
@@ -1225,11 +1225,11 @@ 
 			{
 				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
-					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
+					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
 				}
 				else
-					$state = null;
+					$state=null;
 				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage >= self::CS_LOADED)
 				{
@@ -1251,13 +1251,13 @@ 
 		if($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 		$control->unloadRecursive();
-		$control->_parent = null;
-		$control->_page = null;
-		$control->_namingContainer = null;
-		$control->_tplControl = null;
+		$control->_parent=null;
+		$control->_page=null;
+		$control->_namingContainer=null;
+		$control->_tplControl=null;
 		//$control->_stage=self::CS_CONSTRUCTED;
 		if(!($control->_flags & self::IS_ID_SET))
-			$control->_id = '';
+			$control->_id='';
 		else
 			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
 		$control->clearCachedUniqueID(true);
@@ -1268,21 +1268,21 @@ 
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer = null)
+	protected function initRecursive($namingContainer=null)
 	{
 		$this->ensureChildControls();
 		if($this->getHasControls())
 		{
 			if($this instanceof INamingContainer)
-				$namingContainer = $this;
-			$page = $this->getPage();
+				$namingContainer=$this;
+			$page=$this->getPage();
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
 				{
-					$control->_namingContainer = $namingContainer;
-					$control->_page = $page;
-					if($control->_id === '' && $namingContainer)
+					$control->_namingContainer=$namingContainer;
+					$control->_page=$page;
+					if($control->_id==='' && $namingContainer)
 						$control->generateAutomaticID();
 					$control->initRecursive($namingContainer);
 				}
@@ -1290,17 +1290,17 @@ 
 		}
 		if($this->_stage < self::CS_INITIALIZED)
 		{
-			$this->_stage = self::CS_CHILD_INITIALIZED;
-			if(($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
+			$this->_stage=self::CS_CHILD_INITIALIZED;
+			if(($page=$this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
-				$this->_flags |= self::IS_SKIN_APPLIED;
+				$this->_flags|=self::IS_SKIN_APPLIED;
 			}
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
 			else
 				$this->onInit(null);
-			$this->_stage = self::CS_INITIALIZED;
+			$this->_stage=self::CS_INITIALIZED;
 		}
 	}
 
@@ -1326,7 +1326,7 @@ 
 			}
 		}
 		if($this->_stage < self::CS_LOADED)
-			$this->_stage = self::CS_LOADED;
+			$this->_stage=self::CS_LOADED;
 	}
 
 	/**
@@ -1354,7 +1354,7 @@ 
 				}
 			}
 		}
-		$this->_stage = self::CS_PRERENDERED;
+		$this->_stage=self::CS_PRERENDERED;
 	}
 
 	/**
@@ -1364,7 +1364,7 @@ 
 	protected function unloadRecursive()
 	{
 		if(!($this->_flags & self::IS_ID_SET))
-			$this->_id = '';
+			$this->_id='';
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
@@ -1446,8 +1446,8 @@ 
 	 */
 	protected function raiseBubbleEvent($sender, $param)
 	{
-		$control = $this;
-		while($control = $control->_parent)
+		$control=$this;
+		while($control=$control->_parent)
 		{
 			if($control->bubbleEvent($sender, $param))
 				break;
@@ -1486,7 +1486,7 @@ 
 	 */
 	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl = (($page = $this->getPage()) === null)?$this:$page;
+		$rootControl=(($page=$this->getPage())===null) ? $this : $page;
 		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
 
@@ -1530,9 +1530,9 @@ 
 	 * @param callback callback invoked before traversing child controls. If null, it is ignored.
 	 * @param callback callback invoked after traversing child controls. If null, it is ignored.
 	 */
-	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
+	protected function traverseChildControls($param, $preCallback=null, $postCallback=null)
 	{
-		if($preCallback !== null)
+		if($preCallback!==null)
 			call_user_func($preCallback, $this, $param);
 		if($this->getHasControls())
 		{
@@ -1544,7 +1544,7 @@ 
 				}
 			}
 		}
-		if($postCallback !== null)
+		if($postCallback!==null)
 			call_user_func($postCallback, $this, $param);
 	}
 
@@ -1622,16 +1622,16 @@ 
 	 * @param array the collection of the state
 	 * @param boolean whether the viewstate should be loaded
 	 */
-	protected function loadStateRecursive(&$state, $needViewState = true)
+	protected function loadStateRecursive(&$state, $needViewState=true)
 	{
 		if(is_array($state))
 		{
 			// A null state means the stateful properties all take default values.
 			// So if the state is enabled, we have to assign the null value.
-			$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+			$needViewState=($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 			if(isset($state[1]))
 			{
-				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
+				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
 			}
 			else
@@ -1639,9 +1639,9 @@ 
 			if($needViewState)
 			{
 				if(isset($state[0]))
-					$this->_viewState = &$state[0];
+					$this->_viewState=&$state[0];
 				else
-					$this->_viewState = [];
+					$this->_viewState=[];
 			}
 			unset($state[0]);
 			if($this->getHasControls())
@@ -1659,9 +1659,9 @@ 
 				}
 			}
 			if(!empty($state))
-				$this->_rf[self::RF_CHILD_STATE] = &$state;
+				$this->_rf[self::RF_CHILD_STATE]=&$state;
 		}
-		$this->_stage = self::CS_STATE_LOADED;
+		$this->_stage=self::CS_STATE_LOADED;
 		if(isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->loadState();
 		else
@@ -1674,29 +1674,29 @@ 
 	 * @param boolean whether the viewstate should be saved
 	 * @return array the collection of the control state (including its children's state).
 	 */
-	protected function &saveStateRecursive($needViewState = true)
+	protected function &saveStateRecursive($needViewState=true)
 	{
 		if(isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->saveState();
 		else
 			$this->saveState();
-		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-		$state = [];
+		$needViewState=($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+		$state=[];
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
-						$state[$control->_id] = $tmp;
+					if(count($tmp=&$control->saveStateRecursive($needViewState)))
+						$state[$control->_id]=$tmp;
 				}
 			}
 		}
 		if($needViewState && !empty($this->_viewState))
-			$state[0] = &$this->_viewState;
+			$state[0]=&$this->_viewState;
 		if(isset($this->_rf[self::RF_CONTROLSTATE]))
-			$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
+			$state[1]=&$this->_rf[self::RF_CONTROLSTATE];
 		return $state;
 	}
 
@@ -1710,7 +1710,7 @@ 
 		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
-			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+			$this->_flags|=self::IS_STYLESHEET_APPLIED;
 		}
 		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
@@ -1723,13 +1723,13 @@ 
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
-		if($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
+		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 				if($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
 		}
-		$this->_uid = null;
+		$this->_uid=null;
 	}
 
 	/**
@@ -1737,11 +1737,11 @@ 
 	 */
 	private function generateAutomaticID()
 	{
-		$this->_flags &= ~self::IS_ID_SET;
+		$this->_flags&=~self::IS_ID_SET;
 		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
-			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
-		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
+			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
+		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
+		$this->_id=self::AUTOMATIC_ID_PREFIX.$id;
 		$this->_namingContainer->clearNameTable();
 	}
 
@@ -1765,12 +1765,12 @@ 
 		{
 			if($control instanceof TControl)
 			{
-				if($control->_id !== '')
+				if($control->_id!=='')
 				{
 					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
 						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
-						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
+						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
 				}
 				if(!($control instanceof INamingContainer) && $control->getHasControls())
 					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);

Braces +14 added lines, -24 removed lines

@@ -406,11 +406,9 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
-			}
-			else	// no naming container
+			} else	// no naming container
 				return $this->_id;
-		}
-		else
+		} else
 			return $this->_uid;
 	}
 
@@ -564,8 +562,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible', true);
 	}
 
@@ -595,8 +592,7 @@ 
 				if(!$control->getViewState('Enabled', true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled', true);
 	}
 
@@ -693,8 +689,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
@@ -779,8 +774,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key] = $this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 
@@ -800,8 +794,7 @@ 
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key] = $value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value === $defaultValue)
@@ -950,8 +943,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;
@@ -1190,8 +1182,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;
 	}
 
@@ -1227,8 +1220,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)
@@ -1633,8 +1625,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -1711,8 +1702,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 

framework/Web/UI/TPage.php

Doc Comments +11 added lines

@@ -290,6 +290,9 @@ 
 		$this->unloadRecursive();
 	}
 
+	/**
+	 * @param string $enc
+	 */
 	protected static function decodeUTF8($data, $enc)
 	{
 		if(is_array($data))
@@ -460,6 +463,7 @@ 
 	 * Returns a list of registered validators.
 	 * If validation group is specified, only the validators in that group will be returned.
 	 * @param string validation group
+	 * @param string $validationGroup
 	 * @return TList registered validators in the requested group. If the group is null, all validators will be returned.
 	 */
 	public function getValidators($validationGroup = null)
@@ -571,6 +575,7 @@ 
 	 * Applies a skin in the current theme to a control.
 	 * This method should only be used by framework developers.
 	 * @param TControl a control to be applied skin with
+	 * @param TControl $control
 	 */
 	public function applyControlSkin($control)
 	{
@@ -862,6 +867,8 @@ 
 	 * Processes post data.
 	 * @param TMap post data to be processed
 	 * @param boolean whether this method is invoked before {@link onLoad OnLoad}.
+	 * @param TMap $postData
+	 * @param boolean $beforeLoad
 	 */
 	protected function processPostData($postData, $beforeLoad)
 	{
@@ -987,6 +994,7 @@ 
 	/**
 	 * Sets input focus on a control after the page is rendered to users.
 	 * @param TControl|string control to receive focus, or the ID of the element on the page to receive focus
+	 * @param TControl $value
 	 */
 	public function setFocus($value)
 	{
@@ -1072,6 +1080,7 @@ 
 	 * Sets the state to be stored on the client side.
 	 * This method should only be used by framework and control developers.
 	 * @param string the state to be stored on the client side
+	 * @param string $state
 	 */
 	public function setClientState($state)
 	{
@@ -1191,6 +1200,8 @@ 
 	 * referring to the context object (e.g. Page, Page.ClientScript).
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
+	 * @param string $context
+	 * @param string $funcName
 	 */
 	public function registerCachingAction($context, $funcName, $funcParams)
 	{

Spacing +109 added lines, -109 removed lines

@@ -41,17 +41,17 @@ 
 	/**
 	 * system post fields
 	 */
-	const FIELD_POSTBACK_TARGET = 'PRADO_POSTBACK_TARGET';
-	const FIELD_POSTBACK_PARAMETER = 'PRADO_POSTBACK_PARAMETER';
-	const FIELD_LASTFOCUS = 'PRADO_LASTFOCUS';
-	const FIELD_PAGESTATE = 'PRADO_PAGESTATE';
-	const FIELD_CALLBACK_TARGET = 'PRADO_CALLBACK_TARGET';
-	const FIELD_CALLBACK_PARAMETER = 'PRADO_CALLBACK_PARAMETER';
+	const FIELD_POSTBACK_TARGET='PRADO_POSTBACK_TARGET';
+	const FIELD_POSTBACK_PARAMETER='PRADO_POSTBACK_PARAMETER';
+	const FIELD_LASTFOCUS='PRADO_LASTFOCUS';
+	const FIELD_PAGESTATE='PRADO_PAGESTATE';
+	const FIELD_CALLBACK_TARGET='PRADO_CALLBACK_TARGET';
+	const FIELD_CALLBACK_PARAMETER='PRADO_CALLBACK_PARAMETER';
 
 	/**
 	 * @var array system post fields
 	 */
-	private static $_systemPostFields = [
+	private static $_systemPostFields=[
 		'PRADO_POSTBACK_TARGET' => true,
 		'PRADO_POSTBACK_PARAMETER' => true,
 		'PRADO_LASTFOCUS' => true,
@@ -70,11 +70,11 @@ 
 	/**
 	 * @var array list of registered validators
 	 */
-	private $_validators = [];
+	private $_validators=[];
 	/**
 	 * @var boolean if validation has been performed
 	 */
-	private $_validated = false;
+	private $_validated=false;
 	/**
 	 * @var TTheme page theme
 	 */
@@ -102,15 +102,15 @@ 
 	/**
 	 * @var array list of controls whose data have been changed due to the postback
 	 */
-	protected $_controlsPostDataChanged = [];
+	protected $_controlsPostDataChanged=[];
 	/**
 	 * @var array list of controls that need to load post data in the current request
 	 */
-	protected $_controlsRequiringPostData = [];
+	protected $_controlsRequiringPostData=[];
 	/**
 	 * @var array list of controls that need to load post data in the next postback
 	 */
-	protected $_controlsRegisteredForPostData = [];
+	protected $_controlsRegisteredForPostData=[];
 	/**
 	 * @var TControl control that needs to raise postback event
 	 */
@@ -122,11 +122,11 @@ 
 	/**
 	 * @var boolean whether the form has been rendered
 	 */
-	protected $_formRendered = false;
+	protected $_formRendered=false;
 	/**
 	 * @var boolean whether the current rendering is within a form
 	 */
-	protected $_inFormRender = false;
+	protected $_inFormRender=false;
 	/**
 	 * @var TControl|string the control or the ID of the element on the page to be focused when the page is sent back to user
 	 */
@@ -134,24 +134,24 @@ 
 	/**
 	 * @var string page path to this page
 	 */
-	private $_pagePath = '';
+	private $_pagePath='';
 	/**
 	 * @var boolean whether page state should be HMAC validated
 	 */
-	private $_enableStateValidation = true;
+	private $_enableStateValidation=true;
 	/**
 	 * @var boolean whether page state should be encrypted
 	 */
-	private $_enableStateEncryption = false;
+	private $_enableStateEncryption=false;
 	/**
 	 * @var boolean whether page state should be compressed
 	 * @since 3.1.6
 	 */
-	private $_enableStateCompression = true;
+	private $_enableStateCompression=true;
 	/**
 	 * @var string page state persister class name
 	 */
-	private $_statePersisterClass = '\Prado\Web\UI\TPageStatePersister';
+	private $_statePersisterClass='\Prado\Web\UI\TPageStatePersister';
 	/**
 	 * @var mixed page state persister
 	 */
@@ -163,15 +163,15 @@ 
 	/**
 	 * @var string state string to be stored on the client side
 	 */
-	private $_clientState = '';
+	private $_clientState='';
 	/**
 	 * @var boolean true if loading post data.
 	 */
-	protected $_isLoadingPostData = false;
+	protected $_isLoadingPostData=false;
 	/**
 	 * @var boolean whether client supports javascript
 	 */
-	private $_enableJavaScript = true;
+	private $_enableJavaScript=true;
 	/**
 	 * @var THtmlWriter current html render writer
 	 */
@@ -194,7 +194,7 @@ 
 	public function run($writer)
 	{
 		Prado::trace("Running page life cycles", 'Prado\Web\UI\TPage');
-		$this->_writer = $writer;
+		$this->_writer=$writer;
 
 		$this->determinePostBackMode();
 
@@ -208,7 +208,7 @@ 
 		else
 			$this->processNormalRequest($writer);
 
-		$this->_writer = null;
+		$this->_writer=null;
 	}
 
 	protected function processNormalRequest($writer)
@@ -256,7 +256,7 @@ 
 		Prado::trace("Page onInitComplete()", 'Prado\Web\UI\TPage');
 		$this->onInitComplete(null);
 
-		$this->_restPostData = new TMap;
+		$this->_restPostData=new TMap;
 		Prado::trace("Page loadPageState()", 'Prado\Web\UI\TPage');
 		$this->loadPageState();
 		Prado::trace("Page processPostData()", 'Prado\Web\UI\TPage');
@@ -295,10 +295,10 @@ 
 		if(is_array($data))
 		{
 			foreach($data as $k => $v)
-				$data[$k] = self::decodeUTF8($v, $enc);
+				$data[$k]=self::decodeUTF8($v, $enc);
 			return $data;
 		} elseif(is_string($data)) {
-			return iconv('UTF-8', $enc . '//IGNORE', $data);
+			return iconv('UTF-8', $enc.'//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -312,15 +312,15 @@ 
 	{
 		$this->setAdapter(new TActivePageAdapter($this));
 
-		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+		$callbackEventParameter=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
 		if(strlen($callbackEventParameter) > 0)
-			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string) $callbackEventParameter);
 
 		// Decode Callback postData from UTF-8 to current Charset
-		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);
+		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);
 
 		Prado::trace("Page onPreInit()", 'Prado\Web\UI\TPage');
 		$this->onPreInit(null);
@@ -331,7 +331,7 @@ 
 		Prado::trace("Page onInitComplete()", 'Prado\Web\UI\TPage');
 		$this->onInitComplete(null);
 
-		$this->_restPostData = new TMap;
+		$this->_restPostData=new TMap;
 		Prado::trace("Page loadPageState()", 'Prado\Web\UI\TPage');
 		$this->loadPageState();
 		Prado::trace("Page processPostData()", 'Prado\Web\UI\TPage');
@@ -384,7 +384,7 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if($this->getAdapter()!==null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -450,8 +450,8 @@ 
 	 */
 	public function setForm(TForm $form)
 	{
-		if($this->_form === null)
-			$this->_form = $form;
+		if($this->_form===null)
+			$this->_form=$form;
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
 	}
@@ -462,17 +462,17 @@ 
 	 * @param string validation group
 	 * @return TList registered validators in the requested group. If the group is null, all validators will be returned.
 	 */
-	public function getValidators($validationGroup = null)
+	public function getValidators($validationGroup=null)
 	{
 		if(!$this->_validators)
-			$this->_validators = new TList;
-		if(empty($validationGroup) === true)
+			$this->_validators=new TList;
+		if(empty($validationGroup)===true)
 			return $this->_validators;
 		else
 		{
-			$list = new TList;
+			$list=new TList;
 			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup() === $validationGroup)
+				if($validator->getValidationGroup()===$validationGroup)
 					$list->add($validator);
 			return $list;
 		}
@@ -484,13 +484,13 @@ 
 	 * If validation group is specified, only the validators in that group will be invoked.
 	 * @param string validation group. If null, all validators will perform validation.
 	 */
-	public function validate($validationGroup = null)
+	public function validate($validationGroup=null)
 	{
 		Prado::trace("Page validate()", 'Prado\Web\UI\TPage');
-		$this->_validated = true;
+		$this->_validated=true;
 		if($this->_validators && $this->_validators->getCount())
 		{
-			if($validationGroup === null)
+			if($validationGroup===null)
 			{
 				foreach($this->_validators as $validator)
 					$validator->validate();
@@ -499,7 +499,7 @@ 
 			{
 				foreach($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup() === $validationGroup)
+					if($validator->getValidationGroup()===$validationGroup)
 						$validator->validate();
 				}
 			}
@@ -534,7 +534,7 @@ 
 	public function getTheme()
 	{
 		if(is_string($this->_theme))
-			$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
+			$this->_theme=$this->getService()->getThemeManager()->getTheme($this->_theme);
 		return $this->_theme;
 	}
 
@@ -544,7 +544,7 @@ 
 	 */
 	public function setTheme($value)
 	{
-		$this->_theme = empty($value)?null:$value;
+		$this->_theme=empty($value) ?null:$value;
 	}
 
 
@@ -554,7 +554,7 @@ 
 	public function getStyleSheetTheme()
 	{
 		if(is_string($this->_styleSheet))
-			$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+			$this->_styleSheet=$this->getService()->getThemeManager()->getTheme($this->_styleSheet);
 		return $this->_styleSheet;
 	}
 
@@ -564,7 +564,7 @@ 
 	 */
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet = empty($value)?null:$value;
+		$this->_styleSheet=empty($value) ?null:$value;
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme = $this->getTheme()) !== null)
+		if(($theme=$this->getTheme())!==null)
 			$theme->applySkin($control);
 	}
 
@@ -585,7 +585,7 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme = $this->getStyleSheetTheme()) !== null)
+		if(($theme=$this->getStyleSheetTheme())!==null)
 			$theme->applySkin($control);
 	}
 
@@ -595,12 +595,12 @@ 
 	public function getClientScript()
 	{
 		if(!$this->_clientScript) {
-			$className = $classPath = $this->getService()->getClientScriptManagerClass();
+			$className=$classPath=$this->getService()->getClientScriptManagerClass();
 
-			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
+			if($className!=='\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
 				throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
 
-			$this->_clientScript = new $className($this);
+			$this->_clientScript=new $className($this);
 		}
 		return $this->_clientScript;
 	}
@@ -669,8 +669,8 @@ 
 	public function onPreRenderComplete($param)
 	{
 		$this->raiseEvent('OnPreRenderComplete', $this, $param);
-		$cs = $this->getClientScript();
-		$theme = $this->getTheme();
+		$cs=$this->getClientScript();
+		$theme=$this->getTheme();
 		if($theme instanceof ITheme)
 		{
 			foreach($theme->getStyleSheetFiles() as $url)
@@ -678,7 +678,7 @@ 
 			foreach($theme->getJavaScriptFiles() as $url)
 				$cs->registerHeadScriptFile($url, $url);
 		}
-		$styleSheet = $this->getStyleSheetTheme();
+		$styleSheet=$this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
 			foreach($styleSheet->getStyleSheetFiles() as $url)
@@ -687,7 +687,7 @@ 
 				$cs->registerHeadScriptFile($url, $url);
 		}
 
-		if($cs->getRequiresHead() && $this->getHead() === null)
+		if($cs->getRequiresHead() && $this->getHead()===null)
 			throw new TConfigurationException('page_head_required');
 	}
 
@@ -701,7 +701,7 @@ 
 	 */
 	private function getCssMediaType($url)
 	{
-		$segs = explode('.', basename($url));
+		$segs=explode('.', basename($url));
 		if(isset($segs[2]))
 			return $segs[count($segs) - 2];
 		else
@@ -726,9 +726,9 @@ 
 	 */
 	private function determinePostBackMode()
 	{
-		$postData = $this->getRequest();
+		$postData=$this->getRequest();
 		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
-			$this->_postData = $postData;
+			$this->_postData=$postData;
 	}
 
 	/**
@@ -736,7 +736,7 @@ 
 	 */
 	public function getIsPostBack()
 	{
-		return $this->_postData !== null;
+		return $this->_postData!==null;
 	}
 
 	/**
@@ -766,7 +766,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_controlsRequiringPostData = $this->getViewState('ControlsRequiringPostBack', []);
+		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack', []);
 	}
 
 	/**
@@ -775,7 +775,7 @@ 
 	protected function loadPageState()
 	{
 		Prado::trace("Loading state", 'Prado\Web\UI\TPage');
-		$state = $this->getStatePersister()->load();
+		$state=$this->getStatePersister()->load();
 		$this->loadStateRecursive($state, $this->getEnableViewState());
 	}
 
@@ -785,7 +785,7 @@ 
 	protected function savePageState()
 	{
 		Prado::trace("Saving state", 'Prado\Web\UI\TPage');
-		$state = &$this->saveStateRecursive($this->getEnableViewState());
+		$state=&$this->saveStateRecursive($this->getEnableViewState());
 		$this->getStatePersister()->save($state);
 	}
 
@@ -807,9 +807,9 @@ 
 	 */
 	public function registerRequiresPostData($control)
 	{
-		$id = is_string($control)?$control:$control->getUniqueID();
-		$this->_controlsRegisteredForPostData[$id] = true;
-		$params = func_get_args();
+		$id=is_string($control) ? $control : $control->getUniqueID();
+		$this->_controlsRegisteredForPostData[$id]=true;
+		$params=func_get_args();
 		foreach($this->getCachingStack() as $item)
 			$item->registerAction('Page', 'registerRequiresPostData', [$id]);
 	}
@@ -819,11 +819,11 @@ 
 	 */
 	public function getPostBackEventTarget()
 	{
-		if($this->_postBackEventTarget === null && $this->_postData !== null)
+		if($this->_postBackEventTarget===null && $this->_postData!==null)
 		{
-			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
+			$eventTarget=$this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
 			if(!empty($eventTarget))
-				$this->_postBackEventTarget = $this->findControl($eventTarget);
+				$this->_postBackEventTarget=$this->findControl($eventTarget);
 		}
 		return $this->_postBackEventTarget;
 	}
@@ -834,7 +834,7 @@ 
 	 */
 	public function setPostBackEventTarget(TControl $control)
 	{
-		$this->_postBackEventTarget = $control;
+		$this->_postBackEventTarget=$control;
 	}
 
 	/**
@@ -842,10 +842,10 @@ 
 	 */
 	public function getPostBackEventParameter()
 	{
-		if($this->_postBackEventParameter === null && $this->_postData !== null)
+		if($this->_postBackEventParameter===null && $this->_postData!==null)
 		{
-			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
-				$this->_postBackEventParameter = '';
+			if(($this->_postBackEventParameter=$this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER))===null)
+				$this->_postBackEventParameter='';
 		}
 		return $this->_postBackEventParameter;
 	}
@@ -855,7 +855,7 @@ 
 	 */
 	public function setPostBackEventParameter($value)
 	{
-		$this->_postBackEventParameter = $value;
+		$this->_postBackEventParameter=$value;
 	}
 
 	/**
@@ -865,24 +865,24 @@ 
 	 */
 	protected function processPostData($postData, $beforeLoad)
 	{
-		$this->_isLoadingPostData = true;
+		$this->_isLoadingPostData=true;
 		if($beforeLoad)
-			$this->_restPostData = new TMap;
+			$this->_restPostData=new TMap;
 		foreach($postData as $key => $value)
 		{
 			if($this->isSystemPostField($key))
 				continue;
-			elseif($control = $this->findControl($key))
+			elseif($control=$this->findControl($key))
 			{
 				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
 					if($control->loadPostData($key, $postData))
-						$this->_controlsPostDataChanged[] = $control;
+						$this->_controlsPostDataChanged[]=$control;
 				}
 				elseif($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -892,19 +892,19 @@ 
 
 		foreach($this->_controlsRequiringPostData as $key => $value)
 		{
-			if($control = $this->findControl($key))
+			if($control=$this->findControl($key))
 			{
 				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
 					if($control->loadPostData($key, $this->_postData))
-						$this->_controlsPostDataChanged[] = $control;
+						$this->_controlsPostDataChanged[]=$control;
 				}
 				else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
-		$this->_isLoadingPostData = false;
+		$this->_isLoadingPostData=false;
 	}
 
 	/**
@@ -929,7 +929,7 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler = $this->getPostBackEventTarget()) === null)
+		if(($postBackHandler=$this->getPostBackEventTarget())===null)
 			$this->validate();
 		elseif($postBackHandler instanceof IPostBackEventHandler)
 			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
@@ -961,9 +961,9 @@ 
 	{
 		if($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
-		$this->_formRendered = true;
+		$this->_formRendered=true;
 		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
-		$this->_inFormRender = true;
+		$this->_inFormRender=true;
 	}
 
 	/**
@@ -974,14 +974,14 @@ 
 		if($this->_focus)
 		{
 			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus = $this->_focus->getClientID();
+				$focus=$this->_focus->getClientID();
 			else
-				$focus = $this->_focus;
+				$focus=$this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
 		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
+		elseif($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
-		$this->_inFormRender = false;
+		$this->_inFormRender=false;
 	}
 
 	/**
@@ -990,7 +990,7 @@ 
 	 */
 	public function setFocus($value)
 	{
-		$this->_focus = $value;
+		$this->_focus=$value;
 	}
 
 	/**
@@ -1006,7 +1006,7 @@ 
 	 */
 	public function setClientSupportsJavaScript($value)
 	{
-		$this->_enableJavaScript = TPropertyValue::ensureBoolean($value);
+		$this->_enableJavaScript=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1025,11 +1025,11 @@ 
 	{
 		if($this->_head)
 			throw new TInvalidOperationException('page_head_duplicated');
-		$this->_head = $value;
-		if($this->_title !== null)
+		$this->_head=$value;
+		if($this->_title!==null)
 		{
 			$this->_head->setTitle($this->_title);
-			$this->_title = null;
+			$this->_title=null;
 		}
 	}
 
@@ -1041,7 +1041,7 @@ 
 		if($this->_head)
 			return $this->_head->getTitle();
 		else
-			return $this->_title === null ? '' : $this->_title;
+			return $this->_title===null ? '' : $this->_title;
 	}
 
 	/**
@@ -1055,7 +1055,7 @@ 
 		if($this->_head)
 			$this->_head->setTitle($value);
 		else
-			$this->_title = $value;
+			$this->_title=$value;
 	}
 
 	/**
@@ -1075,7 +1075,7 @@ 
 	 */
 	public function setClientState($state)
 	{
-		$this->_clientState = $state;
+		$this->_clientState=$state;
 	}
 
 	/**
@@ -1099,7 +1099,7 @@ 
 	 */
 	public function setStatePersisterClass($value)
 	{
-		$this->_statePersisterClass = $value;
+		$this->_statePersisterClass=$value;
 	}
 
 	/**
@@ -1107,9 +1107,9 @@ 
 	 */
 	public function getStatePersister()
 	{
-		if($this->_statePersister === null)
+		if($this->_statePersister===null)
 		{
-			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
+			$this->_statePersister=Prado::createComponent($this->_statePersisterClass);
 			if(!($this->_statePersister instanceof IPageStatePersister))
 				throw new TInvalidDataTypeException('page_statepersister_invalid');
 			$this->_statePersister->setPage($this);
@@ -1130,7 +1130,7 @@ 
 	 */
 	public function setEnableStateValidation($value)
 	{
-		$this->_enableStateValidation = TPropertyValue::ensureBoolean($value);
+		$this->_enableStateValidation=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1146,7 +1146,7 @@ 
 	 */
 	public function setEnableStateEncryption($value)
 	{
-		$this->_enableStateEncryption = TPropertyValue::ensureBoolean($value);
+		$this->_enableStateEncryption=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1164,7 +1164,7 @@ 
 	 */
 	public function setEnableStateCompression($value)
 	{
-		$this->_enableStateCompression = TPropertyValue::ensureBoolean($value);
+		$this->_enableStateCompression=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1180,7 +1180,7 @@ 
 	 */
 	public function setPagePath($value)
 	{
-		$this->_pagePath = $value;
+		$this->_pagePath=$value;
 	}
 
 	/**
@@ -1207,7 +1207,7 @@ 
 	public function getCachingStack()
 	{
 		if(!$this->_cachingStack)
-			$this->_cachingStack = new TStack;
+			$this->_cachingStack=new TStack;
 		return $this->_cachingStack;
 	}
 
@@ -1216,7 +1216,7 @@ 
 	 */
 	public function flushWriter()
 	{
-		if ($this->_writer)
+		if($this->_writer)
 			$this->Response->write($this->_writer->flush());
 	}
 }
\ No newline at end of file

Braces +7 added lines, -14 removed lines

@@ -204,8 +204,7 @@ 
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
-		}
-		else
+		} else
 			$this->processNormalRequest($writer);
 
 		$this->_writer = null;
@@ -494,8 +493,7 @@ 
 			{
 				foreach($this->_validators as $validator)
 					$validator->validate();
-			}
-			else
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
@@ -523,8 +521,7 @@ 
 						return false;
 			}
 			return true;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 
@@ -878,15 +875,13 @@ 
 				{
 					if($control->loadPostData($key, $postData))
 						$this->_controlsPostDataChanged[] = $control;
-				}
-				elseif($control instanceof IPostBackEventHandler &&
+				} elseif($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
-			}
-			elseif($beforeLoad)
+			} elseif($beforeLoad)
 				$this->_restPostData->add($key, $value);
 		}
 
@@ -898,8 +893,7 @@ 
 				{
 					if($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[] = $control;
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -978,8 +972,7 @@ 
 			else
 				$focus = $this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
-		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
+		} elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender = false;
 	}

framework/Web/UI/TTemplate.php

Doc Comments +12 added lines, -1 removed lines

@@ -120,6 +120,7 @@ 
 	 * @param integer the line number that parsing starts from (internal use)
 	 * @param boolean whether this template is a source template, i.e., this template is loaded from
 	 * some external storage rather than from within another template.
+	 * @param string $tplFile
 	 */
 	public function __construct($template, $contextPath, $tplFile = null, $startingLine = 0, $sourceTemplate = true)
 	{
@@ -302,6 +303,7 @@ 
 	 * @param TControl control to be configured
 	 * @param string property name
 	 * @param mixed property initial value
+	 * @param TControl $control
 	 */
 	protected function configureControl($control, $name, $value)
 	{
@@ -318,6 +320,7 @@ 
 	 * @param TComponent component to be configured
 	 * @param string property name
 	 * @param mixed property initial value
+	 * @param TComponent $component
 	 */
 	protected function configureComponent($component, $name, $value)
 	{
@@ -704,6 +707,8 @@ 
 	/**
 	 * Parses the attributes of a tag from a string.
 	 * @param string the string to be parsed.
+	 * @param string $str
+	 * @param string $offset
 	 * @return array attribute values indexed by names.
 	 */
 	protected function parseAttributes($str, $offset)
@@ -738,6 +743,9 @@ 
 		return $attributes;
 	}
 
+	/**
+	 * @param string $content
+	 */
 	protected function parseTemplateProperty($content, $offset)
 	{
 		$line = $this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
@@ -747,6 +755,7 @@ 
 	/**
 	 * Parses a single attribute.
 	 * @param string the string to be parsed.
+	 * @param string $value
 	 * @return array attribute initialization
 	 */
 	protected function parseAttribute($value)
@@ -890,6 +899,8 @@ 
 	 * @param Exception template exception
 	 * @param int line number
 	 * @param string template string if no source file is used
+	 * @param \Exception $e
+	 * @param integer $line
 	 */
 	protected function handleException($e, $line, $input = null)
 	{
@@ -959,7 +970,7 @@ 
 
 	/**
 	 * Checks if the given method belongs to a previously attached class behavior.
-	 * @param ReflectionClass $class
+	 * @param \ReflectionClass $class
 	 * @param string $method
 	 * @return boolean
 	 */

Spacing +277 added lines, -277 removed lines

@@ -61,26 +61,26 @@ 
 	 *	'<%[%#~\/\\$=\\[](.*?)%>'  - expressions
 	 *  '<prop:([\w\.\-]+)((?:\s*[\w\.\-]+=\'.*?\'|\s*[\w\.\-]+=".*?"|\s*[\w\.\-]+=<%.*?%>)*)\s*\/>' - group subproperty tags
 	 */
-	const REGEX_RULES = '/<!--.*?--!>|<!---.*?--->|<\/?com:([\w\.\\\]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.\-]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\/\\$=\\[](.*?)%>|<prop:([\w\.\-]+)((?:\s*[\w\.\-]+\s*=\s*\'.*?\'|\s*[\w\.\-]+\s*=\s*".*?"|\s*[\w\.\-]+\s*=\s*<%.*?%>)*)\s*\/>/msS';
+	const REGEX_RULES='/<!--.*?--!>|<!---.*?--->|<\/?com:([\w\.\\\]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.\-]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\/\\$=\\[](.*?)%>|<prop:([\w\.\-]+)((?:\s*[\w\.\-]+\s*=\s*\'.*?\'|\s*[\w\.\-]+\s*=\s*".*?"|\s*[\w\.\-]+\s*=\s*<%.*?%>)*)\s*\/>/msS';
 
 	/**
 	 * Different configurations of component property/event/attribute
 	 */
-	const CONFIG_DATABIND = 0;
-	const CONFIG_EXPRESSION = 1;
-	const CONFIG_ASSET = 2;
-	const CONFIG_PARAMETER = 3;
-	const CONFIG_LOCALIZATION = 4;
-	const CONFIG_TEMPLATE = 5;
+	const CONFIG_DATABIND=0;
+	const CONFIG_EXPRESSION=1;
+	const CONFIG_ASSET=2;
+	const CONFIG_PARAMETER=3;
+	const CONFIG_LOCALIZATION=4;
+	const CONFIG_TEMPLATE=5;
 
 	/**
 	 * @var array list of component tags and strings
 	 */
-	private $_tpl = [];
+	private $_tpl=[];
 	/**
 	 * @var array list of directive settings
 	 */
-	private $_directive = [];
+	private $_directive=[];
 	/**
 	 * @var string context path
 	 */
@@ -92,7 +92,7 @@ 
 	/**
 	 * @var integer the line number that parsing starts from (internal use)
 	 */
-	private $_startingLine = 0;
+	private $_startingLine=0;
 	/**
 	 * @var string template content to be parsed
 	 */
@@ -100,15 +100,15 @@ 
 	/**
 	 * @var boolean whether this template is a source template
 	 */
-	private $_sourceTemplate = true;
+	private $_sourceTemplate=true;
 	/**
 	 * @var string hash code of the template
 	 */
-	private $_hashCode = '';
+	private $_hashCode='';
 	private $_tplControl;
-	private $_includedFiles = [];
-	private $_includeAtLine = [];
-	private $_includeLines = [];
+	private $_includedFiles=[];
+	private $_includeAtLine=[];
+	private $_includeLines=[];
 
 
 	/**
@@ -121,16 +121,16 @@ 
 	 * @param boolean whether this template is a source template, i.e., this template is loaded from
 	 * some external storage rather than from within another template.
 	 */
-	public function __construct($template, $contextPath, $tplFile = null, $startingLine = 0, $sourceTemplate = true)
+	public function __construct($template, $contextPath, $tplFile=null, $startingLine=0, $sourceTemplate=true)
 	{
-		$this->_sourceTemplate = $sourceTemplate;
-		$this->_contextPath = $contextPath;
-		$this->_tplFile = $tplFile;
-		$this->_startingLine = $startingLine;
-		$this->_content = $template;
-		$this->_hashCode = md5($template);
+		$this->_sourceTemplate=$sourceTemplate;
+		$this->_contextPath=$contextPath;
+		$this->_tplFile=$tplFile;
+		$this->_startingLine=$startingLine;
+		$this->_content=$template;
+		$this->_hashCode=md5($template);
 		$this->parse($template);
-		$this->_content = null; // reset to save memory
+		$this->_content=null; // reset to save memory
 	}
 
 	/**
@@ -189,36 +189,36 @@ 
 	 * @param TControl the control who owns the template
 	 * @param TControl the control who will become the root parent of the controls on the template. If null, it uses the template control.
 	 */
-	public function instantiateIn($tplControl, $parentControl = null)
+	public function instantiateIn($tplControl, $parentControl=null)
 	{
-		$this->_tplControl = $tplControl;
-		if($parentControl === null)
-			$parentControl = $tplControl;
-		if(($page = $tplControl->getPage()) === null)
-			$page = $this->getService()->getRequestedPage();
-		$controls = [];
-		$directChildren = [];
+		$this->_tplControl=$tplControl;
+		if($parentControl===null)
+			$parentControl=$tplControl;
+		if(($page=$tplControl->getPage())===null)
+			$page=$this->getService()->getRequestedPage();
+		$controls=[];
+		$directChildren=[];
 		foreach($this->_tpl as $key => $object)
 		{
-			if($object[0] === -1)
-				$parent = $parentControl;
+			if($object[0]===-1)
+				$parent=$parentControl;
 			elseif(isset($controls[$object[0]]))
-				$parent = $controls[$object[0]];
+				$parent=$controls[$object[0]];
 			else
 				continue;
 			if(isset($object[2]))	// component
 			{
-				$component = Prado::createComponent($object[1]);
-				$properties = &$object[2];
+				$component=Prado::createComponent($object[1]);
+				$properties=&$object[2];
 				if($component instanceof TControl)
 				{
 					if($component instanceof \Prado\Web\UI\WebControls\TOutputCache)
-						$component->setCacheKeyPrefix($this->_hashCode . $key);
+						$component->setCacheKeyPrefix($this->_hashCode.$key);
 					$component->setTemplateControl($tplControl);
 					if(isset($properties['id']))
 					{
 						if(is_array($properties['id']))
-							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+							$properties['id']=$component->evaluateExpression($properties['id'][1]);
 						$tplControl->registerObject($properties['id'], $component);
 					}
 					if(isset($properties['skinid']))
@@ -238,28 +238,28 @@ 
 
 					$component->trackViewState(true);
 
-					if($parent === $parentControl)
-						$directChildren[] = $component;
+					if($parent===$parentControl)
+						$directChildren[]=$component;
 					else
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
-						$controls[$key] = $component;
+						$controls[$key]=$component;
 				}
 				elseif($component instanceof TComponent)
 				{
-					$controls[$key] = $component;
+					$controls[$key]=$component;
 					if(isset($properties['id']))
 					{
 						if(is_array($properties['id']))
-							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+							$properties['id']=$component->evaluateExpression($properties['id'][1]);
 						$tplControl->registerObject($properties['id'], $component);
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
 					foreach($properties as $name => $value)
 						$this->configureComponent($component, $name, $value);
-					if($parent === $parentControl)
-						$directChildren[] = $component;
+					if($parent===$parentControl)
+						$directChildren[]=$component;
 					else
 						$component->createdOnTemplate($parent);
 				}
@@ -269,17 +269,17 @@ 
 				if($object[1] instanceof TCompositeLiteral)
 				{
 					// need to clone a new object because the one in template is reused
-					$o = clone $object[1];
+					$o=clone $object[1];
 					$o->setContainer($tplControl);
-					if($parent === $parentControl)
-						$directChildren[] = $o;
+					if($parent===$parentControl)
+						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
 				}
 				else
 				{
-					if($parent === $parentControl)
-						$directChildren[] = $object[1];
+					if($parent===$parentControl)
+						$directChildren[]=$object[1];
 					else
 						$parent->addParsedObject($object[1]);
 				}
@@ -305,9 +305,9 @@ 
 	 */
 	protected function configureControl($control, $name, $value)
 	{
-		if(strncasecmp($name, 'on', 2) === 0)		// is an event
+		if(strncasecmp($name, 'on', 2)===0)		// is an event
 			$this->configureEvent($control, $name, $value, $control);
-		elseif(($pos = strrpos($name, '.')) === false)	// is a simple property or custom attribute
+		elseif(($pos=strrpos($name, '.'))===false)	// is a simple property or custom attribute
 			$this->configureProperty($control, $name, $value);
 		else	// is a subproperty
 			$this->configureSubProperty($control, $name, $value);
@@ -321,7 +321,7 @@ 
 	 */
 	protected function configureComponent($component, $name, $value)
 	{
-		if(strpos($name, '.') === false)	// is a simple property or custom attribute
+		if(strpos($name, '.')===false)	// is a simple property or custom attribute
 			$this->configureProperty($component, $name, $value);
 		else	// is a subproperty
 			$this->configureSubProperty($component, $name, $value);
@@ -336,10 +336,10 @@ 
 	 */
 	protected function configureEvent($control, $name, $value, $contextControl)
 	{
-		if(strpos($value, '.') === false)
-			$control->attachEventHandler($name, [$contextControl,'TemplateControl.' . $value]);
+		if(strpos($value, '.')===false)
+			$control->attachEventHandler($name, [$contextControl, 'TemplateControl.'.$value]);
 		else
-			$control->attachEventHandler($name, [$contextControl,$value]);
+			$control->attachEventHandler($name, [$contextControl, $value]);
 	}
 
 	/**
@@ -362,25 +362,25 @@ 
 						$component->autoBindProperty($name, $value[1]);
 					else
 					{
-						$setter = 'set' . $name;
+						$setter='set'.$name;
 						$component->$setter($this->_tplControl->evaluateExpression($value[1]));
 					}
 					break;
 				case self::CONFIG_TEMPLATE:
-					$setter = 'set' . $name;
+					$setter='set'.$name;
 					$component->$setter($value[1]);
 					break;
 				case self::CONFIG_ASSET:		// asset URL
-					$setter = 'set' . $name;
-					$url = $this->publishFilePath($this->_contextPath . DIRECTORY_SEPARATOR . $value[1]);
+					$setter='set'.$name;
+					$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
 					$component->$setter($url);
 					break;
 				case self::CONFIG_PARAMETER:		// application parameter
-					$setter = 'set' . $name;
+					$setter='set'.$name;
 					$component->$setter($this->getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
-					$setter = 'set' . $name;
+					$setter='set'.$name;
 					$component->$setter(Prado::localize($value[1]));
 					break;
 				default:	// an error if reaching here
@@ -390,10 +390,10 @@ 
 		}
 		else
 		{
-			if (substr($name, 0, 2) == 'js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
-					$value = new TJavaScriptLiteral($value);
-			$setter = 'set' . $name;
+			if(substr($name, 0, 2)=='js')
+				if($value and !($value instanceof TJavaScriptLiteral))
+					$value=new TJavaScriptLiteral($value);
+			$setter='set'.$name;
 			$component->$setter($value);
 		}
 	}
@@ -423,7 +423,7 @@ 
 					$component->setSubProperty($name, $value[1]);
 					break;
 				case self::CONFIG_ASSET:		// asset URL
-					$url = $this->publishFilePath($this->_contextPath . DIRECTORY_SEPARATOR . $value[1]);
+					$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
 					$component->setSubProperty($name, $url);
 					break;
 				case self::CONFIG_PARAMETER:		// application parameter
@@ -464,240 +464,240 @@ 
 	 */
 	protected function parse($input)
 	{
-		$input = $this->preprocess($input);
-		$tpl = &$this->_tpl;
-		$n = preg_match_all(self::REGEX_RULES, $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-		$expectPropEnd = false;
-		$textStart = 0;
-				$stack = [];
-		$container = -1;
-		$matchEnd = 0;
-		$c = 0;
-		$this->_directive = null;
+		$input=$this->preprocess($input);
+		$tpl=&$this->_tpl;
+		$n=preg_match_all(self::REGEX_RULES, $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+		$expectPropEnd=false;
+		$textStart=0;
+				$stack=[];
+		$container=-1;
+		$matchEnd=0;
+		$c=0;
+		$this->_directive=null;
 		try
 		{
-			for($i = 0;$i < $n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
-				$match = &$matches[$i];
-				$str = $match[0][0];
-				$matchStart = $match[0][1];
-				$matchEnd = $matchStart + strlen($str) - 1;
-				if(strpos($str, '<com:') === 0)	// opening component tag
+				$match=&$matches[$i];
+				$str=$match[0][0];
+				$matchStart=$match[0][1];
+				$matchEnd=$matchStart + strlen($str) - 1;
+				if(strpos($str, '<com:')===0)	// opening component tag
 				{
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-					$textStart = $matchEnd + 1;
-					$type = $match[1][0];
-					$attributes = $this->parseAttributes($match[2][0], $match[2][1]);
-					$class = $this->validateAttributes($type, $attributes);
-					$tpl[$c++] = [$container,$class,$attributes];
-					if($str[strlen($str) - 2] !== '/')  // open tag
+						$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+					$textStart=$matchEnd + 1;
+					$type=$match[1][0];
+					$attributes=$this->parseAttributes($match[2][0], $match[2][1]);
+					$class=$this->validateAttributes($type, $attributes);
+					$tpl[$c++]=[$container, $class, $attributes];
+					if($str[strlen($str) - 2]!=='/')  // open tag
 					{
-						$stack[] = $type;
-						$container = $c - 1;
+						$stack[]=$type;
+						$container=$c - 1;
 					}
 				}
-				elseif(strpos($str, '</com:') === 0)	// closing component tag
+				elseif(strpos($str, '</com:')===0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-					$textStart = $matchEnd + 1;
-					$type = $match[1][0];
+						$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+					$textStart=$matchEnd + 1;
+					$type=$match[1][0];
 
 					if(empty($stack))
 						throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
 
-					$name = array_pop($stack);
-					if($name !== $type)
+					$name=array_pop($stack);
+					if($name!==$type)
 					{
-						$tag = $name[0] === '@' ? '</prop:' . substr($name, 1) . '>' : "</com:$name>";
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
 						throw new TConfigurationException('template_closingtag_expected', $tag, "</com:$type>");
 					}
-					$container = $tpl[$container][0];
+					$container=$tpl[$container][0];
 				}
-				elseif(strpos($str, '<%@') === 0)	// directive
+				elseif(strpos($str, '<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-					$textStart = $matchEnd + 1;
-					if(isset($tpl[0]) || $this->_directive !== null)
+						$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+					$textStart=$matchEnd + 1;
+					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
-					$this->_directive = $this->parseAttributes($match[4][0], $match[4][1]);
+					$this->_directive=$this->parseAttributes($match[4][0], $match[4][1]);
 				}
-				elseif(strpos($str, '<%') === 0)	// expression
+				elseif(strpos($str, '<%')===0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-					$textStart = $matchEnd + 1;
-					$literal = trim($match[5][0]);
-					if($str[2] === '=')	// expression
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,$literal]];
-					elseif($str[2] === '%')  // statements
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_STATEMENTS,$literal]];
-					elseif($str[2] === '#')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_DATABINDING,$literal]];
-					elseif($str[2] === '$')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"]];
-					elseif($str[2] === '~')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"]];
-					elseif($str[2] === '/')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"]];
-					elseif($str[2] === '[')
+						$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+					$textStart=$matchEnd + 1;
+					$literal=trim($match[5][0]);
+					if($str[2]==='=')	// expression
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_EXPRESSION, $literal]];
+					elseif($str[2]==='%')  // statements
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_STATEMENTS, $literal]];
+					elseif($str[2]==='#')
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_DATABINDING, $literal]];
+					elseif($str[2]==='$')
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_EXPRESSION, "\$this->getApplication()->getParameters()->itemAt('$literal')"]];
+					elseif($str[2]==='~')
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_EXPRESSION, "\$this->publishFilePath('$this->_contextPath/$literal')"]];
+					elseif($str[2]==='/')
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"]];
+					elseif($str[2]==='[')
 					{
-						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'","\\" => "\\\\"]);
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"]];
+						$literal=strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'", "\\" => "\\\\"]);
+						$tpl[$c++]=[$container, [TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"]];
 					}
 				}
-				elseif(strpos($str, '<prop:') === 0)	// opening property
+				elseif(strpos($str, '<prop:')===0)	// opening property
 				{
-					if(strrpos($str, '/>') === strlen($str) - 2)  //subproperties
+					if(strrpos($str, '/>')===strlen($str) - 2)  //subproperties
 					{
 						if($expectPropEnd)
 							continue;
 						if($matchStart > $textStart)
-							$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-						$textStart = $matchEnd + 1;
-						$prop = strtolower($match[6][0]);
-						$attrs = $this->parseAttributes($match[7][0], $match[7][1]);
-						$attributes = [];
+							$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+						$textStart=$matchEnd + 1;
+						$prop=strtolower($match[6][0]);
+						$attrs=$this->parseAttributes($match[7][0], $match[7][1]);
+						$attributes=[];
 						foreach($attrs as $name => $value)
-							$attributes[$prop . '.' . $name] = $value;
-						$type = $tpl[$container][1];
+							$attributes[$prop.'.'.$name]=$value;
+						$type=$tpl[$container][1];
 						$this->validateAttributes($type, $attributes);
 						foreach($attributes as $name => $value)
 						{
 							if(isset($tpl[$container][2][$name]))
 								throw new TConfigurationException('template_property_duplicated', $name);
-							$tpl[$container][2][$name] = $value;
+							$tpl[$container][2][$name]=$value;
 						}
 					}
 					else  // regular property
 					{
-						$prop = strtolower($match[3][0]);
-						$stack[] = '@' . $prop;
+						$prop=strtolower($match[3][0]);
+						$stack[]='@'.$prop;
 						if(!$expectPropEnd)
 						{
 							if($matchStart > $textStart)
-								$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-							$textStart = $matchEnd + 1;
-							$expectPropEnd = true;
+								$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+							$textStart=$matchEnd + 1;
+							$expectPropEnd=true;
 						}
 					}
 				}
-				elseif(strpos($str, '</prop:') === 0)	// closing property
+				elseif(strpos($str, '</prop:')===0)	// closing property
 				{
-					$prop = strtolower($match[3][0]);
+					$prop=strtolower($match[3][0]);
 					if(empty($stack))
 						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
-					$name = array_pop($stack);
-					if($name !== '@' . $prop)
+					$name=array_pop($stack);
+					if($name!=='@'.$prop)
 					{
-						$tag = $name[0] === '@' ? '</prop:' . substr($name, 1) . '>' : "</com:$name>";
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
 						throw new TConfigurationException('template_closingtag_expected', $tag, "</prop:$prop>");
 					}
-					if(($last = count($stack)) < 1 || $stack[$last - 1][0] !== '@')
+					if(($last=count($stack)) < 1 || $stack[$last - 1][0]!=='@')
 					{
 						if($matchStart > $textStart)
 						{
-							$value = substr($input, $textStart, $matchStart - $textStart);
-							if(substr($prop, -8, 8) === 'template')
-								$value = $this->parseTemplateProperty($value, $textStart);
+							$value=substr($input, $textStart, $matchStart - $textStart);
+							if(substr($prop, -8, 8)==='template')
+								$value=$this->parseTemplateProperty($value, $textStart);
 							else
-								$value = $this->parseAttribute($value);
+								$value=$this->parseAttribute($value);
 							if($container >= 0)
 							{
-								$type = $tpl[$container][1];
+								$type=$tpl[$container][1];
 								$this->validateAttributes($type, [$prop => $value]);
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated', $prop);
-								$tpl[$container][2][$prop] = $value;
+								$tpl[$container][2][$prop]=$value;
 							}
 							else	// a property for the template control
-								$this->_directive[$prop] = $value;
-							$textStart = $matchEnd + 1;
+								$this->_directive[$prop]=$value;
+							$textStart=$matchEnd + 1;
 						}
-						$expectPropEnd = false;
+						$expectPropEnd=false;
 					}
 				}
-				elseif(strpos($str, '<!--') === 0)	// comments
+				elseif(strpos($str, '<!--')===0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
-					$textStart = $matchEnd + 1;
+						$tpl[$c++]=[$container, substr($input, $textStart, $matchStart - $textStart)];
+					$textStart=$matchEnd + 1;
 				}
 				else
 					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
 			{
-				$name = array_pop($stack);
-				$tag = $name[0] === '@' ? '</prop:' . substr($name, 1) . '>' : "</com:$name>";
+				$name=array_pop($stack);
+				$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
 				throw new TConfigurationException('template_closingtag_expected', $tag, "nothing");
 			}
 			if($textStart < strlen($input))
-				$tpl[$c++] = [$container,substr($input, $textStart)];
+				$tpl[$c++]=[$container, substr($input, $textStart)];
 		}
 		catch(\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
-			if($matchEnd === 0)
-				$line = $this->_startingLine + 1;
+			if($matchEnd===0)
+				$line=$this->_startingLine + 1;
 			else
-				$line = $this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
+				$line=$this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
 			$this->handleException($e, $line, $input);
 		}
 
-		if($this->_directive === null)
-			$this->_directive = [];
+		if($this->_directive===null)
+			$this->_directive=[];
 
 		// optimization by merging consecutive strings, expressions, statements and bindings
-		$objects = [];
-		$parent = null;
-		$merged = [];
+		$objects=[];
+		$parent=null;
+		$merged=[];
 		foreach($tpl as $id => $object)
 		{
-			if(isset($object[2]) || $object[0] !== $parent)
+			if(isset($object[2]) || $object[0]!==$parent)
 			{
-				if($parent !== null)
+				if($parent!==null)
 				{
-					if(count($merged[1]) === 1 && is_string($merged[1][0]))
-						$objects[$id - 1] = [$merged[0],$merged[1][0]];
+					if(count($merged[1])===1 && is_string($merged[1][0]))
+						$objects[$id - 1]=[$merged[0], $merged[1][0]];
 					else
-						$objects[$id - 1] = [$merged[0],new TCompositeLiteral($merged[1])];
+						$objects[$id - 1]=[$merged[0], new TCompositeLiteral($merged[1])];
 				}
 				if(isset($object[2]))
 				{
-					$parent = null;
-					$objects[$id] = $object;
+					$parent=null;
+					$objects[$id]=$object;
 				}
 				else
 				{
-					$parent = $object[0];
-					$merged = [$parent,[$object[1]]];
+					$parent=$object[0];
+					$merged=[$parent, [$object[1]]];
 				}
 			}
 			else
-				$merged[1][] = $object[1];
+				$merged[1][]=$object[1];
 		}
-		if($parent !== null)
+		if($parent!==null)
 		{
-			if(count($merged[1]) === 1 && is_string($merged[1][0]))
-				$objects[$id] = [$merged[0],$merged[1][0]];
+			if(count($merged[1])===1 && is_string($merged[1][0]))
+				$objects[$id]=[$merged[0], $merged[1][0]];
 			else
-				$objects[$id] = [$merged[0],new TCompositeLiteral($merged[1])];
+				$objects[$id]=[$merged[0], new TCompositeLiteral($merged[1])];
 		}
-		$tpl = $objects;
+		$tpl=$objects;
 		return $objects;
 	}
 
@@ -708,31 +708,31 @@ 
 	 */
 	protected function parseAttributes($str, $offset)
 	{
-		if($str === '')
+		if($str==='')
 			return [];
-		$pattern = '/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
-		$attributes = [];
-		$n = preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-		for($i = 0;$i < $n;++$i)
+		$pattern='/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
+		$attributes=[];
+		$n=preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+		for($i=0; $i < $n; ++$i)
 		{
-			$match = &$matches[$i];
-			$name = strtolower($match[1][0]);
+			$match=&$matches[$i];
+			$name=strtolower($match[1][0]);
 			if(isset($attributes[$name]))
 				throw new TConfigurationException('template_property_duplicated', $name);
-			$value = $match[2][0];
-			if(substr($name, -8, 8) === 'template')
+			$value=$match[2][0];
+			if(substr($name, -8, 8)==='template')
 			{
-				if($value[0] === '\'' || $value[0] === '"')
-					$attributes[$name] = $this->parseTemplateProperty(substr($value, 1, strlen($value) - 2), $match[2][1] + 1);
+				if($value[0]==='\'' || $value[0]==='"')
+					$attributes[$name]=$this->parseTemplateProperty(substr($value, 1, strlen($value) - 2), $match[2][1] + 1);
 				else
-					$attributes[$name] = $this->parseTemplateProperty($value, $match[2][1]);
+					$attributes[$name]=$this->parseTemplateProperty($value, $match[2][1]);
 			}
 			else
 			{
-				if($value[0] === '\'' || $value[0] === '"')
-					$attributes[$name] = $this->parseAttribute(substr($value, 1, strlen($value) - 2));
+				if($value[0]==='\'' || $value[0]==='"')
+					$attributes[$name]=$this->parseAttribute(substr($value, 1, strlen($value) - 2));
 				else
-					$attributes[$name] = $this->parseAttribute($value);
+					$attributes[$name]=$this->parseAttribute($value);
 			}
 		}
 		return $attributes;
@@ -740,8 +740,8 @@ 
 
 	protected function parseTemplateProperty($content, $offset)
 	{
-		$line = $this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
-		return [self::CONFIG_TEMPLATE,new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false)];
+		$line=$this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
+		return [self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false)];
 	}
 
 	/**
@@ -751,44 +751,44 @@ 
 	 */
 	protected function parseAttribute($value)
 	{
-		if(($n = preg_match_all('/<%[#=].*?%>/msS', $value, $matches, PREG_OFFSET_CAPTURE)) > 0)
+		if(($n=preg_match_all('/<%[#=].*?%>/msS', $value, $matches, PREG_OFFSET_CAPTURE)) > 0)
 		{
-			$isDataBind = false;
-			$textStart = 0;
-			$expr = '';
-			for($i = 0;$i < $n;++$i)
+			$isDataBind=false;
+			$textStart=0;
+			$expr='';
+			for($i=0; $i < $n; ++$i)
 			{
-				$match = $matches[0][$i];
-				$token = $match[0];
-				$offset = $match[1];
-				$length = strlen($token);
-				if($token[2] === '#')
-					$isDataBind = true;
+				$match=$matches[0][$i];
+				$token=$match[0];
+				$offset=$match[1];
+				$length=strlen($token);
+				if($token[2]==='#')
+					$isDataBind=true;
 				if($offset > $textStart)
-					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
-				$expr .= '.(' . substr($token, 3, $length - 5) . ')';
-				$textStart = $offset + $length;
+					$expr.=".'".strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'", "\\" => "\\\\"])."'";
+				$expr.='.('.substr($token, 3, $length - 5).')';
+				$textStart=$offset + $length;
 			}
-			$length = strlen($value);
+			$length=strlen($value);
 			if($length > $textStart)
-				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+				$expr.=".'".strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'", "\\" => "\\\\"])."'";
 			if($isDataBind)
-				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
+				return [self::CONFIG_DATABIND, ltrim($expr, '.')];
 			else
-				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
+				return [self::CONFIG_EXPRESSION, ltrim($expr, '.')];
 		}
-		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
+		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0]===$value)
 		{
-			$value = $matches[1];
-			if($value[2] === '~')
-				return [self::CONFIG_ASSET,trim(substr($value, 3, strlen($value) - 5))];
-			elseif($value[2] === '[')
-				return [self::CONFIG_LOCALIZATION,trim(substr($value, 3, strlen($value) - 6))];
-			elseif($value[2] === '$')
-				return [self::CONFIG_PARAMETER,trim(substr($value, 3, strlen($value) - 5))];
-			elseif($value[2] === '/') {
-				$literal = trim(substr($value, 3, strlen($value) - 5));
-				return [self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
+			$value=$matches[1];
+			if($value[2]==='~')
+				return [self::CONFIG_ASSET, trim(substr($value, 3, strlen($value) - 5))];
+			elseif($value[2]==='[')
+				return [self::CONFIG_LOCALIZATION, trim(substr($value, 3, strlen($value) - 6))];
+			elseif($value[2]==='$')
+				return [self::CONFIG_PARAMETER, trim(substr($value, 3, strlen($value) - 5))];
+			elseif($value[2]==='/') {
+				$literal=trim(substr($value, 3, strlen($value) - 5));
+				return [self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
 		}
 		else
@@ -798,23 +798,23 @@ 
 	protected function validateAttributes($type, $attributes)
 	{
 		Prado::using($type);
-		if(($pos = strrpos($type, '.')) !== false)
-			$className = substr($type, $pos + 1);
+		if(($pos=strrpos($type, '.'))!==false)
+			$className=substr($type, $pos + 1);
 		else
-			$className = $type;
-		$class = new \ReflectionClass($className);
-		if(is_subclass_of($className, '\Prado\Web\UI\TControl') || $className === '\Prado\Web\UI\TControl')
+			$className=$type;
+		$class=new \ReflectionClass($className);
+		if(is_subclass_of($className, '\Prado\Web\UI\TControl') || $className==='\Prado\Web\UI\TControl')
 		{
 			foreach($attributes as $name => $att)
 			{
-				if(($pos = strpos($name, '.')) !== false)
+				if(($pos=strpos($name, '.'))!==false)
 				{
 					// a subproperty, so the first segment must be readable
-					$subname = substr($name, 0, $pos);
-					if(!$class->hasMethod('get' . $subname))
+					$subname=substr($name, 0, $pos);
+					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				elseif(strncasecmp($name, 'on', 2)===0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
@@ -825,44 +825,44 @@ 
 				else
 				{
 					// a simple property
-					if (! ($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
+					if(!($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class, 'set'.$name)))
 					{
-						if ($class->hasMethod('get' . $name) || $class->hasMethod('getjs' . $name))
+						if($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
-					elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
+					elseif(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
-						if(strcasecmp($name, 'id') === 0)
+						if(strcasecmp($name, 'id')===0)
 							throw new TConfigurationException('template_controlid_invalid', $type);
-						elseif(strcasecmp($name, 'skinid') === 0)
+						elseif(strcasecmp($name, 'skinid')===0)
 							throw new TConfigurationException('template_controlskinid_invalid', $type);
 					}
 				}
 			}
 		}
-		elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
+		elseif(is_subclass_of($className, '\Prado\TComponent') || $className==='\Prado\TComponent')
 		{
 			foreach($attributes as $name => $att)
 			{
-				if(is_array($att) && ($att[0] === self::CONFIG_DATABIND))
+				if(is_array($att) && ($att[0]===self::CONFIG_DATABIND))
 					throw new TConfigurationException('template_databind_forbidden', $type, $name);
-				if(($pos = strpos($name, '.')) !== false)
+				if(($pos=strpos($name, '.'))!==false)
 				{
 					// a subproperty, so the first segment must be readable
-					$subname = substr($name, 0, $pos);
-					if(!$class->hasMethod('get' . $subname))
+					$subname=substr($name, 0, $pos);
+					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				elseif(strncasecmp($name, 'on', 2)===0)
 					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
 					// id is still alowed for TComponent, even if id property doesn't exist
-					if(strcasecmp($name, 'id') !== 0 && !($class->hasMethod('set' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
+					if(strcasecmp($name, 'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class, 'set'.$name)))
 					{
-						if($class->hasMethod('get' . $name))
+						if($class->hasMethod('get'.$name))
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
@@ -891,28 +891,28 @@ 
 	 * @param int line number
 	 * @param string template string if no source file is used
 	 */
-	protected function handleException($e, $line, $input = null)
+	protected function handleException($e, $line, $input=null)
 	{
-		$srcFile = $this->_tplFile;
+		$srcFile=$this->_tplFile;
 
-		if(($n = count($this->_includedFiles)) > 0) // need to adjust error row number and file name
+		if(($n=count($this->_includedFiles)) > 0) // need to adjust error row number and file name
 		{
-			for($i = $n - 1;$i >= 0;--$i)
+			for($i=$n - 1; $i >= 0; --$i)
 			{
 				if($this->_includeAtLine[$i] <= $line)
 				{
 					if($line < $this->_includeAtLine[$i] + $this->_includeLines[$i])
 					{
-						$line = $line - $this->_includeAtLine[$i] + 1;
-						$srcFile = $this->_includedFiles[$i];
+						$line=$line - $this->_includeAtLine[$i] + 1;
+						$srcFile=$this->_includedFiles[$i];
 						break;
 					}
 					else
-						$line = $line - $this->_includeLines[$i] + 1;
+						$line=$line - $this->_includeLines[$i] + 1;
 				}
 			}
 		}
-		$exception = new TTemplateException('template_format_invalid', $e->getMessage());
+		$exception=new TTemplateException('template_format_invalid', $e->getMessage());
 		$exception->setLineNumber($line);
 		if(!empty($srcFile))
 			$exception->setTemplateFile($srcFile);
@@ -928,29 +928,29 @@ 
 	 */
 	protected function preprocess($input)
 	{
-		if($n = preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		if($n=preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
-			for($i = 0;$i < $n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
-				$filePath = Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
-				if($filePath !== null && is_file($filePath))
-					$this->_includedFiles[] = $filePath;
+				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
+				if($filePath!==null && is_file($filePath))
+					$this->_includedFiles[]=$filePath;
 				else
 				{
-					$errorLine = count(explode("\n", substr($input, 0, $matches[$i][0][1] + 1)));
+					$errorLine=count(explode("\n", substr($input, 0, $matches[$i][0][1] + 1)));
 					$this->handleException(new TConfigurationException('template_include_invalid', trim($matches[$i][1][0])), $errorLine, $input);
 				}
 			}
-			$base = 0;
-			for($i = 0;$i < $n;++$i)
+			$base=0;
+			for($i=0; $i < $n; ++$i)
 			{
-				$ext = file_get_contents($this->_includedFiles[$i]);
-				$length = strlen($matches[$i][0][0]);
-				$offset = $base + $matches[$i][0][1];
-				$this->_includeAtLine[$i] = count(explode("\n", substr($input, 0, $offset)));
-				$this->_includeLines[$i] = count(explode("\n", $ext));
-				$input = substr_replace($input, $ext, $offset, $length);
-				$base += strlen($ext) - $length;
+				$ext=file_get_contents($this->_includedFiles[$i]);
+				$length=strlen($matches[$i][0][0]);
+				$offset=$base + $matches[$i][0][1];
+				$this->_includeAtLine[$i]=count(explode("\n", substr($input, 0, $offset)));
+				$this->_includeLines[$i]=count(explode("\n", $ext));
+				$input=substr_replace($input, $ext, $offset, $length);
+				$base+=strlen($ext) - $length;
 			}
 		}
 
@@ -965,13 +965,13 @@ 
 	 */
 	protected function isClassBehaviorMethod(\ReflectionClass $class, $method)
 	{
-	  $component = new \ReflectionClass('\Prado\TComponent');
-	  $behaviors = $component->getStaticProperties();
+	  $component=new \ReflectionClass('\Prado\TComponent');
+	  $behaviors=$component->getStaticProperties();
 	  if(!isset($behaviors['_um']))
 		return false;
 	  foreach($behaviors['_um'] as $name => $list)
 	  {
-		if(strtolower($class->getShortName()) !== $name && !$class->isSubclassOf($name)) continue;
+		if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
 		foreach($list as $param)
 		{
 		  if(method_exists($param->getBehavior(), $method))

Braces +27 added lines, -54 removed lines

@@ -244,8 +244,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key] = $component;
-				}
-				elseif($component instanceof TComponent)
+				} elseif($component instanceof TComponent)
 				{
 					$controls[$key] = $component;
 					if(isset($properties['id']))
@@ -263,8 +262,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -275,8 +273,7 @@ 
 						$directChildren[] = $o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent === $parentControl)
 						$directChildren[] = $object[1];
@@ -387,8 +384,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			if (substr($name, 0, 2) == 'js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
@@ -436,8 +432,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name, $value);
 	}
 
@@ -498,8 +493,7 @@ 
 						$stack[] = $type;
 						$container = $c - 1;
 					}
-				}
-				elseif(strpos($str, '</com:') === 0)	// closing component tag
+				} elseif(strpos($str, '</com:') === 0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
@@ -518,8 +512,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected', $tag, "</com:$type>");
 					}
 					$container = $tpl[$container][0];
-				}
-				elseif(strpos($str, '<%@') === 0)	// directive
+				} elseif(strpos($str, '<%@') === 0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -529,8 +522,7 @@ 
 					if(isset($tpl[0]) || $this->_directive !== null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive = $this->parseAttributes($match[4][0], $match[4][1]);
-				}
-				elseif(strpos($str, '<%') === 0)	// expression
+				} elseif(strpos($str, '<%') === 0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
@@ -555,8 +547,7 @@ 
 						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'","\\" => "\\\\"]);
 						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"]];
 					}
-				}
-				elseif(strpos($str, '<prop:') === 0)	// opening property
+				} elseif(strpos($str, '<prop:') === 0)	// opening property
 				{
 					if(strrpos($str, '/>') === strlen($str) - 2)  //subproperties
 					{
@@ -578,8 +569,7 @@ 
 								throw new TConfigurationException('template_property_duplicated', $name);
 							$tpl[$container][2][$name] = $value;
 						}
-					}
-					else  // regular property
+					} else  // regular property
 					{
 						$prop = strtolower($match[3][0]);
 						$stack[] = '@' . $prop;
@@ -591,8 +581,7 @@ 
 							$expectPropEnd = true;
 						}
 					}
-				}
-				elseif(strpos($str, '</prop:') === 0)	// closing property
+				} elseif(strpos($str, '</prop:') === 0)	// closing property
 				{
 					$prop = strtolower($match[3][0]);
 					if(empty($stack))
@@ -619,23 +608,20 @@ 
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated', $prop);
 								$tpl[$container][2][$prop] = $value;
-							}
-							else	// a property for the template control
+							} else	// a property for the template control
 								$this->_directive[$prop] = $value;
 							$textStart = $matchEnd + 1;
 						}
 						$expectPropEnd = false;
 					}
-				}
-				elseif(strpos($str, '<!--') === 0)	// comments
+				} elseif(strpos($str, '<!--') === 0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart > $textStart)
 						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
@@ -646,8 +632,7 @@ 
 			}
 			if($textStart < strlen($input))
 				$tpl[$c++] = [$container,substr($input, $textStart)];
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -680,14 +665,12 @@ 
 				{
 					$parent = null;
 					$objects[$id] = $object;
-				}
-				else
+				} else
 				{
 					$parent = $object[0];
 					$merged = [$parent,[$object[1]]];
 				}
-			}
-			else
+			} else
 				$merged[1][] = $object[1];
 		}
 		if($parent !== null)
@@ -726,8 +709,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));
@@ -776,8 +758,7 @@ 
 				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
 			else
 				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
-		}
-		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
+		} elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
 		{
 			$value = $matches[1];
 			if($value[2] === '~')
@@ -790,8 +771,7 @@ 
 				$literal = trim(substr($value, 3, strlen($value) - 5));
 				return [self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 
@@ -813,16 +793,14 @@ 
 					$subname = substr($name, 0, $pos);
 					if(!$class->hasMethod('get' . $subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				} elseif(strncasecmp($name, 'on', 2) === 0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown', $type, $name);
 					elseif(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid', $type, $name);
-				}
-				else
+				} else
 				{
 					// a simple property
 					if (! ($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
@@ -831,8 +809,7 @@ 
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
-					}
-					elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
+					} elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name, 'id') === 0)
 							throw new TConfigurationException('template_controlid_invalid', $type);
@@ -841,8 +818,7 @@ 
 					}
 				}
 			}
-		}
-		elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
+		} elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
 		{
 			foreach($attributes as $name => $att)
 			{
@@ -854,8 +830,7 @@ 
 					$subname = substr($name, 0, $pos);
 					if(!$class->hasMethod('get' . $subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				} elseif(strncasecmp($name, 'on', 2) === 0)
 					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
@@ -869,8 +844,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required', $type);
 		return $class->getName();
 	}
@@ -906,8 +880,7 @@ 
 						$line = $line - $this->_includeAtLine[$i] + 1;
 						$srcFile = $this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line = $line - $this->_includeLines[$i] + 1;
 				}
 			}