pradosoft / prado

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Spacing +14 added lines, -14 removed lines

@@ -237,20 +237,20 @@ 
 	public function raiseCallbackEvent($param)
 	{
 		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		if (is_array($token) && count($token) == 2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if ($token[1] === '__TJuiAutoComplete_onSuggest__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			elseif($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			elseif ($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
-		elseif($this->getAutoPostBack())
+		elseif ($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 
@@ -293,7 +293,7 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
+		if ($this->getPage()->getIsCallback())
 			$this->renderSuggestions($this->getResponse()->createHtmlWriter());
 	}
 
@@ -302,7 +302,7 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel === null)
+		if ($this->_resultPanel === null)
 			$this->_resultPanel = $this->createResultPanel();
 		return $this->_resultPanel;
 	}
@@ -323,7 +323,7 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater === null)
+		if ($this->_repeater === null)
 			$this->_repeater = $this->createRepeater();
 		return $this->_repeater;
 	}
@@ -372,16 +372,16 @@ 
 	 */
 	public function renderSuggestions($writer)
 	{
-		if($this->getActiveControl()->canUpdateClientSide(true))
+		if ($this->getActiveControl()->canUpdateClientSide(true))
 		{
 			$data = [];
 			$items = $this->getSuggestions()->getItems();
 			$writer = new TTextWriter;
-			for($i = 0; $i < $items->Count; $i++)
+			for ($i = 0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
 				$item = $writer->flush();
-				$data[] = [ 'id' => $i, 'label' => $item];
+				$data[] = ['id' => $i, 'label' => $item];
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -395,19 +395,19 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
+		if (strlen($separator = $this->getSeparator()))
 			$options['Separators'] = $separator;
 
-		if($this->getAutoPostBack())
+		if ($this->getAutoPostBack())
 		{
 			$options = array_merge($options, parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
+		if (strlen($textCssClass = $this->getTextCssClass()))
 			$options['textCssClass'] = $textCssClass;
 		$options['minLength'] = $this->getMinChars();
 		$options['delay'] = $this->getFrequency() * 1000.0;
-		$options['appendTo'] = '#' . $this->getResultPanel()->getClientID();
+		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
 		$options['CausesValidation'] = $this->getCausesValidation();

Braces +18 added lines, -14 removed lines

@@ -243,15 +243,14 @@ 
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			elseif($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			} elseif($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
+		} elseif($this->getAutoPostBack()) {
+					parent::raiseCallbackEvent($param);
 		}
-		elseif($this->getAutoPostBack())
-			parent::raiseCallbackEvent($param);
 	}
 
 	/**
@@ -293,8 +292,9 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
-			$this->renderSuggestions($this->getResponse()->createHtmlWriter());
+		if($this->getPage()->getIsCallback()) {
+					$this->renderSuggestions($this->getResponse()->createHtmlWriter());
+		}
 	}
 
 	/**
@@ -302,8 +302,9 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel === null)
-			$this->_resultPanel = $this->createResultPanel();
+		if($this->_resultPanel === null) {
+					$this->_resultPanel = $this->createResultPanel();
+		}
 		return $this->_resultPanel;
 	}
 
@@ -323,8 +324,9 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater === null)
-			$this->_repeater = $this->createRepeater();
+		if($this->_repeater === null) {
+					$this->_repeater = $this->createRepeater();
+		}
 		return $this->_repeater;
 	}
 
@@ -395,16 +397,18 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator = $this->getSeparator())) {
+					$options['Separators'] = $separator;
+		}
 
 		if($this->getAutoPostBack())
 		{
 			$options = array_merge($options, parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
+		if(strlen($textCssClass = $this->getTextCssClass())) {
+					$options['textCssClass'] = $textCssClass;
+		}
 		$options['minLength'] = $this->getMinChars();
 		$options['delay'] = $this->getFrequency() * 1000.0;
 		$options['appendTo'] = '#' . $this->getResultPanel()->getClientID();

framework/Web/UI/JuiControls/TJuiSlider.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 		$writer->addAttribute('id', $this->getClientID());
 		$options = TJavaScript::encode($this->getPostBackOptions());
 		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
+		$code = "jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 

framework/Web/UI/JuiControls/TJuiControlAdapter.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl('jquery-ui');
-		return $base . '/' . $file;
+		return $base.'/'.$file;
 	}
 
 	/**
@@ -84,9 +84,9 @@ 
 	 */
 	public function publishJuiStyle($file)
 	{
-		$url = $this->getAssetUrl(self::CSS_PATH . '/' . $this->getJuiBaseStyle() . '/' . $file);
+		$url = $this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
 	}

Braces +3 added lines, -2 removed lines

@@ -86,8 +86,9 @@
 	{
 		$url = $this->getAssetUrl(self::CSS_PATH . '/' . $this->getJuiBaseStyle() . '/' . $file);
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
 	}
 

framework/Web/UI/JuiControls/TJuiDroppable.php

Spacing +7 added lines, -7 removed lines

@@ -142,7 +142,7 @@ 
 		$writer->addAttribute('id', $this->getClientID());
 		$options = TJavaScript::encode($this->getPostBackOptions());
 		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
+		$code = "jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -160,7 +160,7 @@ 
 	 * Raises the OnActivate event
 	 * @param object $params event parameters
 	 */
-	public function onActivate ($params)
+	public function onActivate($params)
 	{
 		$this->raiseEvent('OnActivate', $this, $params);
 	}
@@ -169,7 +169,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -178,7 +178,7 @@ 
 	 * Raises the OnDeactivate event
 	 * @param object $params event parameters
 	 */
-	public function onDeactivate ($params)
+	public function onDeactivate($params)
 	{
 		$this->raiseEvent('OnDeactivate', $this, $params);
 	}
@@ -187,7 +187,7 @@ 
 	 * Raises the OnDrop event
 	 * @param object $params event parameters
 	 */
-	public function onDrop ($params)
+	public function onDrop($params)
 	{
 		$this->raiseEvent('OnDrop', $this, $params);
 	}
@@ -196,7 +196,7 @@ 
 	 * Raises the OnOut event
 	 * @param object $params event parameters
 	 */
-	public function OnOut ($params)
+	public function OnOut($params)
 	{
 		$this->raiseEvent('OnOut', $this, $params);
 	}
@@ -205,7 +205,7 @@ 
 	 * Raises the OnOver event
 	 * @param object $params event parameters
 	 */
-	public function OnOver ($params)
+	public function OnOver($params)
 	{
 		$this->raiseEvent('OnOver', $this, $params);
 	}

framework/Web/UI/JuiControls/TJuiControlOptions.php

Spacing +18 added lines, -18 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	public function setControl($control)
 	{
-		if(!$control instanceof IJuiOptions)
+		if (!$control instanceof IJuiOptions)
 			throw new THttpException(500, 'juioptions_control_invalid', $control->ID);
 		$this->_control = $control;
 	}
@@ -74,25 +74,25 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if($this->_options === null)
+		if ($this->_options === null)
 			$this->_options = [];
 
-		foreach($this->_control->getValidOptions() as $option)
+		foreach ($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option))
+			if (0 == strcasecmp($name, $option))
 			{
 				$low = strtolower($value);
-				if($low === 'null')
+				if ($low === 'null')
 				{
 					$this->_options[$option] = null;
-				} elseif($low === 'true') {
+				} elseif ($low === 'true') {
 					$this->_options[$option] = true;
-				} elseif($low === 'false') {
+				} elseif ($low === 'false') {
 					$this->_options[$option] = false;
-				} elseif(is_numeric($value)) {
+				} elseif (is_numeric($value)) {
 					// trick to get float or integer automatically when needed
 					$this->_options[$option] = $value + 0;
-				} elseif(substr($low, 0, 8) == 'function') {
+				} elseif (substr($low, 0, 8) == 'function') {
 					$this->_options[$option] = new TJavaScriptLiteral($value);
 				} else {
 					$this->_options[$option] = $value;
@@ -112,12 +112,12 @@ 
 	 */
 	public function __get($name)
 	{
-		if($this->_options === null)
+		if ($this->_options === null)
 			$this->_options = [];
 
-		foreach($this->_control->getValidOptions() as $option)
+		foreach ($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option) && isset($this->_options[$option]))
+			if (0 == strcasecmp($name, $option) && isset($this->_options[$option]))
 			{
 				return $this->_options[$option];
 			}
@@ -141,9 +141,9 @@ 
 	{
 		$ret = ($this->_options === null) ? [] : $this->_options;
 
-		foreach($this->_control->getValidEvents() as $event)
-			if($this->_control->hasEventHandler('on' . $event))
-				$ret[$event] = new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(" . TJavaScript::encode($this->_control->getUniqueID()) . ", " . TJavaScript::encode($event) . ", event, ui, this); }");
+		foreach ($this->_control->getValidEvents() as $event)
+			if ($this->_control->hasEventHandler('on'.$event))
+				$ret[$event] = new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(".TJavaScript::encode($this->_control->getUniqueID()).", ".TJavaScript::encode($event).", event, ui, this); }");
 
 		return $ret;
 	}
@@ -155,10 +155,10 @@ 
 	public function raiseCallbackEvent($param)
 	{
 		$callbackParam = $param->CallbackParameter;
-		if(isset($callbackParam->event))
+		if (isset($callbackParam->event))
 		{
-			$eventName = 'On' . ucfirst($callbackParam->event);
-			if($this->_control->hasEventHandler($eventName))
+			$eventName = 'On'.ucfirst($callbackParam->event);
+			if ($this->_control->hasEventHandler($eventName))
 			{
 				$this->_control->$eventName(new TJuiEventParameter(
 					$this->_control->getResponse(),

Braces +12 added lines, -8 removed lines

@@ -60,8 +60,9 @@ 
 	 */
 	public function setControl($control)
 	{
-		if(!$control instanceof IJuiOptions)
-			throw new THttpException(500, 'juioptions_control_invalid', $control->ID);
+		if(!$control instanceof IJuiOptions) {
+					throw new THttpException(500, 'juioptions_control_invalid', $control->ID);
+		}
 		$this->_control = $control;
 	}
 
@@ -74,8 +75,9 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if($this->_options === null)
-			$this->_options = [];
+		if($this->_options === null) {
+					$this->_options = [];
+		}
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
@@ -112,8 +114,9 @@ 
 	 */
 	public function __get($name)
 	{
-		if($this->_options === null)
-			$this->_options = [];
+		if($this->_options === null) {
+					$this->_options = [];
+		}
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
@@ -141,9 +144,10 @@ 
 	{
 		$ret = ($this->_options === null) ? [] : $this->_options;
 
-		foreach($this->_control->getValidEvents() as $event)
-			if($this->_control->hasEventHandler('on' . $event))
+		foreach($this->_control->getValidEvents() as $event) {
+					if($this->_control->hasEventHandler('on' . $event))
 				$ret[$event] = new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(" . TJavaScript::encode($this->_control->getUniqueID()) . ", " . TJavaScript::encode($event) . ", event, ui, this); }");
+		}
 
 		return $ret;
 	}

framework/Web/UI/JuiControls/TJuiDialog.php

Spacing +7 added lines, -7 removed lines

@@ -105,11 +105,11 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 		// always make the dialog a child of the form, or its inner inputs won't be collected
-		if(!isset($options['appendTo']))
+		if (!isset($options['appendTo']))
 			$options['appendTo'] = 'form:first';
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach ($this->getControls() as $control)
+			if ($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
 
 		return $options;
@@ -126,7 +126,7 @@ 
 		$writer->addAttribute('id', $this->getClientID());
 		$options = TJavaScript::encode($this->getPostBackOptions());
 		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
+		$code = "jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -144,7 +144,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}
@@ -168,7 +168,7 @@ 
 	private function triggerClientMethod($method)
 	{
 		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery(document).ready(function() { jQuery('#" . $this->getClientId() . "').dialog('" . $method . "'); })";
+		$code = "jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -189,7 +189,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasPreRendered() && $this->getActiveControl()->canUpdateClientSide())
+		if ($this->getHasPreRendered() && $this->getActiveControl()->canUpdateClientSide())
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);

Braces +8 added lines, -6 removed lines

@@ -105,12 +105,14 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 		// always make the dialog a child of the form, or its inner inputs won't be collected
-		if(!isset($options['appendTo']))
-			$options['appendTo'] = 'form:first';
+		if(!isset($options['appendTo'])) {
+					$options['appendTo'] = 'form:first';
+		}
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach($this->getControls() as $control) {
+					if($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
+		}
 
 		return $options;
 	}
@@ -193,8 +195,8 @@ 
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }

framework/Web/UI/TTemplate.php

Spacing +193 added lines, -193 removed lines

@@ -192,38 +192,38 @@ 
 	public function instantiateIn($tplControl, $parentControl = null)
 	{
 		$this->_tplControl = $tplControl;
-		if($parentControl === null)
+		if ($parentControl === null)
 			$parentControl = $tplControl;
-		if(($page = $tplControl->getPage()) === null)
+		if (($page = $tplControl->getPage()) === null)
 			$page = $this->getService()->getRequestedPage();
 		$controls = [];
 		$directChildren = [];
-		foreach($this->_tpl as $key => $object)
+		foreach ($this->_tpl as $key => $object)
 		{
-			if($object[0] === -1)
+			if ($object[0] === -1)
 				$parent = $parentControl;
-			elseif(isset($controls[$object[0]]))
+			elseif (isset($controls[$object[0]]))
 				$parent = $controls[$object[0]];
 			else
 				continue;
-			if(isset($object[2]))	// component
+			if (isset($object[2]))	// component
 			{
 				$component = Prado::createComponent($object[1]);
 				$properties = &$object[2];
-				if($component instanceof TControl)
+				if ($component instanceof TControl)
 				{
-					if($component instanceof \Prado\Web\UI\WebControls\TOutputCache)
-						$component->setCacheKeyPrefix($this->_hashCode . $key);
+					if ($component instanceof \Prado\Web\UI\WebControls\TOutputCache)
+						$component->setCacheKeyPrefix($this->_hashCode.$key);
 					$component->setTemplateControl($tplControl);
-					if(isset($properties['id']))
+					if (isset($properties['id']))
 					{
-						if(is_array($properties['id']))
+						if (is_array($properties['id']))
 							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
 						$tplControl->registerObject($properties['id'], $component);
 					}
-					if(isset($properties['skinid']))
+					if (isset($properties['skinid']))
 					{
-						if(is_array($properties['skinid']))
+						if (is_array($properties['skinid']))
 							$component->setSkinID($component->evaluateExpression($properties['skinid'][1]));
 						else
 							$component->setSkinID($properties['skinid']);
@@ -233,32 +233,32 @@ 
 					$component->trackViewState(false);
 
 					$component->applyStyleSheetSkin($page);
-					foreach($properties as $name => $value)
+					foreach ($properties as $name => $value)
 						$this->configureControl($component, $name, $value);
 
 					$component->trackViewState(true);
 
-					if($parent === $parentControl)
+					if ($parent === $parentControl)
 						$directChildren[] = $component;
 					else
 						$component->createdOnTemplate($parent);
-					if($component->getAllowChildControls())
+					if ($component->getAllowChildControls())
 						$controls[$key] = $component;
 				}
-				elseif($component instanceof TComponent)
+				elseif ($component instanceof TComponent)
 				{
 					$controls[$key] = $component;
-					if(isset($properties['id']))
+					if (isset($properties['id']))
 					{
-						if(is_array($properties['id']))
+						if (is_array($properties['id']))
 							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
 						$tplControl->registerObject($properties['id'], $component);
-						if(!$component->hasProperty('id'))
+						if (!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
-					foreach($properties as $name => $value)
+					foreach ($properties as $name => $value)
 						$this->configureComponent($component, $name, $value);
-					if($parent === $parentControl)
+					if ($parent === $parentControl)
 						$directChildren[] = $component;
 					else
 						$component->createdOnTemplate($parent);
@@ -266,19 +266,19 @@ 
 			}
 			else
 			{
-				if($object[1] instanceof TCompositeLiteral)
+				if ($object[1] instanceof TCompositeLiteral)
 				{
 					// need to clone a new object because the one in template is reused
 					$o = clone $object[1];
 					$o->setContainer($tplControl);
-					if($parent === $parentControl)
+					if ($parent === $parentControl)
 						$directChildren[] = $o;
 					else
 						$parent->addParsedObject($o);
 				}
 				else
 				{
-					if($parent === $parentControl)
+					if ($parent === $parentControl)
 						$directChildren[] = $object[1];
 					else
 						$parent->addParsedObject($object[1]);
@@ -288,9 +288,9 @@ 
 		// delay setting parent till now because the parent may cause
 		// the child to do lifecycle catchup which may cause problem
 		// if the child needs its own child controls.
-		foreach($directChildren as $control)
+		foreach ($directChildren as $control)
 		{
-			if($control instanceof TComponent)
+			if ($control instanceof TComponent)
 				$control->createdOnTemplate($parentControl);
 			else
 				$parentControl->addParsedObject($control);
@@ -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]);
 	}
 
 	/**
@@ -350,37 +350,37 @@ 
 	 */
 	protected function configureProperty($component, $name, $value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			switch($value[0])
+			switch ($value[0])
 			{
 				case self::CONFIG_DATABIND:
 					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
-					if($component instanceof TControl)
+					if ($component instanceof TControl)
 						$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
@@ -393,7 +393,7 @@ 
 			if (substr($name, 0, 2) == 'js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
 					$value = new TJavaScriptLiteral($value);
-			$setter = 'set' . $name;
+			$setter = 'set'.$name;
 			$component->$setter($value);
 		}
 	}
@@ -406,15 +406,15 @@ 
 	 */
 	protected function configureSubProperty($component, $name, $value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			switch($value[0])
+			switch ($value[0])
 			{
 				case self::CONFIG_DATABIND:		// databinding
 					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:		// expression
-					if($component instanceof TControl)
+					if ($component instanceof TControl)
 						$component->autoBindProperty($name, $value[1]);
 					else
 						$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
@@ -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
@@ -476,105 +476,105 @@ 
 		$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
+				if (strpos($str, '<com:') === 0)	// opening component tag
 				{
-					if($expectPropEnd)
+					if ($expectPropEnd)
 						continue;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					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, $class, $attributes];
+					if ($str[strlen($str) - 2] !== '/')  // open tag
 					{
 						$stack[] = $type;
 						$container = $c - 1;
 					}
 				}
-				elseif(strpos($str, '</com:') === 0)	// closing component tag
+				elseif (strpos($str, '</com:') === 0)	// closing component tag
 				{
-					if($expectPropEnd)
+					if ($expectPropEnd)
 						continue;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					if ($matchStart > $textStart)
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$type = $match[1][0];
 
-					if(empty($stack))
+					if (empty($stack))
 						throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
 
 					$name = array_pop($stack);
-					if($name !== $type)
+					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];
 				}
-				elseif(strpos($str, '<%@') === 0)	// directive
+				elseif (strpos($str, '<%@') === 0)	// directive
 				{
-					if($expectPropEnd)
+					if ($expectPropEnd)
 						continue;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					if ($matchStart > $textStart)
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
-					if(isset($tpl[0]) || $this->_directive !== null)
+					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)
+					if ($expectPropEnd)
 						continue;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					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] === '[')
+					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)
+						if ($expectPropEnd)
 							continue;
-						if($matchStart > $textStart)
-							$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						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 = [];
-						foreach($attrs as $name => $value)
-							$attributes[$prop . '.' . $name] = $value;
+						foreach ($attrs as $name => $value)
+							$attributes[$prop.'.'.$name] = $value;
 						$type = $tpl[$container][1];
 						$this->validateAttributes($type, $attributes);
-						foreach($attributes as $name => $value)
+						foreach ($attributes as $name => $value)
 						{
-							if(isset($tpl[$container][2][$name]))
+							if (isset($tpl[$container][2][$name]))
 								throw new TConfigurationException('template_property_duplicated', $name);
 							$tpl[$container][2][$name] = $value;
 						}
@@ -582,41 +582,41 @@ 
 					else  // regular property
 					{
 						$prop = strtolower($match[3][0]);
-						$stack[] = '@' . $prop;
-						if(!$expectPropEnd)
+						$stack[] = '@'.$prop;
+						if (!$expectPropEnd)
 						{
-							if($matchStart > $textStart)
-								$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+							if ($matchStart > $textStart)
+								$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]);
-					if(empty($stack))
+					if (empty($stack))
 						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
 					$name = array_pop($stack);
-					if($name !== '@' . $prop)
+					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)
+						if ($matchStart > $textStart)
 						{
 							$value = substr($input, $textStart, $matchStart - $textStart);
-							if(substr($prop, -8, 8) === 'template')
+							if (substr($prop, -8, 8) === 'template')
 								$value = $this->parseTemplateProperty($value, $textStart);
 							else
 								$value = $this->parseAttribute($value);
-							if($container >= 0)
+							if ($container >= 0)
 							{
 								$type = $tpl[$container][1];
 								$this->validateAttributes($type, [$prop => $value]);
-								if(isset($tpl[$container][2][$prop]))
+								if (isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated', $prop);
 								$tpl[$container][2][$prop] = $value;
 							}
@@ -627,56 +627,56 @@ 
 						$expectPropEnd = false;
 					}
 				}
-				elseif(strpos($str, '<!--') === 0)	// comments
+				elseif (strpos($str, '<!--') === 0)	// comments
 				{
-					if($expectPropEnd)
+					if ($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					if ($matchStart > $textStart)
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 				}
 				else
 					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
-			if(!empty($stack))
+			if (!empty($stack))
 			{
 				$name = array_pop($stack);
-				$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, "nothing");
 			}
-			if($textStart < strlen($input))
-				$tpl[$c++] = [$container,substr($input, $textStart)];
+			if ($textStart < strlen($input))
+				$tpl[$c++] = [$container, substr($input, $textStart)];
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
-			if(($e instanceof TException) && ($e instanceof TTemplateException))
+			if (($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
-			if($matchEnd === 0)
+			if ($matchEnd === 0)
 				$line = $this->_startingLine + 1;
 			else
 				$line = $this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
 			$this->handleException($e, $line, $input);
 		}
 
-		if($this->_directive === null)
+		if ($this->_directive === null)
 			$this->_directive = [];
 
 		// optimization by merging consecutive strings, expressions, statements and bindings
 		$objects = [];
 		$parent = null;
 		$merged = [];
-		foreach($tpl as $id => $object)
+		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]))
+				if (isset($object[2]))
 				{
 					$parent = null;
 					$objects[$id] = $object;
@@ -684,18 +684,18 @@ 
 				else
 				{
 					$parent = $object[0];
-					$merged = [$parent,[$object[1]]];
+					$merged = [$parent, [$object[1]]];
 				}
 			}
 			else
 				$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;
 		return $objects;
@@ -708,28 +708,28 @@ 
 	 */
 	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)
+		for ($i = 0; $i < $n; ++$i)
 		{
 			$match = &$matches[$i];
 			$name = strtolower($match[1][0]);
-			if(isset($attributes[$name]))
+			if (isset($attributes[$name]))
 				throw new TConfigurationException('template_property_duplicated', $name);
 			$value = $match[2][0];
-			if(substr($name, -8, 8) === 'template')
+			if (substr($name, -8, 8) === 'template')
 			{
-				if($value[0] === '\'' || $value[0] === '"')
+				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]);
 			}
 			else
 			{
-				if($value[0] === '\'' || $value[0] === '"')
+				if ($value[0] === '\'' || $value[0] === '"')
 					$attributes[$name] = $this->parseAttribute(substr($value, 1, strlen($value) - 2));
 				else
 					$attributes[$name] = $this->parseAttribute($value);
@@ -741,7 +741,7 @@ 
 	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)];
+		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)
+			for ($i = 0; $i < $n; ++$i)
 			{
 				$match = $matches[0][$i];
 				$token = $match[0];
 				$offset = $match[1];
 				$length = strlen($token);
-				if($token[2] === '#')
+				if ($token[2] === '#')
 					$isDataBind = true;
-				if($offset > $textStart)
-					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
-				$expr .= '.(' . substr($token, 3, $length - 5) . ')';
+				if ($offset > $textStart)
+					$expr .= ".'".strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'", "\\" => "\\\\"])."'";
+				$expr .= '.('.substr($token, 3, $length - 5).')';
 				$textStart = $offset + $length;
 			}
 			$length = strlen($value);
-			if($length > $textStart)
-				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
-			if($isDataBind)
-				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
+			if ($length > $textStart)
+				$expr .= ".'".strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'", "\\" => "\\\\"])."'";
+			if ($isDataBind)
+				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] === '/') {
+			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'"];
+				return [self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
 		}
 		else
@@ -798,71 +798,71 @@ 
 	protected function validateAttributes($type, $attributes)
 	{
 		Prado::using($type);
-		if(($pos = strrpos($type, '.')) !== false)
+		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')
+		if (is_subclass_of($className, '\Prado\Web\UI\TControl') || $className === '\Prado\Web\UI\TControl')
 		{
-			foreach($attributes as $name => $att)
+			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))
+					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))
+					if (!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown', $type, $name);
-					elseif(!is_string($att))
+					elseif (!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid', $type, $name);
 				}
 				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)
+			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))
+					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);
@@ -895,13 +895,13 @@ 
 	{
 		$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 ($this->_includeAtLine[$i] <= $line)
 				{
-					if($line < $this->_includeAtLine[$i] + $this->_includeLines[$i])
+					if ($line < $this->_includeAtLine[$i] + $this->_includeLines[$i])
 					{
 						$line = $line - $this->_includeAtLine[$i] + 1;
 						$srcFile = $this->_includedFiles[$i];
@@ -914,7 +914,7 @@ 
 		}
 		$exception = new TTemplateException('template_format_invalid', $e->getMessage());
 		$exception->setLineNumber($line);
-		if(!empty($srcFile))
+		if (!empty($srcFile))
 			$exception->setTemplateFile($srcFile);
 		else
 			$exception->setTemplateSource($input);
@@ -928,12 +928,12 @@ 
 	 */
 	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))
