pradosoft / prado

framework/Web/UI/TTemplateManager.php

Spacing +200 added lines, -200 removed lines

@@ -75,21 +75,21 @@ 
 	{
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
-			Prado::trace("Loading template $fileName",'System.Web.UI.TTemplateManager');
+			Prado::trace("Loading template $fileName", 'System.Web.UI.TTemplateManager');
 			if(($cache=$this->getApplication()->getCache())===null)
-				return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
 				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
 				if(is_array($array))
 				{
-					list($template,$timestamps)=$array;
+					list($template, $timestamps)=$array;
 					if($this->getApplication()->getMode()===TApplicationMode::Performance)
 						return $template;
 					$cacheValid=true;
 					foreach($timestamps as $tplFile=>$timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile)>$timestamp)
+						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
 							$cacheValid=false;
 							break;
@@ -98,13 +98,13 @@ 
 					if($cacheValid)
 						return $template;
 				}
-				$template=new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				$template=new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles=$template->getIncludedFiles();
 				$timestamps=array();
 				$timestamps[$fileName]=filemtime($fileName);
 				foreach($includedFiles as $includedFile)
 					$timestamps[$includedFile]=filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, array($template, $timestamps));
 				return $template;
 			}
 		}
@@ -120,7 +120,7 @@ 
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app=$this->getApplication()->getGlobalization(false))===null)
-			return is_file($filename)?$filename:null;
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
 			if(($file=realpath($file))!==false && is_file($file))
@@ -234,7 +234,7 @@ 
 	 * @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;
@@ -302,7 +302,7 @@ 
 	 * @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)
