pradosoft / prado

framework/Web/UI/TTemplate.php

Doc Comments +12 added lines, -1 removed lines

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

Spacing +193 added lines, -193 removed lines

@@ -120,7 +120,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;
@@ -188,7 +188,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)
@@ -218,7 +218,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']))
 					{
@@ -233,7 +233,7 @@ 
 
 					$component->applyStyleSheetSkin($page);
 					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+						$this->configureControl($component, $name, $value);
 
 					$component->trackViewState(true);
 
@@ -251,12 +251,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
@@ -302,14 +302,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);
 	}
 
 	/**
@@ -318,12 +318,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);
 	}
 
 	/**
@@ -333,12 +333,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));
 	}
 
 	/**
@@ -347,18 +347,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;
@@ -383,15 +383,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);
 		}
@@ -403,41 +403,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);
 	}
 
 	/**
@@ -465,7 +465,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();
@@ -475,186 +475,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]);
-					$class=$this->validateAttributes($type,$attributes);
-					$tpl[$c++]=array($container,$class,$attributes);
-					if($str[strlen($str)-2]!=='/')  // open tag
+					$attributes=$this->parseAttributes($match[2][0], $match[2][1]);
+					$class=$this->validateAttributes($type, $attributes);
+					$tpl[$c++]=array($container, $class, $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, "</com:$type>");
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag, "</com:$type>");
 					}
 					$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,"</prop:$prop>");
+						$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')
-								$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, "nothing");
+				$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+				throw new TConfigurationException('template_closingtag_expected', $tag, "nothing");
 			}
-			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)
@@ -671,9 +671,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]))
 				{
@@ -683,7 +683,7 @@ 
 				else
 				{
 					$parent=$object[0];
-					$merged=array($parent,array($object[1]));
+					$merged=array($parent, array($object[1]));
 				}
 			}
 			else
@@ -692,9 +692,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;
@@ -705,31 +705,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);
 			}
@@ -737,10 +737,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));
 	}
 
 	/**
@@ -750,12 +750,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];
@@ -763,114 +763,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,'\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)
 			{
-				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,'\Prado\TComponent') || $className==='\Prado\TComponent')
+		else if(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(($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);
 		return $class->getName();
 	}
 
@@ -890,28 +890,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);
@@ -927,29 +927,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;
 			}
 		}
 
@@ -962,7 +962,7 @@ 
 	 * @param string $method
 	 * @return boolean
 	 */
-	protected function isClassBehaviorMethod(\ReflectionClass $class,$method)
+	protected function isClassBehaviorMethod(\ReflectionClass $class, $method)
 	{
 	  $component=new \ReflectionClass('\Prado\TComponent');
 	  $behaviors=$component->getStaticProperties();
@@ -973,7 +973,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;
 	    }
 	  }

Braces +27 added lines, -54 removed lines

@@ -243,8 +243,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key]=$component;
-				}
-				else if($component instanceof TComponent)
+				} else if($component instanceof TComponent)
 				{
 					$controls[$key]=$component;
 					if(isset($properties['id']))
@@ -262,8 +261,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -274,8 +272,7 @@ 
 						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent===$parentControl)
 						$directChildren[]=$object[1];
@@ -386,8 +383,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			if (substr($name,0,2)=='js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
@@ -435,8 +431,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name,$value);
 	}
 
@@ -497,8 +492,7 @@ 
 						$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;
@@ -517,8 +511,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag, "</com:$type>");
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)	// directive
+				} else if(strpos($str,'<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -528,8 +521,7 @@ 
 					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
-				}
-				else if(strpos($str,'<%')===0)	// expression
+				} else if(strpos($str,'<%')===0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
@@ -554,8 +546,7 @@ 
 						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
 						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
 					}
-				}
-				else if(strpos($str,'<prop:')===0)	// opening property
+				} else if(strpos($str,'<prop:')===0)	// opening property
 				{
 					if(strrpos($str,'/>')===strlen($str)-2)  //subproperties
 					{
@@ -577,8 +568,7 @@ 
 								throw new TConfigurationException('template_property_duplicated',$name);
 							$tpl[$container][2][$name]=$value;
 						}
-					}
-					else  // regular property
+					} else  // regular property
 					{
 						$prop=strtolower($match[3][0]);
 						$stack[] = '@'.$prop;
@@ -590,8 +580,7 @@ 
 							$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))
@@ -618,23 +607,20 @@ 
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated',$prop);
 								$tpl[$container][2][$prop]=$value;
-							}
-							else	// a property for the template control
+							} else	// a property for the template control
 								$this->_directive[$prop]=$value;
 							$textStart=$matchEnd+1;
 						}
 						$expectPropEnd=false;
 					}
-				}
-				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;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected',$match);
 			}
 			if(!empty($stack))
@@ -645,8 +631,7 @@ 
 			}
 			if($textStart<strlen($input))
 				$tpl[$c++]=array($container,substr($input,$textStart));
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -679,14 +664,12 @@ 
 				{
 					$parent=null;
 					$objects[$id]=$object;
-				}
-				else
+				} else
 				{
 					$parent=$object[0];
 					$merged=array($parent,array($object[1]));
 				}
-			}
-			else
+			} else
 				$merged[1][]=$object[1];
 		}
 		if($parent!==null)
@@ -725,8 +708,7 @@ 
 					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
 				else
 					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
-			}
-			else
+			} else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
 					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
@@ -775,8 +757,7 @@ 
 				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
 			else
 				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
-		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		} else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
@@ -789,8 +770,7 @@ 
 				$literal = trim(substr($value,3,strlen($value)-5));
 				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'");
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 
@@ -812,16 +792,14 @@ 
 					$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown',$type,$name);
 					else if(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
-				}
-				else
+				} else
 				{
 					// a simple property
 					if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
@@ -830,8 +808,7 @@ 
 							throw new TConfigurationException('template_property_readonly',$type,$name);
 						else
 							throw new TConfigurationException('template_property_unknown',$type,$name);
-					}
-					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
+					} else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name,'id')===0)
 							throw new TConfigurationException('template_controlid_invalid',$type);