+				if ($filePath !== null && is_file($filePath))
 					$this->_includedFiles[] = $filePath;
 				else
 				{
@@ -942,7 +942,7 @@ 
 				}
 			}
 			$base = 0;
-			for($i = 0;$i < $n;++$i)
+			for ($i = 0; $i < $n; ++$i)
 			{
 				$ext = file_get_contents($this->_includedFiles[$i]);
 				$length = strlen($matches[$i][0][0]);
@@ -967,14 +967,14 @@ 
 	{
 	  $component = new \ReflectionClass('\Prado\TComponent');
 	  $behaviors = $component->getStaticProperties();
-	  if(!isset($behaviors['_um']))
+	  if (!isset($behaviors['_um']))
 		return false;
-	  foreach($behaviors['_um'] as $name => $list)
+	  foreach ($behaviors['_um'] as $name => $list)
 	  {
-		if(strtolower($class->getShortName()) !== $name && !$class->isSubclassOf($name)) continue;
-		foreach($list as $param)
+		if (strtolower($class->getShortName()) !== $name && !$class->isSubclassOf($name)) continue;
+		foreach ($list as $param)
 		{
-		  if(method_exists($param->getBehavior(), $method))
+		  if (method_exists($param->getBehavior(), $method))
 			return true;
 		}
 	  }

Braces +325 added lines, -254 removed lines

@@ -192,96 +192,110 @@ 
 	public function instantiateIn($tplControl, $parentControl = null)
 	{
 		$this->_tplControl = $tplControl;
-		if($parentControl === null)
-			$parentControl = $tplControl;
-		if(($page = $tplControl->getPage()) === null)
-			$page = $this->getService()->getRequestedPage();
+		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;
-			elseif(isset($controls[$object[0]]))
-				$parent = $controls[$object[0]];
-			else
-				continue;
-			if(isset($object[2]))	// component
+			if($object[0] === -1) {
+							$parent = $parentControl;
+			} elseif(isset($controls[$object[0]])) {
+							$parent = $controls[$object[0]];
+			} else {
+							continue;
+			}
+			if(isset($object[2])) {
+				// component
 			{
 				$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);
+					if($component instanceof \Prado\Web\UI\WebControls\TOutputCache) {
+											$component->setCacheKeyPrefix($this->_hashCode . $key);
+					}
 					$component->setTemplateControl($tplControl);
 					if(isset($properties['id']))
 					{
-						if(is_array($properties['id']))
-							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+						if(is_array($properties['id'])) {
+													$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+						}
 						$tplControl->registerObject($properties['id'], $component);
 					}
 					if(isset($properties['skinid']))
 					{
-						if(is_array($properties['skinid']))
-							$component->setSkinID($component->evaluateExpression($properties['skinid'][1]));
-						else
-							$component->setSkinID($properties['skinid']);
+						if(is_array($properties['skinid'])) {
+													$component->setSkinID($component->evaluateExpression($properties['skinid'][1]));
+						} else {
+													$component->setSkinID($properties['skinid']);
+						}
 						unset($properties['skinid']);
 					}
 
 					$component->trackViewState(false);
 
 					$component->applyStyleSheetSkin($page);
-					foreach($properties as $name => $value)
-						$this->configureControl($component, $name, $value);
+					foreach($properties as $name => $value) {
+											$this->configureControl($component, $name, $value);
+					}
 
 					$component->trackViewState(true);
 
-					if($parent === $parentControl)
-						$directChildren[] = $component;
-					else
-						$component->createdOnTemplate($parent);
-					if($component->getAllowChildControls())
-						$controls[$key] = $component;
-				}
-				elseif($component instanceof TComponent)
+					if($parent === $parentControl) {
+											$directChildren[] = $component;
+					} else {
+											$component->createdOnTemplate($parent);
+					}
+					if($component->getAllowChildControls()) {
+											$controls[$key] = $component;
+					}
+				} elseif($component instanceof TComponent)
 				{
 					$controls[$key] = $component;
 					if(isset($properties['id']))
 					{
-						if(is_array($properties['id']))
-							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+						if(is_array($properties['id'])) {
+													$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;
-					else
-						$component->createdOnTemplate($parent);
+						if(!$component->hasProperty('id')) {
+													unset($properties['id']);
+						}
+					}
+					foreach($properties as $name => $value) {
+											$this->configureComponent($component, $name, $value);
+					}
+					if($parent === $parentControl) {
+											$directChildren[] = $component;
+					} else {
+											$component->createdOnTemplate($parent);
+					}
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
 					// need to clone a new object because the one in template is reused
 					$o = clone $object[1];
 					$o->setContainer($tplControl);
-					if($parent === $parentControl)
-						$directChildren[] = $o;
-					else
-						$parent->addParsedObject($o);
-				}
-				else
+					if($parent === $parentControl) {
+											$directChildren[] = $o;
+					} else {
+											$parent->addParsedObject($o);
+					}
+				} else
 				{
-					if($parent === $parentControl)
-						$directChildren[] = $object[1];
-					else
-						$parent->addParsedObject($object[1]);
+					if($parent === $parentControl) {
+											$directChildren[] = $object[1];
+					} else {
+											$parent->addParsedObject($object[1]);
+					}
 				}
 			}
 		}