@@ -332,7 +332,7 @@ 
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$tplControl->registerObject($properties['id'], $component);
 					}
 					if(isset($properties['skinid']))
 					{
@@ -347,7 +347,7 @@ 
 
 					$component->applyStyleSheetSkin($page);
 					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+						$this->configureControl($component, $name, $value);
 
 					$component->trackViewState(true);
 
@@ -365,12 +365,12 @@ 
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$tplControl->registerObject($properties['id'], $component);
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
 					foreach($properties as $name=>$value)
-						$this->configureComponent($component,$name,$value);
+						$this->configureComponent($component, $name, $value);
 					if($parent===$parentControl)
 						$directChildren[]=$component;
 					else
@@ -416,14 +416,14 @@ 
 	 * @param string property name
 	 * @param mixed property initial value
 	 */
-	protected function configureControl($control,$name,$value)
+	protected function configureControl($control, $name, $value)
 	{
-		if(strncasecmp($name,'on',2)===0)		// is an event
-			$this->configureEvent($control,$name,$value,$control);
-		else if(($pos=strrpos($name,'.'))===false)	// is a simple property or custom attribute
-			$this->configureProperty($control,$name,$value);
+		if(strncasecmp($name, 'on', 2)===0)		// is an event
+			$this->configureEvent($control, $name, $value, $control);
+		else if(($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);
+			$this->configureSubProperty($control, $name, $value);
 	}
 
 	/**
@@ -432,12 +432,12 @@ 
 	 * @param string property name
 	 * @param mixed property initial value
 	 */
-	protected function configureComponent($component,$name,$value)
+	protected function configureComponent($component, $name, $value)
 	{
-		if(strpos($name,'.')===false)	// is a simple property or custom attribute
-			$this->configureProperty($component,$name,$value);
+		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);
+			$this->configureSubProperty($component, $name, $value);
 	}
 
 	/**
@@ -447,12 +447,12 @@ 
 	 * @param string event handler
 	 * @param TControl context control
 	 */
-	protected function configureEvent($control,$name,$value,$contextControl)
+	protected function configureEvent($control, $name, $value, $contextControl)
 	{
-		if(strpos($value,'.')===false)
-			$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
+		if(strpos($value, '.')===false)
+			$control->attachEventHandler($name, array($contextControl, 'TemplateControl.'.$value));
 		else
-			$control->attachEventHandler($name,array($contextControl,$value));
+			$control->attachEventHandler($name, array($contextControl, $value));
 	}
 
 	/**
@@ -461,18 +461,18 @@ 
 	 * @param string property name
 	 * @param mixed property initial value
 	 */
-	protected function configureProperty($component,$name,$value)
+	protected function configureProperty($component, $name, $value)
 	{
 		if(is_array($value))
 		{
 			switch($value[0])
 			{
 				case self::CONFIG_DATABIND:
-					$component->bindProperty($name,$value[1]);
+					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
 					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+						$component->autoBindProperty($name, $value[1]);
 					else
 					{
 						$setter='set'.$name;
@@ -497,15 +497,15 @@ 
 					$component->$setter(Prado::localize($value[1]));
 					break;
 				default:	// an error if reaching here
-					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
 		{
-			if (substr($name,0,2)=='js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
-					$value = new TJavaScriptLiteral($value);
+			if(substr($name, 0, 2)=='js')
+				if($value and !($value instanceof TJavaScriptLiteral))
+					$value=new TJavaScriptLiteral($value);
 			$setter='set'.$name;
 			$component->$setter($value);
 		}
@@ -517,41 +517,41 @@ 
 	 * @param string subproperty name
 	 * @param mixed subproperty initial value
 	 */
-	protected function configureSubProperty($component,$name,$value)
+	protected function configureSubProperty($component, $name, $value)
 	{
 		if(is_array($value))
 		{
 			switch($value[0])
 			{
 				case self::CONFIG_DATABIND:		// databinding
-					$component->bindProperty($name,$value[1]);
+					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:		// expression
 					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+						$component->autoBindProperty($name, $value[1]);
 					else
-						$component->setSubProperty($name,$this->_tplControl->evaluateExpression($value[1]));
+						$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
 					break;
 				case self::CONFIG_TEMPLATE:
-					$component->setSubProperty($name,$value[1]);
+					$component->setSubProperty($name, $value[1]);
 					break;
 				case self::CONFIG_ASSET:		// asset URL
 					$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
-					$component->setSubProperty($name,$url);
+					$component->setSubProperty($name, $url);
 					break;
 				case self::CONFIG_PARAMETER:		// application parameter
-					$component->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+					$component->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
-					$component->setSubProperty($name,Prado::localize($value[1]));
+					$component->setSubProperty($name, Prado::localize($value[1]));
 					break;
 				default:	// an error if reaching here
-					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
-			$component->setSubProperty($name,$value);
+			$component->setSubProperty($name, $value);
 	}
 
 	/**
@@ -579,7 +579,7 @@ 
 	{
 		$input=$this->preprocess($input);
 		$tpl=&$this->_tpl;
-		$n=preg_match_all(self::REGEX_RULES,$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
+		$n=preg_match_all(self::REGEX_RULES, $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
 		$expectPropEnd=false;
 		$textStart=0;
 				$stack=array();
@@ -589,186 +589,186 @@ 
 		$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
+				$matchEnd=$matchStart + strlen($str) - 1;
+				if(strpos($str, '<com:')===0)	// opening component tag
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$type=$match[1][0];
-					$attributes=$this->parseAttributes($match[2][0],$match[2][1]);
-					$this->validateAttributes($type,$attributes);
-					$tpl[$c++]=array($container,$type,$attributes);
-					if($str[strlen($str)-2]!=='/')  // open tag
+					$attributes=$this->parseAttributes($match[2][0], $match[2][1]);
+					$this->validateAttributes($type, $attributes);
+					$tpl[$c++]=array($container, $type, $attributes);
+					if($str[strlen($str) - 2]!=='/')  // open tag
 					{
-						$stack[] = $type;
-						$container=$c-1;
+						$stack[]=$type;
+						$container=$c - 1;
 					}
 				}
-				else if(strpos($str,'</com:')===0)	// closing component tag
+				else if(strpos($str, '</com:')===0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$type=$match[1][0];
 
 					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</com:$type>");
+						throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
 
 					$name=array_pop($stack);
 					if($name!==$type)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
 					$container=$tpl[$container][0];
 				}
-				else if(strpos($str,'<%@')===0)	// directive
+				else if(strpos($str, '<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($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]);
 				}
-				else if(strpos($str,'<%')===0)	// expression
+				else if(strpos($str, '<%')===0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$literal=trim($match[5][0]);
 					if($str[2]==='=')	// expression
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,$literal));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, $literal));
 					else if($str[2]==='%')  // statements
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_STATEMENTS,$literal));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_STATEMENTS, $literal));
 					else if($str[2]==='#')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_DATABINDING,$literal));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_DATABINDING, $literal));
 					else if($str[2]==='$')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "\$this->getApplication()->getParameters()->itemAt('$literal')"));
 					else if($str[2]==='~')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "\$this->publishFilePath('$this->_contextPath/$literal')"));
 					else if($str[2]==='/')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"));
 					else if($str[2]==='[')
 					{
-						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
+						$literal=strtr(trim(substr($literal, 0, strlen($literal) - 1)), array("'"=>"\'", "\\"=>"\\\\"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"));
 					}
 				}
-				else if(strpos($str,'<prop:')===0)	// opening property
+				else if(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++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-						$textStart=$matchEnd+1;
+						if($matchStart > $textStart)
+							$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+						$textStart=$matchEnd + 1;
 						$prop=strtolower($match[6][0]);
-						$attrs=$this->parseAttributes($match[7][0],$match[7][1]);
+						$attrs=$this->parseAttributes($match[7][0], $match[7][1]);
 						$attributes=array();
 						foreach($attrs as $name=>$value)
 							$attributes[$prop.'.'.$name]=$value;
 						$type=$tpl[$container][1];
-						$this->validateAttributes($type,$attributes);
+						$this->validateAttributes($type, $attributes);
 						foreach($attributes as $name=>$value)
 						{
 							if(isset($tpl[$container][2][$name]))
-								throw new TConfigurationException('template_property_duplicated',$name);
+								throw new TConfigurationException('template_property_duplicated', $name);
 							$tpl[$container][2][$name]=$value;
 						}
 					}
 					else  // regular property
 					{
 						$prop=strtolower($match[3][0]);
-						$stack[] = '@'.$prop;
+						$stack[]='@'.$prop;
 						if(!$expectPropEnd)
 						{
-							if($matchStart>$textStart)
-								$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-							$textStart=$matchEnd+1;
+							if($matchStart > $textStart)
+								$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+							$textStart=$matchEnd + 1;
 							$expectPropEnd=true;
 						}
 					}
 				}
-				else if(strpos($str,'</prop:')===0)	// closing property
+				else if(strpos($str, '</prop:')===0)	// closing property
 				{
 					$prop=strtolower($match[3][0]);
 					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</prop:$prop>");
+						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
 					$name=array_pop($stack);
 					if($name!=='@'.$prop)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
-					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')
-								$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);
-							if($container>=0)
+							if($container >= 0)
 							{
 								$type=$tpl[$container][1];
-								$this->validateAttributes($type,array($prop=>$value));
+								$this->validateAttributes($type, array($prop=>$value));
 								if(isset($tpl[$container][2][$prop]))
-									throw new TConfigurationException('template_property_duplicated',$prop);
+									throw new TConfigurationException('template_property_duplicated', $prop);
 								$tpl[$container][2][$prop]=$value;
 							}
 							else	// a property for the template control
 								$this->_directive[$prop]=$value;
-							$textStart=$matchEnd+1;
+							$textStart=$matchEnd + 1;
 						}
 						$expectPropEnd=false;
 					}
 				}
-				else if(strpos($str,'<!--')===0)	// comments
+				else if(strpos($str, '<!--')===0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 				}
 				else
-					throw new TConfigurationException('template_matching_unexpected',$match);
+					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
 			{
 				$name=array_pop($stack);
-				$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-				throw new TConfigurationException('template_closingtag_expected',$tag);
+				$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+				throw new TConfigurationException('template_closingtag_expected', $tag);
 			}
-			if($textStart<strlen($input))
-				$tpl[$c++]=array($container,substr($input,$textStart));
+			if($textStart < strlen($input))
+				$tpl[$c++]=array($container, substr($input, $textStart));
 		}
 		catch(Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
 			if($matchEnd===0)
-				$line=$this->_startingLine+1;
+				$line=$this->_startingLine + 1;
 			else
-				$line=$this->_startingLine+count(explode("\n",substr($input,0,$matchEnd+1)));
-			$this->handleException($e,$line,$input);
+				$line=$this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
+			$this->handleException($e, $line, $input);
 		}
 
 		if($this->_directive===null)
@@ -785,9 +785,9 @@ 
 				if($parent!==null)
 				{
 					if(count($merged[1])===1 && is_string($merged[1][0]))
-						$objects[$id-1]=array($merged[0],$merged[1][0]);
+						$objects[$id - 1]=array($merged[0], $merged[1][0]);
 					else
-						$objects[$id-1]=array($merged[0],new TCompositeLiteral($merged[1]));
+						$objects[$id - 1]=array($merged[0], new TCompositeLiteral($merged[1]));
 				}
 				if(isset($object[2]))
 				{
@@ -797,7 +797,7 @@ 
 				else
 				{
 					$parent=$object[0];
-					$merged=array($parent,array($object[1]));
+					$merged=array($parent, array($object[1]));
 				}
 			}
 			else
@@ -806,9 +806,9 @@ 
 		if($parent!==null)
 		{
 			if(count($merged[1])===1 && is_string($merged[1][0]))
-				$objects[$id]=array($merged[0],$merged[1][0]);
+				$objects[$id]=array($merged[0], $merged[1][0]);
 			else
-				$objects[$id]=array($merged[0],new TCompositeLiteral($merged[1]));
+				$objects[$id]=array($merged[0], new TCompositeLiteral($merged[1]));
 		}
 		$tpl=$objects;
 		return $objects;
@@ -819,31 +819,31 @@ 
 	 * @param string the string to be parsed.
 	 * @return array attribute values indexed by names.
 	 */
-	protected function parseAttributes($str,$offset)
+	protected function parseAttributes($str, $offset)
 	{
 		if($str==='')
 			return array();
 		$pattern='/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes=array();
-		$n=preg_match_all($pattern,$str,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
-		for($i=0;$i<$n;++$i)
+		$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]);
 			if(isset($attributes[$name]))
-				throw new TConfigurationException('template_property_duplicated',$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]==='"')
-					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
+					$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));
+					$attributes[$name]=$this->parseAttribute(substr($value, 1, strlen($value) - 2));
 				else
 					$attributes[$name]=$this->parseAttribute($value);
 			}
@@ -851,10 +851,10 @@ 
 		return $attributes;
 	}
 
-	protected function parseTemplateProperty($content,$offset)
+	protected function parseTemplateProperty($content, $offset)
 	{
-		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
-		return array(self::CONFIG_TEMPLATE,new TTemplate($content,$this->_contextPath,$this->_tplFile,$line,false));
+		$line=$this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
+		return array(self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false));
 	}
 
 	/**
@@ -864,12 +864,12 @@ 
 	 */
 	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];
@@ -877,114 +877,114 @@ 
 				$length=strlen($token);
 				if($token[2]==='#')
 					$isDataBind=true;
-				if($offset>$textStart)
-					$expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
-				$expr.='.('.substr($token,3,$length-5).')';
-				$textStart=$offset+$length;
+				if($offset > $textStart)
+					$expr.=".'".strtr(substr($value, $textStart, $offset - $textStart), array("'"=>"\\'", "\\"=>"\\\\"))."'";
+				$expr.='.('.substr($token, 3, $length - 5).')';
+				$textStart=$offset + $length;
 			}
 			$length=strlen($value);