@@ -840,8 +817,7 @@ 
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'\Prado\TComponent') || $className==='\Prado\TComponent')
+		} else if(is_subclass_of($className,'\Prado\TComponent') || $className==='\Prado\TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
@@ -853,8 +829,7 @@ 
 					$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 					throw new TConfigurationException('template_event_forbidden',$type,$name);
 				else
 				{
@@ -868,8 +843,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required',$type);
 		return $class->getName();
 	}
@@ -905,8 +879,7 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}

framework/TComponent.php

Spacing +193 added lines, -193 removed lines

@@ -389,7 +389,7 @@ 
 	 * that start with 'fx' are filtered in.
 	 */
 	private function filter_prado_fx($name) {
-		return strncasecmp($name,'fx',2)===0;
+		return strncasecmp($name, 'fx', 2)===0;
 	}
 
 
@@ -399,13 +399,13 @@ 
 	 * @param boolean optional should the names be all lowercase true/false
 	 * @return array array of strings being the class hierarchy of $this.
 	 */
-	public function getClassHierarchy($lowercase = false)
+	public function getClassHierarchy($lowercase=false)
 	{
 		$class=get_class($this);
 		$classes=array($class);
-		while($class=get_parent_class($class)){array_unshift($classes,$class);}
+		while($class=get_parent_class($class)) {array_unshift($classes, $class); }
 		if($lowercase)
-			return array_map('strtolower',$classes);
+			return array_map('strtolower', $classes);
 		return $classes;
 	}
 
@@ -428,14 +428,14 @@ 
 		if($this->_listeningenabled)
 			return;
 
-		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
+		$fx=array_filter(get_class_methods($this), array($this, 'filter_prado_fx'));
 
 		foreach($fx as $func)
-			$this->attachEventHandler($func,array($this,$func));
+			$this->attachEventHandler($func, array($this, $func));
 
-		if(is_a($this,'Prado\\Util\\IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
 		$this->_listeningenabled=true;
@@ -462,14 +462,14 @@ 
 		if(!$this->_listeningenabled)
 			return;
 
-		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
+		$fx=array_filter(get_class_methods($this), array($this, 'filter_prado_fx'));
 
 		foreach($fx as $func)
-			$this->detachEventHandler($func,array($this,$func));
+			$this->detachEventHandler($func, array($this, $func));
 
-		if(is_a($this,'Prado\\Util\\IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
 		$this->_listeningenabled=false;
@@ -514,66 +514,66 @@ 
 	 */
 	public function __call($method, $args)
 	{
-		$getset=substr($method,0,3);
-		if(($getset=='get')||($getset=='set'))
+		$getset=substr($method, 0, 3);
+		if(($getset=='get') || ($getset=='set'))
 		{
-			$propname=substr($method,3);
+			$propname=substr($method, 3);
 			$jsmethod=$getset.'js'.$propname;
-			if(method_exists($this,$jsmethod))
+			if(method_exists($this, $jsmethod))
 			{
-				if(count($args)>0)
-					if($args[0]&&!($args[0] instanceof TJavaScriptString))
+				if(count($args) > 0)
+					if($args[0] && !($args[0] instanceof TJavaScriptString))
 						$args[0]=new TJavaScriptString($args[0]);
-				return call_user_func_array(array($this,$jsmethod),$args);
+				return call_user_func_array(array($this, $jsmethod), $args);
 			}
 
-			if (($getset=='set')&&method_exists($this,'getjs'.$propname))
-				throw new TInvalidOperationException('component_property_readonly',get_class($this),$method);
+			if(($getset=='set') && method_exists($this, 'getjs'.$propname))
+				throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
 		}
 
-		if($this->_m!==null&&$this->_behaviorsenabled)
+		if($this->_m!==null && $this->_behaviorsenabled)
 		{
-			if(strncasecmp($method,'dy',2)===0)
+			if(strncasecmp($method, 'dy', 2)===0)
 			{
 				$callchain=new TCallChain($method);
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&(method_exists($behavior,$method)||($behavior instanceof IDynamicMethods)))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods)))
 					{
 						$behavior_args=$args;
 						if($behavior instanceof IClassBehavior)
-							array_unshift($behavior_args,$this);
-						$callchain->addCall(array($behavior,$method),$behavior_args);
+							array_unshift($behavior_args, $this);
+						$callchain->addCall(array($behavior, $method), $behavior_args);
 					}
 
 				}
-				if($callchain->getCount()>0)
-					return call_user_func_array(array($callchain,'call'),$args);
+				if($callchain->getCount() > 0)
+					return call_user_func_array(array($callchain, 'call'), $args);
 			}
 			else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&method_exists($behavior,$method))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method))
 					{
 						if($behavior instanceof IClassBehavior)
-							array_unshift($args,$this);
-						return call_user_func_array(array($behavior,$method),$args);
+							array_unshift($args, $this);
+						return call_user_func_array(array($behavior, $method), $args);
 					}
 				}
 			}
 		}
 
-		if(strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+		if(strncasecmp($method, 'dy', 2)===0 || strncasecmp($method, 'fx', 2)===0)
 		{
 			if($this instanceof IDynamicMethods)
-				return $this->__dycall($method,$args);
-			return isset($args[0])?$args[0]:null;
+				return $this->__dycall($method, $args);
+			return isset($args[0]) ? $args[0] : null;
 		}
 
 		// don't thrown an exception for __magicMethods() or any other weird methods natively implemented by php
-		if (!method_exists($this, $method)) {
-			throw new TApplicationException('component_method_undefined',get_class($this),$method);
+		if(!method_exists($this, $method)) {
+			throw new TApplicationException('component_method_undefined', get_class($this), $method);
 		}
 	}
 
@@ -603,17 +603,17 @@ 
 	 */
 	public function __get($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
+		if(method_exists($this, $getter='get'.$name))
 		{
 			// getting a property
 			return $this->$getter();
 		}
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		else if(method_exists($this, $jsgetter='getjs'.$name))
 		{
 			// getting a javascript property
-			return (string)$this->$jsgetter();
+			return (string) $this->$jsgetter();
 		}
-		else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
+		else if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			// getting an event (handler list)
 			$name=strtolower($name);
@@ -621,7 +621,7 @@ 
 				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 		{
 			// getting a global event (handler list)
 			$name=strtolower($name);
@@ -638,13 +638,13 @@ 
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-						(property_exists($behavior,$name)||$behavior->canGetProperty($name)||$behavior->hasEvent($name)))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name)))
 						return $behavior->$name;
 				}
 			}
 		}