@@ -290,10 +304,11 @@ 
 		// if the child needs its own child controls.
 		foreach($directChildren as $control)
 		{
-			if($control instanceof TComponent)
-				$control->createdOnTemplate($parentControl);
-			else
-				$parentControl->addParsedObject($control);
+			if($control instanceof TComponent) {
+							$control->createdOnTemplate($parentControl);
+			} else {
+							$parentControl->addParsedObject($control);
+			}
 		}
 	}
 
@@ -305,12 +320,16 @@ 
 	 */
 	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
+		} else {
+			// is a subproperty
 			$this->configureSubProperty($control, $name, $value);
+		}
 	}
 
 	/**
@@ -321,10 +340,13 @@ 
 	 */
 	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
+		} else {
+			// is a subproperty
 			$this->configureSubProperty($component, $name, $value);
+		}
 	}
 
 	/**
@@ -336,10 +358,11 @@ 
 	 */
 	protected function configureEvent($control, $name, $value, $contextControl)
 	{
-		if(strpos($value, '.') === false)
-			$control->attachEventHandler($name, [$contextControl,'TemplateControl.' . $value]);
-		else
-			$control->attachEventHandler($name, [$contextControl,$value]);
+		if(strpos($value, '.') === false) {
+					$control->attachEventHandler($name, [$contextControl,'TemplateControl.' . $value]);
+		} else {
+					$control->attachEventHandler($name, [$contextControl,$value]);
+		}
 	}
 
 	/**
@@ -358,9 +381,9 @@ 
 					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
-					if($component instanceof TControl)
-						$component->autoBindProperty($name, $value[1]);
-					else
+					if($component instanceof TControl) {
+											$component->autoBindProperty($name, $value[1]);
+					} else
 					{
 						$setter = 'set' . $name;
 						$component->$setter($this->_tplControl->evaluateExpression($value[1]));
@@ -387,12 +410,12 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
-			if (substr($name, 0, 2) == 'js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
+			if (substr($name, 0, 2) == 'js') {
+							if ($value and !($value instanceof TJavaScriptLiteral))
 					$value = new TJavaScriptLiteral($value);
+			}
 			$setter = 'set' . $name;
 			$component->$setter($value);
 		}
@@ -414,10 +437,11 @@ 
 					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:		// expression
-					if($component instanceof TControl)
-						$component->autoBindProperty($name, $value[1]);
-					else
-						$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
+					if($component instanceof TControl) {
+											$component->autoBindProperty($name, $value[1]);
+					} else {
+											$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
+					}
 					break;
 				case self::CONFIG_TEMPLATE:
 					$component->setSubProperty($name, $value[1]);
@@ -436,9 +460,9 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
+		} else {
+					$component->setSubProperty($name, $value);
 		}
-		else
-			$component->setSubProperty($name, $value);
 	}
 
 	/**
@@ -482,34 +506,42 @@ 
 				$str = $match[0][0];
 				$matchStart = $match[0][1];
 				$matchEnd = $matchStart + strlen($str) - 1;
-				if(strpos($str, '<com:') === 0)	// opening component tag
+				if(strpos($str, '<com:') === 0) {
+					// opening component tag
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+				}
+					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
+					if($str[strlen($str) - 2] !== '/') {
+						// open tag
 					{
 						$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)];
+				}
+					if($matchStart > $textStart) {
+											$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>");
+					if(empty($stack)) {
+											throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
+					}
 
 					$name = array_pop($stack);
 					if($name !== $type)
@@ -518,85 +550,98 @@ 
 						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;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+				}
+					if($matchStart > $textStart) {
+											$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					}
 					$textStart = $matchEnd + 1;
-					if(isset($tpl[0]) || $this->_directive !== null)
-						throw new TConfigurationException('template_directive_nonunique');
+					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;
-					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+				}
+					if($matchStart > $textStart) {
+											$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					}
 					$textStart = $matchEnd + 1;
 					$literal = trim($match[5][0]);
-					if($str[2] === '=')	// expression
+					if($str[2] === '=') {
+						// expression
 						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,$literal]];
-					elseif($str[2] === '%')  // statements
+					} 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] === '[')
+					} 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')"]];
 					}
-				}
-				elseif(strpos($str, '<prop:') === 0)	// opening property
+				} elseif(strpos($str, '<prop:') === 0) {
+					// opening property
 				{
 					if(strrpos($str, '/>') === strlen($str) - 2)  //subproperties
 					{
 						if($expectPropEnd)
 							continue;
-						if($matchStart > $textStart)
-							$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+				}
+						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 = [];
-						foreach($attrs as $name => $value)
-							$attributes[$prop . '.' . $name] = $value;
+						foreach($attrs as $name => $value) {
+													$attributes[$prop . '.' . $name] = $value;
+						}
 						$type = $tpl[$container][1];
 						$this->validateAttributes($type, $attributes);
 						foreach($attributes as $name => $value)
 						{
-							if(isset($tpl[$container][2][$name]))
-								throw new TConfigurationException('template_property_duplicated', $name);
+							if(isset($tpl[$container][2][$name])) {
+															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;
 						if(!$expectPropEnd)
 						{
-							if($matchStart > $textStart)
-								$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+							if($matchStart > $textStart) {
+															$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]);
-					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
+				}
+					if(empty($stack)) {
+											throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
+					}
 					$name = array_pop($stack);
 					if($name !== '@' . $prop)
 					{
@@ -608,35 +653,40 @@ 
 						if($matchStart > $textStart)
 						{
 							$value = substr($input, $textStart, $matchStart - $textStart);
-							if(substr($prop, -8, 8) === 'template')
-								$value = $this->parseTemplateProperty($value, $textStart);
-							else
-								$value = $this->parseAttribute($value);
+							if(substr($prop, -8, 8) === 'template') {
+															$value = $this->parseTemplateProperty($value, $textStart);
+							} else {
+															$value = $this->parseAttribute($value);
+							}
 							if($container >= 0)
 							{
 								$type = $tpl[$container][1];
 								$this->validateAttributes($type, [$prop => $value]);
-								if(isset($tpl[$container][2][$prop]))
-									throw new TConfigurationException('template_property_duplicated', $prop);
+								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)];
+				}
+					if($matchStart > $textStart) {
+											$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+					}
 					$textStart = $matchEnd + 1;
+				} else {
+									throw new TConfigurationException('template_matching_unexpected', $match);
 				}
-				else
-					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
 			{
@@ -644,22 +694,25 @@ 
 				$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)];
-		}
-		catch(\Exception $e)
+			if($textStart < strlen($input)) {
+							$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;
-			else
-				$line = $this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
+			if(($e instanceof TException) && ($e instanceof TTemplateException)) {
+							throw $e;
+			}
+			if($matchEnd === 0) {
+							$line = $this->_startingLine + 1;
+			} else {
+							$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 = [];
@@ -671,31 +724,32 @@ 
 			{
 				if($parent !== null)
 				{
-					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])];
+					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])];
+					}
 				}
 				if(isset($object[2]))
 				{
 					$parent = null;
 					$objects[$id] = $object;
-				}
-				else
+				} else
 				{
 					$parent = $object[0];
 					$merged = [$parent,[$object[1]]];
 				}
+			} else {
+							$merged[1][] = $object[1];
 			}
-			else
-				$merged[1][] = $object[1];
 		}
 		if($parent !== null)
 		{
-			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])];
+			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])];
+			}
 		}
 		$tpl = $objects;
 		return $objects;
@@ -708,8 +762,9 @@ 
 	 */
 	protected function parseAttributes($str, $offset)
 	{
-		if($str === '')
-			return [];
+		if($str === '') {
+					return [];
+		}
 		$pattern = '/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes = [];
 		$n = preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
@@ -717,22 +772,24 @@ 
 		{
 			$match = &$matches[$i];
 			$name = strtolower($match[1][0]);
-			if(isset($attributes[$name]))
-				throw new TConfigurationException('template_property_duplicated', $name);
+			if(isset($attributes[$name])) {
+							throw new TConfigurationException('template_property_duplicated', $name);
+			}
 			$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);
-				else
-					$attributes[$name] = $this->parseTemplateProperty($value, $match[2][1]);
-			}
-			else
+				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]);
+				}
+			} else
 			{
-				if($value[0] === '\'' || $value[0] === '"')
-					$attributes[$name] = $this->parseAttribute(substr($value, 1, strlen($value) - 2));
-				else
-					$attributes[$name] = $this->parseAttribute($value);
+				if($value[0] === '\'' || $value[0] === '"') {
+									$attributes[$name] = $this->parseAttribute(substr($value, 1, strlen($value) - 2));
+				} else {
+									$attributes[$name] = $this->parseAttribute($value);
+				}
 			}
 		}
 		return $attributes;