-			if($length>$textStart)
-				$expr.=".'".strtr(substr($value,$textStart,$length-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
+			if($length > $textStart)
+				$expr.=".'".strtr(substr($value, $textStart, $length - $textStart), array("'"=>"\\'", "\\"=>"\\\\"))."'";
 			if($isDataBind)
-				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
+				return array(self::CONFIG_DATABIND, ltrim($expr, '.'));
 			else
-				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
+				return array(self::CONFIG_EXPRESSION, ltrim($expr, '.'));
 		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
-				return array(self::CONFIG_ASSET,trim(substr($value,3,strlen($value)-5)));
+				return array(self::CONFIG_ASSET, trim(substr($value, 3, strlen($value) - 5)));
 			elseif($value[2]==='[')
-				return array(self::CONFIG_LOCALIZATION,trim(substr($value,3,strlen($value)-6)));
+				return array(self::CONFIG_LOCALIZATION, trim(substr($value, 3, strlen($value) - 6)));
 			elseif($value[2]==='$')
-				return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
+				return array(self::CONFIG_PARAMETER, trim(substr($value, 3, strlen($value) - 5)));
 			elseif($value[2]==='/') {
-				$literal = trim(substr($value,3,strlen($value)-5));
-				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'");
+				$literal=trim(substr($value, 3, strlen($value) - 5));
+				return array(self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'");
 			}
 		}
 		else
 			return $value;
 	}
 
-	protected function validateAttributes($type,$attributes)
+	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,'TControl') || $className==='TControl')
+		if(is_subclass_of($className, 'TControl') || $className==='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);
+					$subname=substr($name, 0, $pos);
 					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
+				else if(strncasecmp($name, 'on', 2)===0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
-						throw new TConfigurationException('template_event_unknown',$type,$name);
+						throw new TConfigurationException('template_event_unknown', $type, $name);
 					else if(!is_string($att))
-						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
+						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))
-							throw new TConfigurationException('template_property_readonly',$type,$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);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
-						if(strcasecmp($name,'id')===0)
-							throw new TConfigurationException('template_controlid_invalid',$type);
-						else if(strcasecmp($name,'skinid')===0)
-							throw new TConfigurationException('template_controlskinid_invalid',$type);
+						if(strcasecmp($name, 'id')===0)
+							throw new TConfigurationException('template_controlid_invalid', $type);
+						else if(strcasecmp($name, 'skinid')===0)
+							throw new TConfigurationException('template_controlskinid_invalid', $type);
 					}
 				}
 			}
 		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		else if(is_subclass_of($className, 'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
 				if(is_array($att) && ($att[0]===self::CONFIG_DATABIND))
-					throw new TConfigurationException('template_databind_forbidden',$type,$name);
-				if(($pos=strpos($name,'.'))!==false)
+					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);
+					$subname=substr($name, 0, $pos);
 					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
-					throw new TConfigurationException('template_event_forbidden',$type,$name);
+				else if(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))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 				}
 			}
 		}
 		else
-			throw new TConfigurationException('template_component_required',$type);
+			throw new TConfigurationException('template_component_required', $type);
 	}
 
 	/**
@@ -1003,28 +1003,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;
 
-		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;
+						$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);
@@ -1040,29 +1040,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);
+				$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)));
-					$this->handleException(new TConfigurationException('template_include_invalid',trim($matches[$i][1][0])),$errorLine,$input);
+					$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)
+			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;
+				$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;
 			}
 		}
 
@@ -1075,7 +1075,7 @@ 
 	 * @param string $method
 	 * @return boolean
 	 */
-	protected function isClassBehaviorMethod(ReflectionClass $class,$method)
+	protected function isClassBehaviorMethod(ReflectionClass $class, $method)
 	{
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
@@ -1086,7 +1086,7 @@ 
 	    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;
 	    }
 	  }