-		throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
+		throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 	}
 
 	/**
@@ -662,31 +662,31 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		if(method_exists($this,$setter='set'.$name))
+		if(method_exists($this, $setter='set'.$name))
 		{
-			if(strncasecmp($name,'js',2)===0&&$value&&!($value instanceof TJavaScriptLiteral))
-				$value = new TJavaScriptLiteral($value);
+			if(strncasecmp($name, 'js', 2)===0 && $value && !($value instanceof TJavaScriptLiteral))
+				$value=new TJavaScriptLiteral($value);
 			return $this->$setter($value);
 		}
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		else if(method_exists($this, $jssetter='setjs'.$name))
 		{
-			if($value&&!($value instanceof TJavaScriptString))
+			if($value && !($value instanceof TJavaScriptString))
 				$value=new TJavaScriptString($value);
 			return $this->$jssetter($value);
 		}
-		else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
+		else if((strncasecmp($name, 'on', 2)===0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2)===0)
 		{
-			return $this->attachEventHandler($name,$value);
+			return $this->attachEventHandler($name, $value);
 		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			$sets=0;
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-					(property_exists($behavior,$name)||$behavior->canSetProperty($name)||$behavior->hasEvent($name))) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+					(property_exists($behavior, $name) || $behavior->canSetProperty($name) || $behavior->hasEvent($name))) {
 					$behavior->$name=$value;
 					$sets++;
 				}
@@ -695,13 +695,13 @@ 
 
 		}
 
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
+		if(method_exists($this, 'get'.$name) || method_exists($this, 'getjs'.$name))
 		{
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 		}
 		else
 		{
-			throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
+			throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 		}
 	}
 
@@ -719,27 +719,27 @@ 
 	 */
 	public function __isset($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
+		if(method_exists($this, $getter='get'.$name))
 			return $this->$getter()!==null;
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		else if(method_exists($this, $jsgetter='getjs'.$name))
 			return $this->$jsgetter()!==null;
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		else if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			$name=strtolower($name);
-			return isset($this->_e[$name])&&$this->_e[$name]->getCount();
+			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 		{
 			$name=strtolower($name);
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount();
+			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
 		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				return true;
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled()))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()))
 					return isset($behavior->$name);
 			}
 
@@ -760,15 +760,15 @@ 
 	 */
 	public function __unset($name)
 	{
-		if(method_exists($this,$setter='set'.$name))
+		if(method_exists($this, $setter='set'.$name))
 			$this->$setter(null);
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		else if(method_exists($this, $jssetter='setjs'.$name))
 			$this->$jssetter(null);
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		else if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 			$this->_e[strtolower($name)]->clear();
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 			$this->getEventHandlers($name)->remove(array($this, $name));
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				$this->detachBehavior($name);
@@ -776,16 +776,16 @@ 
 				$unset=0;
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
 						unset($behavior->$name);
 						$unset++;
 					}
 				}
-				if(!$unset&&method_exists($this,'get'.$name))
-					throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+				if(!$unset && method_exists($this, 'get'.$name))
+					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 			}
-		} else if(method_exists($this,'get'.$name))
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+		} else if(method_exists($this, 'get'.$name))
+			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 	}
 
 	/**
@@ -797,7 +797,7 @@ 
 	 */
 	public function hasProperty($name)
 	{
-		return $this->canGetProperty($name)||$this->canSetProperty($name);
+		return $this->canGetProperty($name) || $this->canSetProperty($name);
 	}
 
 	/**
@@ -811,13 +811,13 @@ 
 	 */
 	public function canGetProperty($name)
 	{
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
+		if(method_exists($this, 'get'.$name) || method_exists($this, 'getjs'.$name))
 			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canGetProperty($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name))
 					return true;
 			}
 		}
@@ -835,13 +835,13 @@ 
 	 */
 	public function canSetProperty($name)
 	{
-		if(method_exists($this,'set'.$name)||method_exists($this,'setjs'.$name))
+		if(method_exists($this, 'set'.$name) || method_exists($this, 'setjs'.$name))
 			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canSetProperty($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name))
 					return true;
 			}
 		}
@@ -861,7 +861,7 @@ 
 	public function getSubProperty($path)
 	{
 		$object=$this;
-		foreach(explode('.',$path) as $property)
+		foreach(explode('.', $path) as $property)
 			$object=$object->$property;
 		return $object;
 	}
@@ -876,15 +876,15 @@ 
 	 * @param string property path
 	 * @param mixed the property path value
 	 */
-	public function setSubProperty($path,$value)
+	public function setSubProperty($path, $value)
 	{
 		$object=$this;
-		if(($pos=strrpos($path,'.'))===false)
+		if(($pos=strrpos($path, '.'))===false)
 			$property=$path;
 		else
 		{
-			$object=$this->getSubProperty(substr($path,0,$pos));
-			$property=substr($path,$pos+1);
+			$object=$this->getSubProperty(substr($path, 0, $pos));
+			$property=substr($path, $pos + 1);
 		}
 		$object->$property=$value;
 	}
@@ -903,14 +903,14 @@ 
 	 */
 	public function hasEvent($name)
 	{
-		if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0||strncasecmp($name,'dy',2)===0)
+		if((strncasecmp($name, 'on', 2)===0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2)===0 || strncasecmp($name, 'dy', 2)===0)
 			return true;
 
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return true;
 			}
 		}
@@ -927,16 +927,16 @@ 
 	public function hasEventHandler($name)
 	{
 		$name=strtolower($name);
-		if(strncasecmp($name,'fx',2)===0)
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount()>0;
+		if(strncasecmp($name, 'fx', 2)===0)
+			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount() > 0;
 		else
 		{
-			if(isset($this->_e[$name])&&$this->_e[$name]->getCount()>0)
+			if(isset($this->_e[$name]) && $this->_e[$name]->getCount() > 0)
 				return true;
-			else if($this->_m!==null&&$this->_behaviorsenabled) {
+			else if($this->_m!==null && $this->_behaviorsenabled) {
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEventHandler($name))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name))
 						return true;
 				}
 			}
@@ -952,29 +952,29 @@ 
 	 */
 	public function getEventHandlers($name)
 	{
-		if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			$name=strtolower($name);
 			if(!isset($this->_e[$name]))
 				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 		{
 			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
 		}
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return $behavior->getEventHandlers($name);
 			}
 		}