@@ -762,46 +819,50 @@ 
 				$token = $match[0];
 				$offset = $match[1];
 				$length = strlen($token);
-				if($token[2] === '#')
-					$isDataBind = true;
-				if($offset > $textStart)
-					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+				if($token[2] === '#') {
+									$isDataBind = true;
+				}
+				if($offset > $textStart) {
+									$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+				}
 				$expr .= '.(' . substr($token, 3, $length - 5) . ')';
 				$textStart = $offset + $length;
 			}
 			$length = strlen($value);
-			if($length > $textStart)
-				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
-			if($isDataBind)
-				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
-			else
-				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
-		}
-		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
+			if($length > $textStart) {
+							$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+			}
+			if($isDataBind) {
+							return [self::CONFIG_DATABIND,ltrim($expr, '.')];
+			} else {
+							return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
+			}
+		} 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] === '/') {
+			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 {
+					return $value;
 		}
-		else
-			return $value;
 	}
 
 	protected function validateAttributes($type, $attributes)
 	{
 		Prado::using($type);
-		if(($pos = strrpos($type, '.')) !== false)
-			$className = substr($type, $pos + 1);
-		else
-			$className = $type;
+		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')
 		{
@@ -811,67 +872,69 @@ 
 				{
 					// a subproperty, so the first segment must be readable
 					$subname = substr($name, 0, $pos);
-					if(!$class->hasMethod('get' . $subname))
-						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+					if(!$class->hasMethod('get' . $subname)) {
+											throw new TConfigurationException('template_property_unknown', $type, $subname);
+					}
+				} 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
+					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
 				{
 					// a simple property
 					if (! ($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $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)
+						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)
 					{
-						if(strcasecmp($name, 'id') === 0)
-							throw new TConfigurationException('template_controlid_invalid', $type);
-						elseif(strcasecmp($name, 'skinid') === 0)
-							throw new TConfigurationException('template_controlskinid_invalid', $type);
+						if(strcasecmp($name, 'id') === 0) {
+													throw new TConfigurationException('template_controlid_invalid', $type);
+						} 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))
-					throw new TConfigurationException('template_databind_forbidden', $type, $name);
+				if(is_array($att) && ($att[0] === self::CONFIG_DATABIND)) {
+									throw new TConfigurationException('template_databind_forbidden', $type, $name);
+				}
 				if(($pos = strpos($name, '.')) !== false)
 				{
 					// a subproperty, so the first segment must be readable
 					$subname = substr($name, 0, $pos);
-					if(!$class->hasMethod('get' . $subname))
-						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
-					throw new TConfigurationException('template_event_forbidden', $type, $name);
-				else
+					if(!$class->hasMethod('get' . $subname)) {
+											throw new TConfigurationException('template_property_unknown', $type, $subname);
+					}
+				} 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($class->hasMethod('get' . $name))
-							throw new TConfigurationException('template_property_readonly', $type, $name);
-						else
-							throw new TConfigurationException('template_property_unknown', $type, $name);
+						if($class->hasMethod('get' . $name)) {
+													throw new TConfigurationException('template_property_readonly', $type, $name);
+						} else {
+													throw new TConfigurationException('template_property_unknown', $type, $name);
+						}
 					}
 				}
 			}
+		} else {
+					throw new TConfigurationException('template_component_required', $type);
 		}
-		else
-			throw new TConfigurationException('template_component_required', $type);
 		return $class->getName();
 	}
 
@@ -895,9 +958,12 @@ 
 	{
 		$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)
 				{
@@ -906,18 +972,19 @@ 
 						$line = $line - $this->_includeAtLine[$i] + 1;
 						$srcFile = $this->_includedFiles[$i];
 						break;
+					} else {
+											$line = $line - $this->_includeLines[$i] + 1;
 					}
-					else
-						$line = $line - $this->_includeLines[$i] + 1;
 				}
 			}
 		}
 		$exception = new TTemplateException('template_format_invalid', $e->getMessage());
 		$exception->setLineNumber($line);
-		if(!empty($srcFile))
-			$exception->setTemplateFile($srcFile);
-		else
-			$exception->setTemplateSource($input);
+		if(!empty($srcFile)) {
+					$exception->setTemplateFile($srcFile);
+		} else {
+					$exception->setTemplateSource($input);
+		}
 		throw $exception;
 	}
 
@@ -933,9 +1000,9 @@ 
 			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;
-				else
+				if($filePath !== null && is_file($filePath)) {
+									$this->_includedFiles[] = $filePath;
+				} else
 				{
 					$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);