-		throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
+		throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 	}
 
 	/**
@@ -1022,9 +1022,9 @@ 
 	 * default priority of 10.0 within {@link TPriorityList}
 	 * @throws TInvalidOperationException if the event does not exist
 	 */
-	public function attachEventHandler($name,$handler,$priority=null)
+	public function attachEventHandler($name, $handler, $priority=null)
 	{
-		$this->getEventHandlers($name)->add($handler,$priority);
+		$this->getEventHandlers($name)->add($handler, $priority);
 	}
 
 	/**
@@ -1037,13 +1037,13 @@ 
 	 * to an item of any priority within {@link TPriorityList}; null means the default priority
 	 * @return boolean if the removal is successful
 	 */
-	public function detachEventHandler($name,$handler,$priority=false)
+	public function detachEventHandler($name, $handler, $priority=false)
 	{
 		if($this->hasEventHandler($name))
 		{
 			try
 			{
-				$this->getEventHandlers($name)->remove($handler,$priority);
+				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
 			}
 			catch(\Exception $e)
@@ -1125,7 +1125,7 @@ 
 	 * @throws TInvalidOperationException if the event is undefined
 	 * @throws TInvalidDataValueException If an event handler is invalid
 	 */
-	public function raiseEvent($name,$sender,$param,$responsetype=null,$postfunction=null)
+	public function raiseEvent($name, $sender, $param, $responsetype=null, $postfunction=null)
 	{
 		$p=$param;
 		if(is_callable($responsetype))
@@ -1140,90 +1140,90 @@ 
 		$name=strtolower($name);
 		$responses=array();
 
-		$name=$this->dyPreRaiseEvent($name,$sender,$param,$responsetype,$postfunction);
+		$name=$this->dyPreRaiseEvent($name, $sender, $param, $responsetype, $postfunction);
 
-		if($this->hasEventHandler($name)||$this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
+		if($this->hasEventHandler($name) || $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
 		{
 			$handlers=$this->getEventHandlers($name);
 			$handlerArray=$handlers->toArray();
-			if(strncasecmp($name,'fx',2)===0&&$this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
+			if(strncasecmp($name, 'fx', 2)===0 && $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
 			{
 				$globalhandlers=$this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
-				$handlerArray=array_merge($globalhandlers->toArrayBelowPriority(0),$handlerArray,$globalhandlers->toArrayAbovePriority(0));
+				$handlerArray=array_merge($globalhandlers->toArrayBelowPriority(0), $handlerArray, $globalhandlers->toArrayAbovePriority(0));
 			}
 			$response=null;
 			foreach($handlerArray as $handler)
 			{
-				if($this->dyIntraRaiseEventTestHandler($handler,$sender,$param,$name)===false)
+				if($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name)===false)
 					continue;
 
 				if(is_string($handler))
 				{
-					if(($pos=strrpos($handler,'.'))!==false)
+					if(($pos=strrpos($handler, '.'))!==false)
 					{
-						$object=$this->getSubProperty(substr($handler,0,$pos));
-						$method=substr($handler,$pos+1);
-						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+						$object=$this->getSubProperty(substr($handler, 0, $pos));
+						$method=substr($handler, $pos + 1);
+						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2)===0 || strncasecmp($method, 'fx', 2)===0)
 						{
 							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
+								$response=$object->__dycall($name, array($sender, $param, $name));
 							else
-								$response=$object->$method($sender,$param,$name);
+								$response=$object->$method($sender, $param, $name);
 						}
 						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
+							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler);
 					}
 					else
-						$response=call_user_func($handler,$sender,$param,$name);
+						$response=call_user_func($handler, $sender, $param, $name);
 				}
-				else if(is_callable($handler,true))
+				else if(is_callable($handler, true))
 				{
-					list($object,$method)=$handler;
+					list($object, $method)=$handler;
 					if(is_string($object))
-						$response=call_user_func($handler,$sender,$param,$name);
+						$response=call_user_func($handler, $sender, $param, $name);
 					else
 					{
-						if(($pos=strrpos($method,'.'))!==false)
+						if(($pos=strrpos($method, '.'))!==false)
 						{
-							$object=$this->getSubProperty(substr($method,0,$pos));
-							$method=substr($method,$pos+1);
+							$object=$this->getSubProperty(substr($method, 0, $pos));
+							$method=substr($method, $pos + 1);
 						}
-						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2)===0 || strncasecmp($method, 'fx', 2)===0)
 						{
 							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
+								$response=$object->__dycall($name, array($sender, $param, $name));
 							else
-								$response=$object->$method($sender,$param,$name);
+								$response=$object->$method($sender, $param, $name);
 						}
 						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
+							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler[1]);
 					}
 				}
 				else
-					throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
+					throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, gettype($handler));
 
-				$this->dyIntraRaiseEventPostHandler($name,$sender,$param,$handler,$response);
+				$this->dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $response);
 
 				if($postfunction)
-					$response=call_user_func_array($postfunction,array($sender,$param,$this,$response));
+					$response=call_user_func_array($postfunction, array($sender, $param, $this, $response));
 
-				if($responsetype&TEventResults::EVENT_RESULT_ALL)
-					$responses[]=array('sender'=>$sender,'param'=>$param,'response'=>$response);
+				if($responsetype & TEventResults::EVENT_RESULT_ALL)
+					$responses[]=array('sender'=>$sender, 'param'=>$param, 'response'=>$response);
 				else
 					$responses[]=$response;
 
-				if($response!==null&&($responsetype&TEventResults::EVENT_RESULT_FEED_FORWARD))
+				if($response!==null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD))
 					$param=$response;
 
 			}
 		}
-		else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name))
-			throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
+		else if(strncasecmp($name, 'on', 2)===0 && !$this->hasEvent($name))
+			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 
-		if($responsetype&TEventResults::EVENT_RESULT_FILTER)
+		if($responsetype & TEventResults::EVENT_RESULT_FILTER)
 			$responses=array_filter($responses);
 
-		$responses=$this->dyPostRaiseEvent($responses,$name,$sender,$param,$responsetype,$postfunction);
+		$responses=$this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
 
 		return $responses;
 	}
@@ -1256,7 +1256,7 @@ 
 		}
 		catch(\Exception $e)
 		{
-			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());
+			throw new TInvalidOperationException('component_expression_invalid', get_class($this), $expression, $e->getMessage());
 		}
 	}
 
@@ -1291,7 +1291,7 @@ 
 		}
 		catch(\Exception $e)
 		{
-			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());
+			throw new TInvalidOperationException('component_statements_invalid', get_class($this), $statements, $e->getMessage());
 		}
 	}
 
@@ -1351,9 +1351,9 @@ 
 	 * @param $param TClassBehaviorEventParameter
 	 * @since 3.2.3
 	 */
-	public function fxAttachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->attachBehavior($param->getName(),$param->getBehavior(),$param->getPriority());
+	public function fxAttachClassBehavior($sender, $param) {
+		if(in_array($param->getClass(), $this->getClassHierarchy(true)))
+			return $this->attachBehavior($param->getName(), $param->getBehavior(), $param->getPriority());
 	}
 
 
@@ -1365,9 +1365,9 @@ 
 	 * @param $param TClassBehaviorEventParameter
 	 * @since 3.2.3
 	 */
-	public function fxDetachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->detachBehavior($param->getName(),$param->getPriority());
+	public function fxDetachClassBehavior($sender, $param) {
+		if(in_array($param->getClass(), $this->getClassHierarchy(true)))
+			return $this->detachBehavior($param->getName(), $param->getPriority());
 	}
 
 
@@ -1389,8 +1389,8 @@ 
 	 * @throws TInvalidOperationException if the class behavior is already defined
 	 * @since 3.2.3
 	 */