@@ -967,15 +1034,19 @@ 
 	{
 	  $component = new \ReflectionClass('\Prado\TComponent');
 	  $behaviors = $component->getStaticProperties();
-	  if(!isset($behaviors['_um']))
-		return false;
+	  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))
-			return true;
+		  if(method_exists($param->getBehavior(), $method)) {
+		  			return true;
+		  }
 		}
 	  }
 	  return false;

framework/Web/UI/TCachePageStatePersister.php

Spacing +9 added lines, -9 removed lines

@@ -110,15 +110,15 @@ 
 	 */
 	public function getCache()
 	{
-		if($this->_cache === null)
+		if ($this->_cache === null)
 		{
-			if($this->_cacheModuleID !== '')
+			if ($this->_cacheModuleID !== '')
 				$cache = Prado::getApplication()->getModule($this->_cacheModuleID);
 			else
 				$cache = Prado::getApplication()->getCache();
-			if($cache === null || !($cache instanceof ICache))
+			if ($cache === null || !($cache instanceof ICache))
 			{
-				if($this->_cacheModuleID !== '')
+				if ($this->_cacheModuleID !== '')
 					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
 				else
 					throw new TConfigurationException('cachepagestatepersister_cache_required');
@@ -142,7 +142,7 @@ 
 	 */
 	public function setCacheTimeout($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) >= 0)
+		if (($value = TPropertyValue::ensureInteger($value)) >= 0)
 			$this->_timeout = $value;
 		else
 			throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
@@ -170,7 +170,7 @@ 
 	 */
 	protected function calculateKey($timestamp)
 	{
-		return $this->getKeyPrefix() . ':'
+		return $this->getKeyPrefix().':'
 			. $this->_page->getRequest()->getUserHostAddress()
 			. $this->_page->getPagePath()
 			. $timestamp;
@@ -182,7 +182,7 @@ 
 	 */
 	public function save($data)
 	{
-		$timestamp = (string)microtime(true);
+		$timestamp = (string) microtime(true);
 		$key = $this->calculateKey($timestamp);
 		$this->getCache()->add($key, $data, $this->_timeout);
 		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $timestamp));
@@ -195,10 +195,10 @@ 
 	 */
 	public function load()
 	{
-		if(($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
+		if (($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
 		{
 			$key = $this->calculateKey($timestamp);
-			if(($data = $this->getCache()->get($key)) !== false)
+			if (($data = $this->getCache()->get($key)) !== false)
 				return $data;
 		}
 		throw new THttpException(400, 'cachepagestatepersister_pagestate_corrupted');

Braces +18 added lines, -14 removed lines

@@ -112,16 +112,18 @@ 
 	{
 		if($this->_cache === null)
 		{
-			if($this->_cacheModuleID !== '')
-				$cache = Prado::getApplication()->getModule($this->_cacheModuleID);
-			else
-				$cache = Prado::getApplication()->getCache();
+			if($this->_cacheModuleID !== '') {
+							$cache = Prado::getApplication()->getModule($this->_cacheModuleID);
+			} else {
+							$cache = Prado::getApplication()->getCache();
+			}
 			if($cache === null || !($cache instanceof ICache))
 			{
-				if($this->_cacheModuleID !== '')
-					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
-				else
-					throw new TConfigurationException('cachepagestatepersister_cache_required');
+				if($this->_cacheModuleID !== '') {
+									throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
+				} else {
+									throw new TConfigurationException('cachepagestatepersister_cache_required');
+				}
 			}
 			$this->_cache = $cache;
 		}
@@ -142,10 +144,11 @@ 
 	 */
 	public function setCacheTimeout($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) >= 0)
-			$this->_timeout = $value;
-		else
-			throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) >= 0) {
+					$this->_timeout = $value;
+		} else {
+					throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
+		}
 	}
 
 	/**
@@ -198,8 +201,9 @@ 
 		if(($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
 		{
 			$key = $this->calculateKey($timestamp);
-			if(($data = $this->getCache()->get($key)) !== false)
-				return $data;
+			if(($data = $this->getCache()->get($key)) !== false) {
+							return $data;
+			}
 		}
 		throw new THttpException(400, 'cachepagestatepersister_pagestate_corrupted');
 	}

framework/Web/UI/TPageStateFormatter.php

Spacing +9 added lines, -9 removed lines

@@ -38,13 +38,13 @@ 
 	public static function serialize($page, $data)
 	{
 		$sm = $page->getApplication()->getSecurityManager();
-		if($page->getEnableStateValidation())
+		if ($page->getEnableStateValidation())
 			$str = $sm->hashData(serialize($data));
 		else
 			$str = serialize($data);
-		if($page->getEnableStateCompression() && extension_loaded('zlib'))
+		if ($page->getEnableStateCompression() && extension_loaded('zlib'))
 			$str = gzcompress($str);
-		if($page->getEnableStateEncryption())
+		if ($page->getEnableStateEncryption())
 			$str = $sm->encrypt($str);
 		return base64_encode($str);
 	}
@@ -57,18 +57,18 @@ 
 	public static function unserialize($page, $data)
 	{
 		$str = base64_decode($data);
-		if($str === '')
+		if ($str === '')
 			return null;
-		if($str !== false)
+		if ($str !== false)
 		{
 			$sm = $page->getApplication()->getSecurityManager();
-			if($page->getEnableStateEncryption())
+			if ($page->getEnableStateEncryption())
 				$str = $sm->decrypt($str);
-			if($page->getEnableStateCompression() && extension_loaded('zlib'))
+			if ($page->getEnableStateCompression() && extension_loaded('zlib'))
 				$str = @gzuncompress($str);
-			if($page->getEnableStateValidation())
+			if ($page->getEnableStateValidation())
 			{
-				if(($str = $sm->validateData($str)) !== false)
+				if (($str = $sm->validateData($str)) !== false)
 					return unserialize($str);
 			}
 			else

Braces +25 added lines, -18 removed lines

@@ -38,14 +38,17 @@ 
 	public static function serialize($page, $data)
 	{
 		$sm = $page->getApplication()->getSecurityManager();
-		if($page->getEnableStateValidation())
-			$str = $sm->hashData(serialize($data));
-		else
-			$str = serialize($data);
-		if($page->getEnableStateCompression() && extension_loaded('zlib'))
-			$str = gzcompress($str);
-		if($page->getEnableStateEncryption())
-			$str = $sm->encrypt($str);
+		if($page->getEnableStateValidation()) {
+					$str = $sm->hashData(serialize($data));
+		} else {
+					$str = serialize($data);
+		}
+		if($page->getEnableStateCompression() && extension_loaded('zlib')) {
+					$str = gzcompress($str);
+		}
+		if($page->getEnableStateEncryption()) {
+					$str = $sm->encrypt($str);
+		}
 		return base64_encode($str);
 	}
 
@@ -57,22 +60,26 @@ 
 	public static function unserialize($page, $data)
 	{
 		$str = base64_decode($data);
-		if($str === '')
-			return null;
+		if($str === '') {
+					return null;
+		}
 		if($str !== false)
 		{
 			$sm = $page->getApplication()->getSecurityManager();
-			if($page->getEnableStateEncryption())
-				$str = $sm->decrypt($str);
-			if($page->getEnableStateCompression() && extension_loaded('zlib'))
-				$str = @gzuncompress($str);
+			if($page->getEnableStateEncryption()) {
+							$str = $sm->decrypt($str);
+			}
+			if($page->getEnableStateCompression() && extension_loaded('zlib')) {
+							$str = @gzuncompress($str);
+			}
 			if($page->getEnableStateValidation())
 			{
-				if(($str = $sm->validateData($str)) !== false)
-					return unserialize($str);
+				if(($str = $sm->validateData($str)) !== false) {
+									return unserialize($str);
+				}
+			} else {
+							return unserialize($str);
 			}
-			else
-				return unserialize($str);
 		}
 		return null;
 	}