-	public static function attachClassBehavior($name,$behavior,$class=null,$priority=null) {
-		if(!$class&&function_exists('get_called_class'))
+	public static function attachClassBehavior($name, $behavior, $class=null, $priority=null) {
+		if(!$class && function_exists('get_called_class'))
 			$class=get_called_class();
 		if(!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
@@ -1403,11 +1403,11 @@ 
 		if(empty(self::$_um[$class]))
 			self::$_um[$class]=array();
 		if(isset(self::$_um[$class][$name]))
-			throw new TInvalidOperationException('component_class_behavior_defined',$class,$name);
-		$param=new TClassBehaviorEventParameter($class,$name,$behavior,$priority);
-		self::$_um[$class]=array($name=>$param)+self::$_um[$class];
-		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
-		return $behaviorObject->raiseEvent('fxAttachClassBehavior',null,$param);
+			throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
+		$param=new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
+		self::$_um[$class]=array($name=>$param) + self::$_um[$class];
+		$behaviorObject=is_string($behavior) ? new $behavior : $behavior;
+		return $behaviorObject->raiseEvent('fxAttachClassBehavior', null, $param);
 	}
 
 
@@ -1423,8 +1423,8 @@ 
 	 * not supplied as a parameter.
 	 * @since 3.2.3
 	 */
-	public static function detachClassBehavior($name,$class=null,$priority=false) {
-		if(!$class&&function_exists('get_called_class'))
+	public static function detachClassBehavior($name, $class=null, $priority=false) {
+		if(!$class && function_exists('get_called_class'))
 			$class=get_called_class();
 		if(!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
@@ -1432,13 +1432,13 @@ 
 		$class=strtolower($class);
 		if(!is_string($name))
 			$name=get_class($name);
-		if(empty(self::$_um[$class])||!isset(self::$_um[$class][$name]))
+		if(empty(self::$_um[$class]) || !isset(self::$_um[$class][$name]))
 			return false;
 		$param=self::$_um[$class][$name];
 		$behavior=$param->getBehavior();
 		unset(self::$_um[$class][$name]);
-		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
-		return $behaviorObject->raiseEvent('fxDetachClassBehavior',null,$param);
+		$behaviorObject=is_string($behavior) ? new $behavior : $behavior;
+		return $behaviorObject->raiseEvent('fxDetachClassBehavior', null, $param);
 	}
 
 	/**
@@ -1450,7 +1450,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1476,15 +1476,15 @@ 
 	{
 		if($this instanceof $class)
 			return true;
-		if($this->_m!==null&&$this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
-				if(($behavior instanceof IBehavior)&&!$behavior->getEnabled())
+		if($this->_m!==null && $this->_behaviorsenabled)
+			foreach($this->_m->toArray() as $behavior) {
+				if(($behavior instanceof IBehavior) && !$behavior->getEnabled())
 					continue;
 
-				$check = null;
-				if(($behavior->isa('\Prado\Util\IInstanceCheck'))&&$check=$behavior->isinstanceof($class,$this))
+				$check=null;
+				if(($behavior->isa('\Prado\Util\IInstanceCheck')) && $check=$behavior->isinstanceof($class, $this))
 					return true;
-				if($check===null&&($behavior->isa($class)))
+				if($check===null && ($behavior->isa($class)))
 					return true;
 			}
 		return false;
@@ -1502,9 +1502,9 @@ 
 	{
 		foreach($behaviors as $name=>$behavior)
 			if($behavior instanceof TClassBehaviorEventParameter)
-				$this->attachBehavior($behavior->getName(),$behavior->getBehavior(),$behavior->getPriority());
+				$this->attachBehavior($behavior->getName(), $behavior->getBehavior(), $behavior->getPriority());
 			else
-				$this->attachBehavior($name,$behavior);
+				$this->attachBehavior($name, $behavior);
 	}
 
 	/**
@@ -1521,9 +1521,9 @@ 
 		{
 			foreach($behaviors as $name=>$behavior)
 				if($behavior instanceof TClassBehaviorEventParameter)
-					$this->detachBehavior($behavior->getName(),$behavior->getPriority());
+					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
 		}
 	}
 
@@ -1561,19 +1561,19 @@ 
 	 * @return IBehavior the behavior object
 	 * @since 3.2.3
 	 */
-	public function attachBehavior($name,$behavior,$priority=null)
+	public function attachBehavior($name, $behavior, $priority=null)
 	{
 		if(is_string($behavior))
 			$behavior=Prado::createComponent($behavior);
 		if(!($behavior instanceof IBaseBehavior))
-			throw new TInvalidDataTypeException('component_not_a_behavior',get_class($behavior));
+			throw new TInvalidDataTypeException('component_not_a_behavior', get_class($behavior));
 		if($behavior instanceof IBehavior)
 			$behavior->setEnabled(true);
 		if($this->_m===null)
 			$this->_m=new TPriorityMap;
 		$behavior->attach($this);
-		$this->dyAttachBehavior($name,$behavior);
-		$this->_m->add($name,$behavior,$priority);
+		$this->dyAttachBehavior($name, $behavior);
+		$this->_m->add($name, $behavior, $priority);
 		return $behavior;
 	}
 
@@ -1594,14 +1594,14 @@ 
 	 * @return IBehavior the detached behavior. Null if the behavior does not exist.
 	 * @since 3.2.3
 	 */
-	public function detachBehavior($name,$priority=false)
+	public function detachBehavior($name, $priority=false)
 	{
-		if($this->_m!=null&&isset($this->_m[$name]))
+		if($this->_m!=null && isset($this->_m[$name]))
 		{
 			$this->_m[$name]->detach($this);
 			$behavior=$this->_m->itemAt($name);
-			$this->_m->remove($name,$priority);
-			$this->dyDetachBehavior($name,$behavior);
+			$this->_m->remove($name, $priority);
+			$this->dyDetachBehavior($name, $behavior);
 			return $behavior;
 		}
 	}
@@ -1677,10 +1677,10 @@ 
 	 */
 	public function enableBehavior($name)
 	{
-		if($this->_m!=null&&isset($this->_m[$name])){
+		if($this->_m!=null && isset($this->_m[$name])) {
 			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(true);
-				$this->dyEnableBehavior($name,$this->_m[$name]);
+				$this->dyEnableBehavior($name, $this->_m[$name]);
 				return true;
 			}
 			return false;
@@ -1705,10 +1705,10 @@ 
 	 */
 	public function disableBehavior($name)
 	{
-		if($this->_m!=null&&isset($this->_m[$name])){
+		if($this->_m!=null && isset($this->_m[$name])) {
 			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(false);
-				$this->dyDisableBehavior($name,$this->_m[$name]);
+				$this->dyDisableBehavior($name, $this->_m[$name]);
 				return true;
 			}
 			return false;
@@ -1723,9 +1723,9 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
-		$a = array_keys($a);
-		$exprops = array();
+		$a=(array) $this;
+		$a=array_keys($a);
+		$exprops=array();
 		$this->_getZappableSleepProps($exprops);
 		return array_diff($a, $exprops);
 	}
@@ -1739,12 +1739,12 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		if($this->_listeningenabled===false)
-			$exprops[] = "\0Prado\TComponent\0_listeningenabled";
+			$exprops[]="\0Prado\TComponent\0_listeningenabled";
 		if($this->_behaviorsenabled===true)
-			$exprops[] = "\0Prado\TComponent\0_behaviorsenabled";
-		if ($this->_e===array())
-			$exprops[] = "\0Prado\TComponent\0_e";
-		if ($this->_m===null)
-			$exprops[] = "\0Prado\TComponent\0_m";
+			$exprops[]="\0Prado\TComponent\0_behaviorsenabled";
+		if($this->_e===array())
+			$exprops[]="\0Prado\TComponent\0_e";
+		if($this->_m===null)
+			$exprops[]="\0Prado\TComponent\0_m";
 	}
 }
\ No newline at end of file

framework/Collections/TMap.php

Spacing +16 added lines, -16 removed lines

@@ -56,10 +56,10 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_d===array())
-			$exprops[] = "\0Prado\Collections\TMap\0_d";
-		if ($this->_r===false)
-			$exprops[] = "\0Prado\Collections\TMap\0_r";
+		if($this->_d===array())
+			$exprops[]="\0Prado\Collections\TMap\0_d";
+		if($this->_r===false)
+			$exprops[]="\0Prado\Collections\TMap\0_r";
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -99,7 +99,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->_d );
+		return new \ArrayIterator($this->_d);
 	}
 
 	/**
@@ -146,12 +146,12 @@ 
 	 * @param mixed value
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		if(!$this->_r)
 			$this->_d[$key]=$value;
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(isset($this->_d[$key]) || array_key_exists($key,$this->_d))
+			if(isset($this->_d[$key]) || array_key_exists($key, $this->_d))
 			{
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
@@ -174,7 +174,7 @@ 
 				return null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_d[$key]) || array_key_exists($key,$this->_d);
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
 	}
 
 	/**
@@ -213,10 +213,10 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -233,7 +233,7 @@ 
 		if(is_array($data) || $data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -267,9 +267,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**

framework/Collections/TAttributeCollection.php

Spacing +10 added lines, -10 removed lines

@@ -51,8 +51,8 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
-			$exprops[] = "\0Prado\Collections\TAttributeCollection\0_caseSensitive";
+		if($this->_caseSensitive===false)
+			$exprops[]="\0Prado\Collections\TAttributeCollection\0_caseSensitive";
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -76,9 +76,9 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -115,9 +115,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

framework/Web/UI/WebControls/TTableItemStyle.php

Spacing +14 added lines, -14 removed lines

@@ -44,12 +44,12 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_horizontalAlign";
-		if ($this->_verticalAlign===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_verticalAlign";
-		if ($this->_wrap===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_wrap";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableItemStyle\0_horizontalAlign";
+		if($this->_verticalAlign===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableItemStyle\0_verticalAlign";
+		if($this->_wrap===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableItemStyle\0_wrap";
 	}
 
 	/**
@@ -113,13 +113,13 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
+			$writer->addStyleAttribute('white-space', 'nowrap');
 
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
+			$writer->addAttribute('align', strtolower($horizontalAlign));
 
 		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+			$writer->addAttribute('valign', strtolower($verticalAlign));
 
 		parent::addAttributesToRender($writer);
 	}
@@ -129,7 +129,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\THorizontalAlign');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		return $this->_verticalAlign===null?TVerticalAlign::NotSet:$this->_verticalAlign;
+		return $this->_verticalAlign===null ? TVerticalAlign::NotSet : $this->_verticalAlign;
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setVerticalAlign($value)
 	{
-		$this->_verticalAlign=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TVerticalAlign');
+		$this->_verticalAlign=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TVerticalAlign');
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->_wrap===null?true:$this->_wrap;
+		return $this->_wrap===null ? true : $this->_wrap;
 	}
 
 	/**

framework/Web/UI/WebControls/TTableStyle.php

Spacing +32 added lines, -32 removed lines

@@ -57,18 +57,18 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_backImageUrl===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellSpacing";
-		if ($this->_gridLines===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_gridLines";
-		if ($this->_borderCollapse===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_borderCollapse";
+		if($this->_backImageUrl===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableStyle\0_backImageUrl";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableStyle\0_horizontalAlign";
+		if($this->_cellPadding===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableStyle\0_cellPadding";
+		if($this->_cellSpacing===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableStyle\0_cellSpacing";
+		if($this->_gridLines===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableStyle\0_gridLines";
+		if($this->_borderCollapse===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TTableStyle\0_borderCollapse";
 	}
 
 	/**
@@ -147,25 +147,25 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
+			$writer->addStyleAttribute('background-image', 'url('.$url.')');
 
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
+			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
 
-		if(($cellPadding=$this->getCellPadding())>=0)
-			$writer->addAttribute('cellpadding',"$cellPadding");
+		if(($cellPadding=$this->getCellPadding()) >= 0)
+			$writer->addAttribute('cellpadding', "$cellPadding");
 
-		if(($cellSpacing=$this->getCellSpacing())>=0)
-			$writer->addAttribute('cellspacing',"$cellSpacing");
+		if(($cellSpacing=$this->getCellSpacing()) >= 0)
+			$writer->addAttribute('cellspacing', "$cellSpacing");
 
 		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse','collapse');
+			$writer->addStyleAttribute('border-collapse', 'collapse');
 
 		switch($this->getGridLines())
 		{
-			case TTableGridLines::Horizontal : $writer->addAttribute('rules','rows'); break;
-			case TTableGridLines::Vertical : $writer->addAttribute('rules','cols'); break;
-			case TTableGridLines::Both : $writer->addAttribute('rules','all'); break;
+			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
+			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
+			case TTableGridLines::Both : $writer->addAttribute('rules', 'all'); break;
 		}
 
 		parent::addAttributesToRender($writer);
@@ -176,7 +176,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl===null?'':$this->_backImageUrl;
+		return $this->_backImageUrl===null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		return $this->_cellPadding===null?-1:$this->_cellPadding;
+		return $this->_cellPadding===null ?-1 : $this->_cellPadding;
 	}
 
 	/**
@@ -219,7 +219,7 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellPadding=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 
@@ -228,7 +228,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing===null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing===null ?-1 : $this->_cellSpacing;
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 
@@ -246,7 +246,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		return $this->_gridLines===null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines===null ? TTableGridLines::None : $this->_gridLines;
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function setGridLines($value)
 	{
-		$this->_gridLines=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TTableGridLines');
+		$this->_gridLines=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TTableGridLines');
 	}
 
 
@@ -264,7 +264,7 @@ 
 	 */
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse===null?false:$this->_borderCollapse;
+		return $this->_borderCollapse===null ? false : $this->_borderCollapse;
 	}
 
 	/**

framework/Web/UI/WebControls/TFont.php

Spacing +30 added lines, -30 removed lines

@@ -65,12 +65,12 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_flags===0)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_flags";
-		if ($this->_name==='')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_name";
-		if ($this->_size==='')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_size";
+		if($this->_flags===0)
+			$exprops[]="\0Prado\Web\UI\WebControls\TFont\0_flags";
+		if($this->_name==='')
+			$exprops[]="\0Prado\Web\UI\WebControls\TFont\0_name";
+		if($this->_size==='')
+			$exprops[]="\0Prado\Web\UI\WebControls\TFont\0_size";
 	}
 
 	/**
@@ -86,11 +86,11 @@ 
 	 */
 	public function setBold($value)
 	{
-		$this->_flags |= self::IS_SET_BOLD;
+		$this->_flags|=self::IS_SET_BOLD;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
+			$this->_flags|=self::IS_BOLD;
 		else
-			$this->_flags &= ~self::IS_BOLD;
+			$this->_flags&=~self::IS_BOLD;
 	}
 
 	/**
@@ -106,11 +106,11 @@ 
 	 */
 	public function setItalic($value)
 	{
-		$this->_flags |= self::IS_SET_ITALIC;
+		$this->_flags|=self::IS_SET_ITALIC;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
+			$this->_flags|=self::IS_ITALIC;
 		else
-			$this->_flags &= ~self::IS_ITALIC;
+			$this->_flags&=~self::IS_ITALIC;
 	}
 
 	/**
@@ -126,11 +126,11 @@ 
 	 */
 	public function setOverline($value)
 	{
-		$this->_flags |= self::IS_SET_OVERLINE;
+		$this->_flags|=self::IS_SET_OVERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
+			$this->_flags|=self::IS_OVERLINE;
 		else
-			$this->_flags &= ~self::IS_OVERLINE;
+			$this->_flags&=~self::IS_OVERLINE;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setSize($value)
 	{
-		$this->_flags |= self::IS_SET_SIZE;
+		$this->_flags|=self::IS_SET_SIZE;
 		$this->_size=$value;
 	}
 
@@ -163,11 +163,11 @@ 
 	 */
 	public function setStrikeout($value)
 	{
-		$this->_flags |= self::IS_SET_STRIKEOUT;
+		$this->_flags|=self::IS_SET_STRIKEOUT;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
+			$this->_flags|=self::IS_STRIKEOUT;
 		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+			$this->_flags&=~self::IS_STRIKEOUT;
 	}
 
 	/**
@@ -183,11 +183,11 @@ 
 	 */
 	public function setUnderline($value)
 	{
-		$this->_flags |= self::IS_SET_UNDERLINE;
+		$this->_flags|=self::IS_SET_UNDERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
+			$this->_flags|=self::IS_UNDERLINE;
 		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+			$this->_flags&=~self::IS_UNDERLINE;
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_flags |= self::IS_SET_NAME;
+		$this->_flags|=self::IS_SET_NAME;
 		$this->_name=$value;
 	}
 
@@ -286,9 +286,9 @@ 
 			return '';
 		$str='';
 		if($this->_flags & self::IS_SET_BOLD)
-			$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+			$str.='font-weight:'.(($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
 		if($this->_flags & self::IS_SET_ITALIC)
-			$str.='font-style:'.(($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+			$str.='font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -315,9 +315,9 @@ 
 		if($this->_flags===0)
 			return;
 		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
 		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style',(($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -327,10 +327,10 @@ 
 			$textDec.=' line-through';
 		$textDec=ltrim($textDec);
 		if($textDec!=='')
-			$writer->addStyleAttribute('text-decoration',$textDec);
+			$writer->addStyleAttribute('text-decoration', $textDec);
 		if($this->_size!=='')
-			$writer->addStyleAttribute('font-size',$this->_size);
+			$writer->addStyleAttribute('font-size', $this->_size);
 		if($this->_name!=='')
-			$writer->addStyleAttribute('font-family',$this->_name);
+			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }

framework/Web/UI/WebControls/TStyle.php

Spacing +32 added lines, -32 removed lines

@@ -53,16 +53,16 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_fields";
+		if($this->_fields===array())
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_fields";
 		if($this->_font===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_font";
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_font";
 		if($this->_class===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_class";
-		if ($this->_customStyle===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_displayStyle";
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_class";
+		if($this->_customStyle===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
+		if($this->_displayStyle==='Fixed')
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_displayStyle";
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	public function __clone()
 	{
 		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+			$this->_font=clone($this->_font);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class===null ? '' : $this->_class;
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function hasFont()
 	{
-		return $this->_font !== null;
+		return $this->_font!==null;
 	}
 
 	/**
@@ -209,20 +209,20 @@ 
 	 */
 	public function setDisplayStyle($value)
 	{
-		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
+		$this->_displayStyle=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
 		switch($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
-				$this->_fields['display'] = 'none';
+				$this->_fields['display']='none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; //remove the display property
+				$this->_fields['display']=''; //remove the display property
 				break;
 			case TDisplayStyle::Fixed:
-				$this->_fields['visibility'] = 'visible';
+				$this->_fields['visibility']='visible';
 				break;
 			case TDisplayStyle::Hidden:
-				$this->_fields['visibility'] = 'hidden';
+				$this->_fields['visibility']='hidden';
 				break;
 		}
 	}
@@ -240,7 +240,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle===null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 */
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
 
 	/**
@@ -305,7 +305,7 @@ 
 	 * @param string style field name
 	 * @param string style field value
 	 */
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
 		$this->_fields[$name]=$value;
 	}
@@ -332,7 +332,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
+			$this->_fields=array_merge($this->_fields, $style->_fields);
 			if($style->_class!==null)
 				$this->_class=$style->_class;
 			if($style->_customStyle!==null)
@@ -384,7 +384,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
+			$this->_fields=array_merge($style->_fields, $this->_fields);
 			if($this->_class===null)
 				$this->_class=$style->_class;
 			if($this->_customStyle===null)
@@ -402,18 +402,18 @@ 
 	{
 		if($this->_customStyle!==null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach(explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
+				$arr=explode(':', $style, 2);
 				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
 		if($this->_font!==null)
 			$this->_font->addAttributesToRender($writer);
 		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+			$writer->addAttribute('class', $this->_class);
 	}
 
 	/**

framework/Web/UI/WebControls/TPanelStyle.php

Spacing +27 added lines, -27 removed lines

@@ -52,16 +52,16 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_backImageUrl===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_backImageUrl";
-		if ($this->_direction===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_direction";
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_horizontalAlign";
-		if ($this->_scrollBars===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_scrollBars";
-		if ($this->_wrap===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_wrap";
+		if($this->_backImageUrl===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TPanelStyle\0_backImageUrl";
+		if($this->_direction===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TPanelStyle\0_direction";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TPanelStyle\0_horizontalAlign";
+		if($this->_scrollBars===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TPanelStyle\0_scrollBars";
+		if($this->_wrap===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TPanelStyle\0_wrap";
 	}
 
 	/**
@@ -72,28 +72,28 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(($url=trim($this->getBackImageUrl()))!=='')
-			$this->setStyleField('background-image','url('.$url.')');
+			$this->setStyleField('background-image', 'url('.$url.')');
 
 		switch($this->getScrollBars())
 		{
-			case TScrollBars::Horizontal: $this->setStyleField('overflow-x','scroll'); break;
-			case TScrollBars::Vertical: $this->setStyleField('overflow-y','scroll'); break;
-			case TScrollBars::Both: $this->setStyleField('overflow','scroll'); break;
-			case TScrollBars::Auto: $this->setStyleField('overflow','auto'); break;
+			case TScrollBars::Horizontal: $this->setStyleField('overflow-x', 'scroll'); break;
+			case TScrollBars::Vertical: $this->setStyleField('overflow-y', 'scroll'); break;
+			case TScrollBars::Both: $this->setStyleField('overflow', 'scroll'); break;
+			case TScrollBars::Auto: $this->setStyleField('overflow', 'auto'); break;
 		}
 
 		if(($align=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$this->setStyleField('text-align',strtolower($align));
+			$this->setStyleField('text-align', strtolower($align));
 
 		if(!$this->getWrap())
-			$this->setStyleField('white-space','nowrap');
+			$this->setStyleField('white-space', 'nowrap');
 
 		if(($direction=$this->getDirection())!==TContentDirection::NotSet)
 		{
 			if($direction===TContentDirection::LeftToRight)
-				$this->setStyleField('direction','ltr');
+				$this->setStyleField('direction', 'ltr');
 			else
-				$this->setStyleField('direction','rtl');
+				$this->setStyleField('direction', 'rtl');
 		}
 
 		parent::addAttributesToRender($writer);
@@ -104,7 +104,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl===null?'':$this->_backImageUrl;
+		return $this->_backImageUrl===null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getDirection()
 	{
-		return $this->_direction===null?TContentDirection::NotSet:$this->_direction;
+		return $this->_direction===null ? TContentDirection::NotSet : $this->_direction;
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function setDirection($value)
 	{
-		$this->_direction=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TContentDirection');
+		$this->_direction=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TContentDirection');
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->_wrap===null?true:$this->_wrap;
+		return $this->_wrap===null ? true : $this->_wrap;
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\THorizontalAlign');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getScrollBars()
 	{
-		return $this->_scrollBars===null?TScrollBars::None:$this->_scrollBars;
+		return $this->_scrollBars===null ? TScrollBars::None : $this->_scrollBars;
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 */
 	public function setScrollBars($value)
 	{
-		$this->_scrollBars=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TScrollBars');
+		$this->_scrollBars=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TScrollBars');
 	}
 
 	/**