pradosoft / prado

framework/TComponent.php

Doc Comments +14 added lines, -2 removed lines

@@ -406,7 +406,7 @@ 
 	 * </code>
 	 * to be executed when listen is called.  All attached behaviors are notified through dyListen.
 	 *
-	 * @return numeric the number of global events that were registered to the global event registry
+	 * @return null|integer the number of global events that were registered to the global event registry
 	 */
 	public function listen() {
 		if($this->_listeningenabled)
@@ -440,7 +440,7 @@ 
 	 * </code>
 	 * to be executed when listen is called.  All attached behaviors are notified through dyUnlisten.
 	 *
-	 * @return numeric the number of global events that were unregistered from the global event registry
+	 * @return null|integer the number of global events that were unregistered from the global event registry
 	 */
 	public function unlisten() {
 		if(!$this->_listeningenabled)
@@ -774,6 +774,7 @@ 
 	 * A property is defined if there is a getter or setter method
 	 * defined in the class. Note, property names are case-insensitive.
 	 * @param string the property name
+	 * @param string $name
 	 * @return boolean whether the property is defined
 	 */
 	public function hasProperty($name)
@@ -2100,6 +2101,9 @@ 
 		$this->reflect();
 	}
 
+	/**
+	 * @param ReflectionMethod $method
+	 */
 	private function isPropertyMethod($method)
 	{
 		$methodName=$method->getName();
@@ -2108,6 +2112,9 @@ 
 				&& isset($methodName[3]);
 	}
 
+	/**
+	 * @param ReflectionMethod $method
+	 */
 	private function isEventMethod($method)
 	{
 		$methodName=$method->getName();
@@ -2254,11 +2261,14 @@ 
 	/**
 	 * Attaches the behavior object to the component.
 	 * @param CComponent the component that this behavior is to be attached to.
+	 * @param TComponent $component
+	 * @return void
 	 */
 	public function attach($component);
 	/**
 	 * Detaches the behavior object from the component.
 	 * @param CComponent the component that this behavior is to be detached from.
+	 * @return void
 	 */
 	public function detach($component);
 }
@@ -2283,6 +2293,8 @@ 
 	public function getEnabled();
 	/**
 	 * @param boolean whether this behavior is enabled
+	 * @param boolean $value
+	 * @return void
 	 */
 	public function setEnabled($value);
 }

Spacing +226 added lines, -226 removed lines

@@ -373,7 +373,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;
 	}
 
 
@@ -383,13 +383,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;
 	}
 
@@ -412,14 +412,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,'IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if(is_a($this, 'IDynamicMethods')) {
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
 		$this->_listeningenabled=true;
@@ -446,14 +446,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,'IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if(is_a($this, 'IDynamicMethods')) {
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
 		$this->_listeningenabled=false;
@@ -498,64 +498,64 @@ 
 	 */
 	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;
 		}
 
-		throw new TApplicationException('component_method_undefined',get_class($this),$method);
+		throw new TApplicationException('component_method_undefined', get_class($this), $method);
 	}
 
 
@@ -584,17 +584,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);
@@ -602,7 +602,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);
@@ -619,13 +619,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);
 	}
 
 	/**
@@ -643,31 +643,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++;
 				}
@@ -676,13 +676,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);
 		}
 	}
 
@@ -700,27 +700,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);
 			}
 
@@ -741,15 +741,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);
@@ -757,16 +757,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);
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	public function hasProperty($name)
 	{
-		return $this->canGetProperty($name)||$this->canSetProperty($name);
+		return $this->canGetProperty($name) || $this->canSetProperty($name);
 	}
 
 	/**
@@ -792,13 +792,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;
 			}
 		}
@@ -816,13 +816,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;
 			}
 		}
@@ -842,7 +842,7 @@ 
 	public function getSubProperty($path)
 	{
 		$object=$this;
-		foreach(explode('.',$path) as $property)
+		foreach(explode('.', $path) as $property)
 			$object=$object->$property;
 		return $object;
 	}
@@ -857,15 +857,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;
 	}
@@ -884,14 +884,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;
 			}
 		}
@@ -908,16 +908,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;
 				}
 			}
@@ -933,29 +933,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);
 	}
 
 	/**
@@ -1003,9 +1003,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);
 	}
 
 	/**
@@ -1018,13 +1018,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)
@@ -1106,7 +1106,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))
@@ -1121,90 +1121,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;
 	}
@@ -1237,7 +1237,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());
 		}
 	}
 
@@ -1272,7 +1272,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());
 		}
 	}
 
@@ -1332,9 +1332,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());
 	}
 
 
@@ -1346,9 +1346,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());
 	}
 
 
@@ -1370,8 +1370,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');
@@ -1384,11 +1384,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);
 	}
 
 
@@ -1404,8 +1404,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');
@@ -1413,13 +1413,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);
 	}
 
 	/**
@@ -1431,7 +1431,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1457,15 +1457,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('IInstanceCheck'))&&$check=$behavior->isinstanceof($class,$this))
+				$check=null;
+				if(($behavior->isa('IInstanceCheck')) && $check=$behavior->isinstanceof($class, $this))
 					return true;
-				if($check===null&&($behavior->isa($class)))
+				if($check===null && ($behavior->isa($class)))
 					return true;
 			}
 		return false;
@@ -1483,9 +1483,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);
 	}
 
 	/**
@@ -1502,9 +1502,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);
 		}
 	}
 
@@ -1542,19 +1542,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;
 	}
 
@@ -1575,14 +1575,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;
 		}
 	}
@@ -1658,10 +1658,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;
@@ -1686,10 +1686,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;
@@ -1704,9 +1704,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);
 	}
@@ -1720,13 +1720,13 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		if($this->_listeningenabled===false)
-			$exprops[] = "\0TComponent\0_listeningenabled";
+			$exprops[]="\0TComponent\0_listeningenabled";
 		if($this->_behaviorsenabled===true)
-			$exprops[] = "\0TComponent\0_behaviorsenabled";
-		if ($this->_e===array())
-			$exprops[] = "\0TComponent\0_e";
-		if ($this->_m===null)
-			$exprops[] = "\0TComponent\0_m";
+			$exprops[]="\0TComponent\0_behaviorsenabled";
+		if($this->_e===array())
+			$exprops[]="\0TComponent\0_e";
+		if($this->_m===null)
+			$exprops[]="\0TComponent\0_m";
 	}
 }
 
@@ -1742,7 +1742,7 @@ 
  */
 interface IDynamicMethods
 {
-	public function __dycall($method,$args);
+	public function __dycall($method, $args);
 }
 
 
@@ -1769,7 +1769,7 @@ 
 	 *	@param string $name the name of the behavior
 	 *	@param object $behavior this is the behavior to implement the class behavior
 	 */
-	public function __construct($class,$name,$behavior,$priority)
+	public function __construct($class, $name, $behavior, $priority)
 	{
 		$this->_class=$class;
 		$this->_name=$name;
@@ -1910,10 +1910,10 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value,'true')==0 || $value!=0;
+		if(is_string($value))
+			return strcasecmp($value, 'true')==0 || $value!=0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -1925,12 +1925,12 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
+		if(TJavaScript::isJsLiteral($value))
 			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
+		if(is_bool($value))
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -1940,7 +1940,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -1950,7 +1950,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -1966,18 +1966,18 @@ 
 	{
 		if(is_string($value))
 		{
-			$value = trim($value);
-			$len = strlen($value);
-			if ($len >= 2 && $value[0] == '(' && $value[$len-1] == ')')
+			$value=trim($value);
+			$len=strlen($value);
+			if($len >= 2 && $value[0]=='(' && $value[$len - 1]==')')
 			{
 				eval('$array=array'.$value.';');
 				return $array;
 			}
 			else
-				return $len>0?array($value):array();
+				return $len > 0 ? array($value) : array();
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -1987,7 +1987,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -2006,7 +2006,7 @@ 
 	 * @return string the valid enumeration value
 	 * @throws TInvalidDataValueException if the original value is not in the string array.
 	 */
-	public static function ensureEnum($value,$enums)
+	public static function ensureEnum($value, $enums)
 	{
 		static $types=array();
 		if(func_num_args()===2 && is_string($enums))
@@ -2017,18 +2017,18 @@ 
 				return $value;
 			else
 				throw new TInvalidDataValueException(
-					'propertyvalue_enumvalue_invalid',$value,
-						implode(' | ',$types[$enums]->getConstants()));
+					'propertyvalue_enumvalue_invalid', $value,
+						implode(' | ', $types[$enums]->getConstants()));
 		}
 		else if(!is_array($enums))
 		{
 			$enums=func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value,$enums,true))
+		if(in_array($value, $enums, true))
 			return $value;
 		else
-			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid',$value,implode(' | ',$enums));
+			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
 	}
 
 	/**
@@ -2038,7 +2038,7 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ? null : $value;
 	}
 }
 
@@ -2091,7 +2091,7 @@ 
 	 */
 	public function __construct($component)
 	{
-		if(is_string($component) && class_exists($component,false))
+		if(is_string($component) && class_exists($component, false))
 			$this->_className=$component;
 		else if(is_object($component))
 			$this->_className=get_class($component);
@@ -2104,14 +2104,14 @@ 
 	{
 		$methodName=$method->getName();
 		return $method->getNumberOfRequiredParameters()===0
-				&& strncasecmp($methodName,'get',3)===0
+				&& strncasecmp($methodName, 'get', 3)===0
 				&& isset($methodName[3]);
 	}
 
 	private function isEventMethod($method)
 	{
 		$methodName=$method->getName();
-		return strncasecmp($methodName,'on',2)===0
+		return strncasecmp($methodName, 'on', 2)===0
 				&& isset($methodName[2]);
 	}
 
@@ -2121,7 +2121,7 @@ 
 		$properties=array();
 		$events=array();
 		$methods=array();
-		$isComponent=is_subclass_of($this->_className,'TComponent') || strcasecmp($this->_className,'TComponent')===0;
+		$isComponent=is_subclass_of($this->_className, 'TComponent') || strcasecmp($this->_className, 'TComponent')===0;
 		foreach($class->getMethods() as $method)
 		{
 			if($method->isPublic() || $method->isProtected())
@@ -2130,14 +2130,14 @@ 
 				if(!$method->isStatic() && $isComponent)
 				{
 					if($this->isPropertyMethod($method))
-						$properties[substr($methodName,3)]=$method;
+						$properties[substr($methodName, 3)]=$method;
 					else if($this->isEventMethod($method))
 					{
 						$methodName[0]='O';
 						$events[$methodName]=$method;
 					}
 				}
-				if(strncmp($methodName,'__',2)!==0)
+				if(strncmp($methodName, '__', 2)!==0)
 					$methods[$methodName]=$method;
 			}
 		}
@@ -2187,7 +2187,7 @@ 
 	protected function determinePropertyType($method)
 	{
 		$comment=$method->getDocComment();
-		if(preg_match('/@return\\s+(.*?)\\s+/',$comment,$matches))
+		if(preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
 			return $matches[1];
 		else
 			return '{unknown}';
@@ -2345,7 +2345,7 @@ 
 	 * @return boolean|null if the this or the instance is of type class.  When null, no information could be derived and
 	 * the default mechanisms take over.
 	 */
-	public function isinstanceof($class,$instance=null);
+	public function isinstanceof($class, $instance=null);
 }
 
 /**
@@ -2375,12 +2375,12 @@ 
 
 	public function __construct($s)
 	{
-		$this->_s = $s;
+		$this->_s=$s;
 	}
 
 	public function __toString()
 	{
-		return (string)$this->_s;
+		return (string) $this->_s;
 	}
 
 	public function toJavaScriptLiteral()
@@ -2400,7 +2400,7 @@ 
 {
 	public function toJavaScriptLiteral()
 	{
-		return TJavaScript::jsonEncode((string)$this->_s,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return TJavaScript::jsonEncode((string) $this->_s, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 }
 

Braces +26 added lines, -52 removed lines

@@ -533,8 +533,7 @@ 
 				}
 				if($callchain->getCount()>0)
 					return call_user_func_array(array($callchain,'call'),$args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -588,29 +587,25 @@ 
 		{
 			// 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();
-		}
-		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);
 			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)
 		{
 			// getting a global event (handler list)
 			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
-		}
-		else if($this->_behaviorsenabled)
+		} else if($this->_behaviorsenabled)
 		{
 			// getting a behavior property/event (handler list)
 			if(isset($this->_m[$name]))
@@ -650,18 +645,15 @@ 
 			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))
 				$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);
-		}
-		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)
@@ -679,8 +671,7 @@ 
 		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
 		{
 			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
-		}
-		else
+		} else
 		{
 			throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
 		}
@@ -708,13 +699,11 @@ 
 		{
 			$name=strtolower($name);
 			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();
-		}
-		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;
@@ -724,8 +713,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -939,15 +927,13 @@ 
 			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)
 			{
@@ -1026,8 +1012,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler,$priority);
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 			}
 		}
@@ -1150,14 +1135,11 @@ 
 								$response=$object->__dycall($name,array($sender,$param,$name));
 							else
 								$response=$object->$method($sender,$param,$name);
-						}
-						else
+						} else
 							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
-					}
-					else
+					} else
 						$response=call_user_func($handler,$sender,$param,$name);
-				}
-				else if(is_callable($handler,true))
+				} else if(is_callable($handler,true))
 				{
 					list($object,$method)=$handler;
 					if(is_string($object))
@@ -1175,12 +1157,10 @@ 
 								$response=$object->__dycall($name,array($sender,$param,$name));
 							else
 								$response=$object->$method($sender,$param,$name);
-						}
-						else
+						} else
 							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
 					}
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
 
 				$this->dyIntraRaiseEventPostHandler($name,$sender,$param,$handler,$response);
@@ -1197,8 +1177,7 @@ 
 					$param=$response;
 
 			}
-		}
-		else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($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)
@@ -1234,8 +1213,7 @@ 
 			if(eval("\$result=$expression;")===false)
 				throw new Exception('');
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());
 		}
@@ -1269,8 +1247,7 @@ 
 			$content=ob_get_contents();
 			ob_end_clean();
 			return $content;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());
 		}
@@ -1972,11 +1949,9 @@ 
 			{
 				eval('$array=array'.$value.';');
 				return $array;
-			}
-			else
+			} else
 				return $len>0?array($value):array();
-		}
-		else
+		} else
 			return (array)$value;
 	}
 
@@ -2019,8 +1994,7 @@ 
 				throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid',$value,
 						implode(' | ',$types[$enums]->getConstants()));
-		}
-		else if(!is_array($enums))
+		} else if(!is_array($enums))
 		{
 			$enums=func_get_args();
 			array_shift($enums);

framework/Util/TDateTimeStamp.php

Doc Comments +1 added lines, -1 removed lines

@@ -185,7 +185,7 @@
 	}
 
 	/**
-	 * @return integer|float a timestamp given a local time
+	 * @return integer a timestamp given a local time
      */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{

Spacing +34 added lines, -34 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal=array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf=array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -36,7 +36,7 @@ 
 	 */
 	public function getDayofWeek($year, $month, $day)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setDate($year, $month, $day);
 		return (int) $dt->format('w');
 	}
@@ -49,8 +49,8 @@ 
 	 */
 	public function isLeapYear($year)
 	{
-		$year = $this->digitCheck($year);
-		$dt = new DateTime();
+		$year=$this->digitCheck($year);
+		$dt=new DateTime();
 		$dt->setDate($year, 1, 1);
 		return (bool) $dt->format('L');
 	}
@@ -62,22 +62,22 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
-			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+		if($y < 100) {
+			$yr=(integer) date("Y");
+			$century=(integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
-				$c1 = $century + 1;
-				$c0 = $century;
+			if($yr % 100 > 50) {
+				$c1=$century + 1;
+				$c0=$century;
 			} else {
-				$c1 = $century;
-				$c0 = $century - 1;
+				$c1=$century;
+				$c0=$century - 1;
 			}
-			$c1 *= 100;
+			$c1*=100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if(($y + $c1) < $yr + 30) $y=$y + $c1;
+			else $y=$y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -92,7 +92,7 @@ 
 	 */
 	public function getGMTDiff($ts=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($ts)
 			$dt->setTimeStamp($ts);
 		else
@@ -106,9 +106,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if($txt===false) return getdate();
 
-		$dt = new DateTime($txt);
+		$dt=new DateTime($txt);
 
 		return array(
 			'seconds' => (int) $dt->format('s'),
@@ -128,11 +128,11 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d=false, $fast=false)
 	{
-		if ($d === false) return getdate();
+		if($d===false) return getdate();
 
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setTimestamp($d);
 
 		return array(
@@ -153,20 +153,20 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+		if($this->isLeapYear($y))
+			$marr=& self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr=& self::$_month_normal;
 
-		if ($m > 12 || $m < 1) return false;
+		if($m > 12 || $m < 1) return false;
 
-		if ($d > 31 || $d < 1) return false;
+		if($d > 31 || $d < 1) return false;
 
-		if ($marr[$m] < $d) return false;
+		if($marr[$m] < $d) return false;
 
-		if ($y < 1000 && $y > 3000) return false;
+		if($y < 1000 && $y > 3000) return false;
 
 		return true;
 	}
@@ -174,9 +174,9 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
@@ -187,9 +187,9 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon=false, $day=false, $year=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setDate($year!==false ? $year : date('Y'),

Indentation +8 added lines, -9 removed lines

@@ -1,13 +1,12 @@ 
 <?php
 /**
- * TDateTimeStamp class file.
-
- * @author Fabio Bas ctrlaltca[AT]gmail[DOT]com
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Util
- */
+	 * TDateTimeStamp class file.
+	 * @author Fabio Bas ctrlaltca[AT]gmail[DOT]com
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Util
+	 */
 
 /**
  * TDateTimeStamp Class
@@ -186,7 +185,7 @@ 
 
 	/**
 	 * @return integer|float a timestamp given a local time
-     */
+	 */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();

framework/Util/TSimpleDateFormatter.php

Doc Comments +9 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param string formatting charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -313,6 +314,7 @@ 
 
 	/**
 	 * Calculate the length of a string, may be consider iconv_strlen?
+	 * @param string $string
 	 */
 	private function length($string)
 	{
@@ -338,6 +340,9 @@ 
 
 	/**
 	 * Returns true if char at position equals a particular char.
+	 * @param string $string
+	 * @param integer $pos
+	 * @param string $char
 	 */
 	private function charEqual($string, $pos, $char)
 	{
@@ -350,6 +355,10 @@ 
 	 * @param int starting position
 	 * @param int minimum integer length
 	 * @param int maximum integer length
+	 * @param string $str
+	 * @param integer $i
+	 * @param integer|null $minlength
+	 * @param integer|null $maxlength
 	 * @return string integer portion of the string, null otherwise
 	 */
 	private function getInteger($str,$i,$minlength,$maxlength)

Braces +4 added lines, -8 removed lines

@@ -225,8 +225,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -262,8 +261,7 @@ 
 						$year = $iYear + 2000;
 				}
 				$year = (int)$year;
-			}
-			elseif($token=='MM' || $token=='M')
+			} elseif($token=='MM' || $token=='M')
 			{
 				$month=$this->getInteger($value,$i_val,
 									$this->length($token),2);
@@ -273,8 +271,7 @@ 
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
-			}
-			elseif ($token=='dd' || $token=='d')
+			} elseif ($token=='dd' || $token=='d')
 			{
 				$day = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
@@ -284,8 +281,7 @@ 
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
 				$day = $iDay;
-			}
-			else
+			} else
 			{
 				if($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;

Spacing +76 added lines, -76 removed lines

@@ -54,7 +54,7 @@ 
 	 * Charset, default is 'UTF-8'
 	 * @var string
 	 */
-	private $charset = 'UTF-8';
+	private $charset='UTF-8';
 
 	/**
 	 * Constructor, create a new date time formatter.
@@ -80,7 +80,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->pattern = $pattern;
+		$this->pattern=$pattern;
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -106,17 +106,17 @@ 
 	 */
 	public function format($value)
 	{
-		$date = $this->getDate($value);
-		$bits['yyyy'] = $date['year'];
-		$bits['yy'] = substr("{$date['year']}", -2);
+		$date=$this->getDate($value);
+		$bits['yyyy']=$date['year'];
+		$bits['yy']=substr("{$date['year']}", -2);
 
-		$bits['MM'] = str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
-		$bits['M'] = $date['mon'];
+		$bits['MM']=str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
+		$bits['M']=$date['mon'];
 
-		$bits['dd'] = str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
-		$bits['d'] = $date['mday'];
+		$bits['dd']=str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
+		$bits['d']=$date['mday'];
 
-		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		$pattern=preg_replace('/M{3,4}/', 'MM', $this->pattern);
 		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
@@ -153,13 +153,13 @@ 
 
 	public function getDayMonthYearOrdering()
 	{
-		$ordering = array();
-		if(is_int($day= strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month= strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year= strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		$ordering=array();
+		if(is_int($day=strpos($this->pattern, 'd')))
+			$ordering['day']=$day;
+		if(is_int($month=strpos($this->pattern, 'M')))
+			$ordering['month']=$month;
+		if(is_int($year=strpos($this->pattern, 'yy')))
+			$ordering['year']=$year;
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -171,7 +171,7 @@ 
 	 */
 	private function getDate($value)
 	{
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 		if(is_numeric($value))
 			return $s->getDate($value);
 		else
@@ -183,10 +183,10 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if($value===null) {
 			return false;
 		} else {
-			return $this->parse($value, false) !== null;
+			return $this->parse($value, false)!==null;
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 	 * @return int date time stamp
 	 * @throws TInvalidDataValueException if date string is malformed.
 	 */
-	public function parse($value,$defaultToCurrentTime=true)
+	public function parse($value, $defaultToCurrentTime=true)
 	{
 		if(is_int($value) || is_float($value))
 			return $value;
@@ -205,108 +205,108 @@ 
 
 		if(empty($this->pattern)) return time();
 
-		$date = time();
+		$date=time();
 
 		if($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
-		$pattern = $this->pattern;
+		$pattern=$this->pattern;
 
-		$i_val = 0;
-		$i_format = 0;
-		$pattern_length = $this->length($pattern);
-		$c = '';
+		$i_val=0;
+		$i_format=0;
+		$pattern_length=$this->length($pattern);
+		$c='';
 		$token='';
 		$x=null; $y=null;
 
 
 		if($defaultToCurrentTime)
 		{
-			$year = "{$date['year']}";
-			$month = $date['mon'];
-			$day = $date['mday'];
+			$year="{$date['year']}";
+			$month=$date['mon'];
+			$day=$date['mday'];
 		}
 		else
 		{
-			$year = null;
-			$month = null;
-			$day = null;
+			$year=null;
+			$month=null;
+			$day=null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
-			$c = $this->charAt($pattern,$i_format);
+			$c=$this->charAt($pattern, $i_format);
 			$token='';
-			while ($this->charEqual($pattern, $i_format, $c)
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
-				$token .= $this->charAt($pattern, $i_format++);
+				$token.=$this->charAt($pattern, $i_format++);
 			}
 
-			if ($token=='yyyy' || $token=='yy' || $token=='y')
+			if($token=='yyyy' || $token=='yy' || $token=='y')
 			{
-				if ($token=='yyyy') { $x=4;$y=4; }
-				if ($token=='yy')   { $x=2;$y=2; }
-				if ($token=='y')    { $x=2;$y=4; }
-				$year = $this->getInteger($value,$i_val,$x,$y);
-				if($year === null)
+				if($token=='yyyy') { $x=4; $y=4; }
+				if($token=='yy') { $x=2; $y=2; }
+				if($token=='y') { $x=2; $y=4; }
+				$year=$this->getInteger($value, $i_val, $x, $y);
+				if($year===null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
-				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				$i_val+=strlen($year);
+				if(strlen($year)==2)
 				{
-					$iYear = (int)$year;
+					$iYear=(int) $year;
 					if($iYear > 70)
-						$year = $iYear + 1900;
+						$year=$iYear + 1900;
 					else
-						$year = $iYear + 2000;
+						$year=$iYear + 2000;
 				}
-				$year = (int)$year;
+				$year=(int) $year;
 			}
 			elseif($token=='MM' || $token=='M')
 			{
-				$month=$this->getInteger($value,$i_val,
-									$this->length($token),2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12 )
+				$month=$this->getInteger($value, $i_val,
+									$this->length($token), 2);
+				$iMonth=(int) $month;
+				if($month===null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
-				$i_val += strlen($month);
-				$month = $iMonth;
+				$i_val+=strlen($month);
+				$month=$iMonth;
 			}
-			elseif ($token=='dd' || $token=='d')
+			elseif($token=='dd' || $token=='d')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay >31)
+				$iDay=(int) $day;
+				if($day===null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
-				$i_val += strlen($day);
-				$day = $iDay;
+				$i_val+=strlen($day);
+				$day=$iDay;
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if($this->substring($value, $i_val, $this->length($token))!=$token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
-					$i_val += $this->length($token);
+					$i_val+=$this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val!=$this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if(!$defaultToCurrentTime && ($month===null || $day===null || $year===null))
 			return null;
 		else
 		{
 			if(empty($year)) {
-				$year = date('Y');
+				$year=date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
+			$day=(int) $day <= 0 ? 1 : (int) $day;
+			$month=(int) $month <= 0 ? 1 : (int) $month;
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
 			return $s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		}
 	}
@@ -341,7 +341,7 @@ 
 	 */
 	private function charEqual($string, $pos, $char)
 	{
-		return $this->charAt($string, $pos) == $char;
+		return $this->charAt($string, $pos)==$char;
 	}
 
 	/**
@@ -352,15 +352,15 @@ 
 	 * @param int maximum integer length
 	 * @return string integer portion of the string, null otherwise
 	 */
-	private function getInteger($str,$i,$minlength,$maxlength)
+	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x=$maxlength; $x >= $minlength; $x--)
 		{
-			$token= $this->substring($str, $i,$x);
-			if ($this->length($token) < $minlength)
+			$token=$this->substring($str, $i, $x);
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;

framework/Web/TAssetManager.php

Doc Comments +9 added lines

@@ -215,6 +215,7 @@ 
 	 * This method does not perform any publishing. It merely tells you
 	 * if the file path is published, what the URL will be to access it.
 	 * @param string directory or file path being published
+	 * @param string $path
 	 * @return string the published URL for the file path
 	 */
 	public function getPublishedUrl($path)
@@ -230,6 +231,7 @@ 
 	 * Generate a CRC32 hash for the directory path. Collisions are higher
 	 * than MD5 but generates a much smaller hash string.
 	 * @param string string to be hashed.
+	 * @param string $dir
 	 * @return string hashed string.
 	 */
 	protected function hash($dir)
@@ -243,6 +245,8 @@ 
 	 * or has an older file modification time.
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
+	 * @param string $src
+	 * @param string $dst
 	 */
 	protected function copyFile($src,$dst)
 	{
@@ -265,6 +269,8 @@ 
 	 * File modification time is used to ensure the copied files are latest.
 	 * @param string the source directory
 	 * @param string the destination directory
+	 * @param string $src
+	 * @param string $dst
 	 * @todo a generic solution to ignore certain directories and files
 	 */
 	public function copyDirectory($src,$dst)
@@ -306,6 +312,8 @@ 
 	 * @param string tar filename
 	 * @param string MD5 checksum for the corresponding tar file.
 	 * @param boolean Wether or not to check the time stamp of the file for publishing. Defaults to false.
+	 * @param string $tarfile
+	 * @param string $md5sum
 	 * @return string URL path to the directory where the tar file was extracted.
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
@@ -336,6 +344,7 @@ 
 	 * N.B Tar file must not be compressed.
 	 * @param string tar file
 	 * @param string path where the contents of tar file are to be extracted
+	 * @param string $destination
 	 * @return boolean true if extract successful, false otherwise.
 	 */
 	protected function deployTarFile($path,$destination)

Braces +2 added lines, -4 removed lines

@@ -163,8 +163,7 @@ 
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath,$dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -287,8 +286,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);

Spacing +26 added lines, -26 removed lines

@@ -82,9 +82,9 @@ 
 		if($this->_basePath===null)
 			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
 		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -111,7 +111,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 
@@ -132,7 +132,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -149,19 +149,19 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
 		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
 		else if(is_file($fullpath))
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
+				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
@@ -169,8 +169,8 @@ 
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				Prado::trace("Publishing directory $fullpath",'System.Web.UI.TAssetManager');
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				Prado::trace("Publishing directory $fullpath", 'System.Web.UI.TAssetManager');
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
@@ -191,7 +191,7 @@ 
 	 */
 	protected function setPublished($values=array())
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
 	 */
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -252,10 +252,10 @@ 
 			@chmod($dst, PRADO_CHMOD);
 		}
 		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		if(@filemtime($dstFile) < @filemtime($src))
 		{
-			Prado::trace("Publishing file $src to $dstFile",'System.Web.TAssetManager');
-			@copy($src,$dstFile);
+			Prado::trace("Publishing file $src to $dstFile", 'System.Web.TAssetManager');
+			@copy($src, $dstFile);
 		}
 	}
 
@@ -267,7 +267,7 @@ 
 	 * @param string the destination directory
 	 * @todo a generic solution to ignore certain directories and files
 	 */
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -282,14 +282,14 @@ 
 					continue;
 				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -313,7 +313,7 @@ 
 		if(isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
 		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir=$this->hash(dirname($fullpath));
@@ -321,10 +321,10 @@ 
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
@@ -338,14 +338,14 @@ 
 	 * @param string path where the contents of tar file are to be extracted
 	 * @return boolean true if extract successful, false otherwise.
 	 */
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}

framework/Web/THttpRequest.php

Doc Comments +6 added lines, -1 removed lines

@@ -258,6 +258,7 @@ 
 
 	/**
 	 * Saves the current UrlManager instance to cache.
+	 * @param TUrlManager $manager
 	 * @return boolean true if UrlManager instance was cached, false otherwise.
 	 */
 	protected function cacheUrlManager($manager)
@@ -349,7 +350,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{
@@ -710,6 +711,7 @@ 
 	 * @param array GET parameters, null if not needed
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to false.
+	 * @param string $serviceID
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
@@ -980,6 +982,7 @@ 
 	/**
 	 * Constructor.
 	 * @param mixed owner of this collection.
+	 * @param THttpResponse $owner
 	 */
 	public function __construct($owner=null)
 	{
@@ -1125,6 +1128,7 @@ 
 
 	/**
 	 * @param integer the time the cookie expires. This is a Unix timestamp so is in number of seconds since the epoch.
+	 * @param integer $value
 	 */
 	public function setExpire($value)
 	{
@@ -1287,6 +1291,7 @@ 
 	 * Constructor.
 	 * Decomposes the specified URI into parts.
 	 * @param string URI to be represented
+	 * @param string $uri
 	 * @throws TInvalidDataValueException if URI is of bad format
 	 */
 	public function __construct($uri)

Spacing +79 added lines, -79 removed lines

@@ -66,10 +66,10 @@ 
  * @package System.Web
  * @since 3.0
  */
-class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpRequest extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
+	const CGIFIX__PATH_INFO=1;
+	const CGIFIX__SCRIPT_NAME=2;
 	/**
 	 * @var TUrlManager the URL manager module
 	 */
@@ -172,14 +172,14 @@ 
 		if(isset($_SERVER['REQUEST_URI']))
 			$this->_requestUri=$_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
+			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']);
 
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
 			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
 		elseif(isset($_SERVER['PATH_INFO']))
 			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+		else if(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo=substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
 			$this->_pathInfo='';
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 		if($this->_url===null)
 		{
 			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
+			$url=$secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
 				$url.=$_SERVER['SERVER_NAME'];
@@ -240,7 +240,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -264,15 +264,15 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					if($manager instanceof TUrlMapping && $fn=$manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
-						$dependencies = new TFileCacheDependency($fn);
+						$fn=Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
+						$dependencies=new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -288,10 +288,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TUrlManager)
 					return $manager;
 			}
@@ -327,7 +327,7 @@ 
 	{
 		if($this->_urlManager===null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if(($this->_urlManager=$this->loadCachedUrlManager())===null)
 			{
 				if(empty($this->_urlManagerID))
 				{
@@ -338,9 +338,9 @@ 
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
 					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -366,7 +366,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -394,19 +394,19 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
 	 * @param boolean $mimetypeOnly whether to return only the mimetype (default: true)
 	 * @return string content type (e.g. 'application/json' or 'text/html; encoding=gzip') or null if not specified
 	 */
-	public function getContentType($mimetypeOnly = true)
+	public function getContentType($mimetypeOnly=true)
 	{
 		if(!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if($mimetypeOnly===true && ($_pos=strpos(';', $_SERVER['CONTENT_TYPE']))!==false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -417,7 +417,7 @@ 
 	 */
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
@@ -452,19 +452,19 @@ 
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
-			$result = apache_request_headers();
+		if($result===null && function_exists('apache_request_headers')) {
+			$result=apache_request_headers();
 		}
-		elseif($result === null) {
-			$result = array();
+		elseif($result===null) {
+			$result=array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
-					$result[$key] = $value;
+				if(strncasecmp($key, 'HTTP_', 5)!==0) continue;
+					$key=str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
+					$result[$key]=$value;
 			}
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -488,9 +488,9 @@ 
 	public function getBaseUrl($forceSecureConnection=null)
 	{
 		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
+		$scheme=($forceSecureConnection) ? "https" : (($forceSecureConnection===null) ? $url->getScheme() : 'http');
 		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
+		if(($port=$url->getPort())) $host.=':'.$port;
 		return $scheme.'://'.$host;
 	}
 
@@ -499,10 +499,10 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -514,7 +514,7 @@ 
 	 */
 	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
 	{
-		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
+		return $this->getBaseUrl($forceSecureConnection).$this->getApplicationUrl();
 	}
 
 	/**
@@ -522,7 +522,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -570,7 +570,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -578,7 +578,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -660,13 +660,13 @@ 
 				foreach($_COOKIE as $key=>$value)
 				{
 					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
 				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -713,13 +713,13 @@ 
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if($this->_cookieOnly===null)
+				$this->_cookieOnly=(int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url=$this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if(defined('SID') && SID!='' && !$this->_cookieOnly)
+			return $url.(strpos($url, '?')===false ? '?' : ($encodeAmpersand ? '&' : '&')).SID;
 		else
 			return $url;
 	}
@@ -747,11 +747,11 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'System.Web.THttpRequest');
+		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'], 'System.Web.THttpRequest');
 		$getParams=$this->parseUrl();
 		foreach($getParams as $name=>$value)
 			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
+		$this->_items=array_merge($_GET, $_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
 		{
@@ -862,7 +862,7 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$this->_items[$key]=$value;
 	}
@@ -875,7 +875,7 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if(isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
@@ -900,7 +900,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 
 	/**
@@ -939,9 +939,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);
 	}
 
 	/**
@@ -994,11 +994,11 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof THttpCookie)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}
@@ -1093,7 +1093,7 @@ 
 	 * @param string name of this cookie
 	 * @param string value of this cookie
 	 */
-	public function __construct($name,$value)
+	public function __construct($name, $value)
 	{
 		$this->_name=$name;
 		$this->_value=$value;
@@ -1144,7 +1144,7 @@ 
 	 */
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1294,19 +1294,19 @@ 
 		if(($ret=@parse_url($uri))!==false)
 		{
 			// decoding???
-			$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host=isset($ret['host'])?$ret['host']:'';
-			$this->_port=isset($ret['port'])?$ret['port']:'';
-			$this->_user=isset($ret['user'])?$ret['user']:'';
-			$this->_pass=isset($ret['pass'])?$ret['pass']:'';
-			$this->_path=isset($ret['path'])?$ret['path']:'';
-			$this->_query=isset($ret['query'])?$ret['query']:'';
-			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
+			$this->_scheme=isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host=isset($ret['host']) ? $ret['host'] : '';
+			$this->_port=isset($ret['port']) ? $ret['port'] : '';
+			$this->_user=isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass=isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path=isset($ret['path']) ? $ret['path'] : '';
+			$this->_query=isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment=isset($ret['fragment']) ? $ret['fragment'] : '';
 			$this->_uri=$uri;
 		}
 		else
 		{
-			throw new TInvalidDataValueException('uri_format_invalid',$uri);
+			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}
 	}
 

Braces +8 added lines, -16 removed lines

@@ -224,8 +224,7 @@ 
 				$port=$_SERVER['SERVER_PORT'];
 				if(($port!=80 && !$secure) || ($port!=443 && $secure))
 					$url.=':'.$port;
-			}
-			else
+			} else
 				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
@@ -333,8 +332,7 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
@@ -454,8 +452,7 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -558,8 +555,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -662,8 +658,7 @@ 
 					if(($value=$sm->validateData($value))!==false)
 						$this->_cookies->add(new THttpCookie($key,$value));
 				}
-			}
-			else
+			} else
 			{
 				foreach($_COOKIE as $key=>$value)
 					$this->_cookies->add(new THttpCookie($key,$value));
@@ -880,8 +875,7 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1001,8 +995,7 @@ 
 			parent::insertAt($index,$item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 
@@ -1303,8 +1296,7 @@ 
 			$this->_query=isset($ret['query'])?$ret['query']:'';
 			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri=$uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid',$uri);
 		}

framework/Web/THttpResponse.php

Doc Comments +5 added lines, -1 removed lines

@@ -223,7 +223,7 @@ 
 	}
 
 	/**
-	 * @return string|boolean output charset.
+	 * @return string output charset.
 	 */
 	public function getCharset()
 	{
@@ -232,6 +232,7 @@ 
 
 	/**
 	 * @param string|boolean output charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -604,6 +605,7 @@ 
 	 * Sends a header.
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
+	 * @param string $value
 	 */
 	public function appendHeader($value, $replace=true)
 	{
@@ -629,6 +631,7 @@ 
 	 * Sends a cookie.
 	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
 	 * @param THttpCookie cook to be sent
+	 * @param THttpCookie $cookie
 	 */
 	public function addCookie($cookie)
 	{
@@ -713,6 +716,7 @@ 
 	 * This method is used internally. Please use {@link createHtmlWriter} instead.
 	 * @param string type of HTML writer to be created.
 	 * @param ITextWriter text writer holding the contents.
+	 * @param THttpResponse $writer
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{

Spacing +49 added lines, -49 removed lines

@@ -64,13 +64,13 @@ 
  */
 class THttpResponse extends TModule implements ITextWriter
 {
-	const DEFAULT_CONTENTTYPE	= 'text/html';
-	const DEFAULT_CHARSET		= 'UTF-8';
+	const DEFAULT_CONTENTTYPE='text/html';
+	const DEFAULT_CHARSET='UTF-8';
 
 	/**
 	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
 	 */
-	private static $HTTP_STATUS_CODES = array(
+	private static $HTTP_STATUS_CODES=array(
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -201,7 +201,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
 	}
 
 	/**
@@ -209,9 +209,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -276,12 +276,12 @@ 
 	 */
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new Exception('Unable to alter response as HTTP header already sent');
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else {
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -319,7 +319,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -336,7 +336,7 @@ 
 	 * @param integer size of file or content in bytes if already known. Defaults to 'null' means auto-detect.
 	 * @throws TInvalidDataValueException if the file cannot be found
 	 */
-	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$forceDownload=true,$clientFileName=null,$fileSize=null)
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
 	{
 		static $defaultMimeTypes=array(
 			'css'=>'text/css',
@@ -356,9 +356,9 @@ 
 			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
 				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			else if(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext=substr($ext,1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
 					$mimeType=$defaultMimeTypes[$ext];
 			}
@@ -370,7 +370,7 @@ 
 			$clientFileName=basename($clientFileName);
 
 		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+			$fileSize=($content===null ? filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -384,11 +384,11 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 
 		header('Content-Length: '.$fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
 		if($content===null)
 			readfile($fileName);
@@ -428,11 +428,11 @@ 
 
 		if($url[0]==='/')
 			$url=$this->getRequest()->getBaseUrl().$url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		if($this->_status >= 300 && $this->_status < 400)
 			// The status code has been modified to a valid redirection status, send it
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		else
-			header('Location: '.str_replace('&amp;','&',$url));
+			header('Location: '.str_replace('&amp;', '&', $url));
 
 		if(!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
@@ -453,7 +453,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -475,18 +475,18 @@ 
 	 * This method is used internally. Please use {@link flush} instead.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
-		Prado::trace("Flushing output",'System.Web.THttpResponse');
+		Prado::trace("Flushing output", 'System.Web.THttpResponse');
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length()>0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -503,7 +503,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -513,15 +513,15 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if($this->getRequest()->getHttpProtocolVersion()===null)
 			$protocol='HTTP/1.1';
 
-		$phpSapiName = substr(php_sapi_name(), 0, 3);
-		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
+		$phpSapiName=substr(php_sapi_name(), 0, 3);
+		$cgi=$phpSapiName=='cgi' || $phpSapiName=='fpm';
 
 		header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -529,7 +529,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -538,9 +538,9 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType=$this->_contentType===null ? self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset=$this->getCharset();
-		if($charset === false) {
+		if($charset===false) {
 			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
@@ -548,10 +548,10 @@ 
 		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
 			$charset=$globalization->getCharset();
 
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -562,8 +562,8 @@ 
 	 */
 	public function getContents()
 	{
-		Prado::trace("Retrieving output",'System.Web.THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		Prado::trace("Retrieving output", 'System.Web.THttpResponse');
+		return $this->_bufferOutput ? ob_get_contents() : '';
 	}
 
 	/**
@@ -573,7 +573,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_clean();
-		Prado::trace("Clearing output",'System.Web.THttpResponse');
+		Prado::trace("Clearing output", 'System.Web.THttpResponse');
 	}
 
 	/**
@@ -582,19 +582,19 @@ 
 	 */
 	public function getHeaders($case=null)
 	{
-		$result = array();
-		$headers = headers_list();
+		$result=array();
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -607,7 +607,7 @@ 
 	 */
 	public function appendHeader($value, $replace=true)
 	{
-		Prado::trace("Sending header '$value'",'System.Web.THttpResponse');
+		Prado::trace("Sending header '$value'", 'System.Web.THttpResponse');
 		header($value, $replace);
 	}
 
@@ -620,9 +620,9 @@ 
 	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
 	 * @see http://us2.php.net/manual/en/function.error-log.php
 	 */
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
 	{
-		error_log($message,$messageType,$destination,$extraHeaders);
+		error_log($message, $messageType, $destination, $extraHeaders);
 	}
 
 	/**

Braces +5 added lines, -9 removed lines

@@ -281,7 +281,7 @@ 
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -377,8 +377,7 @@ 
 		{
 			foreach($headers as $h)
 				header($h);
-		}
-		else
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -488,13 +487,11 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
-				}
-				else
+				} else
 					ob_flush();
 				flush();
 			}
-		}
-		else
+		} else
 			flush();
 	}
 
@@ -645,8 +642,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),

framework/Web/TUrlMapping.php

Doc Comments +3 added lines, -1 removed lines

@@ -606,6 +606,7 @@ 
 
 	/**
 	 * @param string full regular expression mapping pattern.
+	 * @param string $value
 	 */
 	public function setRegularExpression($value)
 	{
@@ -715,6 +716,7 @@ 
 	 * Uses URL pattern (or full regular expression if available) to
 	 * match the given url path.
 	 * @param THttpRequest the request module
+	 * @param THttpRequest $request
 	 * @return array matched parameters, empty if no matches.
 	 */
 	public function getPatternMatches($request)
@@ -785,7 +787,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{

Spacing +68 added lines, -68 removed lines

@@ -116,7 +116,7 @@ 
 				$this->_urlPrefix=$request->getApplicationUrl();
 			}
 		}
-		$this->_urlPrefix=rtrim($this->_urlPrefix,'/');
+		$this->_urlPrefix=rtrim($this->_urlPrefix, '/');
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$config = include $this->_configFile;
+				$config=include $this->_configFile;
 				$this->loadUrlMappings($dom);
 			}
 			else
@@ -140,7 +140,7 @@ 
 			}
 		}
 		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
+			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	protected function loadUrlMappings($config)
 	{
-		$defaultClass = $this->getDefaultMappingClass();
+		$defaultClass=$this->getDefaultMappingClass();
 
 		if(is_array($config))
 		{
@@ -241,9 +241,9 @@ 
 			{
 				foreach($config['urls'] as $url)
 				{
-					$class=isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:array();
-					$this->buildUrlMapping($class,$properties,$url);
+					$class=isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties=isset($url['properties']) ? $url['properties'] : array();
+					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
 		}
@@ -254,24 +254,24 @@ 
 				$properties=$url->getAttributes();
 				if(($class=$properties->remove('class'))===null)
 					$class=$defaultClass;
-				$this->buildUrlMapping($class,$properties,$url);
+				$this->buildUrlMapping($class, $properties, $url);
 			}
 		}
 	}
 
 	private function buildUrlMapping($class, $properties, $url)
 	{
-		$pattern=Prado::createComponent($class,$this);
+		$pattern=Prado::createComponent($class, $this);
 		if(!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
 		foreach($properties as $name=>$value)
-			$pattern->setSubproperty($name,$value);
+			$pattern->setSubproperty($name, $value);
 
 		if($url instanceof TXmlElement) {
-			$text = $url -> getValue();
+			$text=$url -> getValue();
 			if($text) {
-				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
+				$text=preg_replace('/(\s+)/S', '', $text);
+				if(($regExp=$pattern->getRegularExpression())!=='')
 				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
@@ -304,7 +304,7 @@ 
 		foreach($this->_patterns as $pattern)
 		{
 			$matches=$pattern->getPatternMatches($request);
-			if(count($matches)>0)
+			if(count($matches) > 0)
 			{
 				$this->_matched=$pattern;
 				$params=array();
@@ -313,7 +313,7 @@ 
 					if(is_string($key))
 						$params[$key]=$value;
 				}
-				if (!$pattern->getIsWildCardPattern())
+				if(!$pattern->getIsWildCardPattern())
 					$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
 				return $params;
 			}
@@ -345,21 +345,21 @@ 
 	 * @see parseUrl
 	 * @since 3.1.1
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		if($this->_customUrl)
 		{
 			if(!(is_array($getItems) || ($getItems instanceof Traversable)))
 				$getItems=array();
 			$key=$serviceID.':'.$serviceParam;
-			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
-				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
+			$wildCardKey=($pos=strrpos($serviceParam, '.'))!==false ?
+				$serviceID.':'.substr($serviceParam, 0, $pos).'.*' : $serviceID.':*';
 			if(isset($this->_constructRules[$key]))
 			{
 				foreach($this->_constructRules[$key] as $rule)
 				{
 					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 				}
 			}
 			elseif(isset($this->_constructRules[$wildCardKey]))
@@ -368,13 +368,13 @@ 
 				{
 					if($rule->supportCustomUrl($getItems))
 					{
-						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						$getItems['*']=$pos ? substr($serviceParam, $pos + 1) : $serviceParam;
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 					}
 				}
 			}
 		}
-		return parent::constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
+		return parent::constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -528,7 +528,7 @@ 
 	 * @var TUrlMappingPatternSecureConnection
 	 * @since 3.2
 	 */
-	private $_secureConnection = TUrlMappingPatternSecureConnection::Automatic;
+	private $_secureConnection=TUrlMappingPatternSecureConnection::Automatic;
 
 	/**
 	 * Constructor.
@@ -556,7 +556,7 @@ 
 	{
 		if($this->_serviceParameter===null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter,'*')!==false)
+		if(strpos($this->_serviceParameter, '*')!==false)
 				$this->_isWildCardPattern=true;
 	}
 
@@ -569,7 +569,7 @@ 
 	{
 		$params=array();
 		$values=array();
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -577,7 +577,7 @@ 
 				$values[]='(?P<'.$key.'>'.$value.')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
 				$params[]='{*}';
 				// service parameter must not contain '=' and '/'
@@ -585,8 +585,8 @@ 
 		}
 		$params[]='/';
 		$values[]='\\/';
-		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');
-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
+		$regexp=str_replace($params, $values, trim($this->getPattern(), '/').'/');
+		if($this->_urlFormat===THttpRequestUrlFormat::Get)
 				$regexp='/^'.$regexp.'$/u';
 		else
 				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
@@ -673,7 +673,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->_pattern = $value;
+		$this->_pattern=$value;
 	}
 
 	/**
@@ -681,7 +681,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
 			$this->_parameters=new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
@@ -703,9 +703,9 @@ 
 	 */
 	public function getConstants()
 	{
-		if (!$this->_constants)
+		if(!$this->_constants)
 		{
-			$this->_constants = new TAttributeCollection;
+			$this->_constants=new TAttributeCollection;
 			$this->_constants->setCaseSensitive(true);
 		}
 		return $this->_constants;
@@ -721,17 +721,17 @@ 
 	{
 		$matches=array();
 		if(($pattern=$this->getRegularExpression())!=='')
-			preg_match($pattern,$request->getPathInfo(),$matches);
+			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/').'/', $matches);
 
 		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+			$matches[$this->_serviceID]=str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
-		if (isset($matches['urlparams']))
+		if(isset($matches['urlparams']))
 		{
-			$params=explode('/',$matches['urlparams']);
-			if ($this->_separator==='/')
+			$params=explode('/', $matches['urlparams']);
+			if($this->_separator==='/')
 			{
 				while($key=array_shift($params))
 					$matches[$key]=($value=array_shift($params)) ? $value : '';
@@ -741,7 +741,7 @@ 
 				array_pop($params);
 				foreach($params as $param)
 				{
-					list($key,$value)=explode($this->_separator,$param,2);
+					list($key, $value)=explode($this->_separator, $param, 2);
 					$matches[$key]=$value;
 				}
 			}
@@ -751,7 +751,7 @@ 
 		if(count($matches) > 0 && $this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
-				$matches[$key] = $value;
+				$matches[$key]=$value;
 		}
 
 		return $matches;
@@ -805,7 +805,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -843,7 +843,7 @@ 
 	 */
 	public function setSecureConnection($value)
 	{
-		$this->_secureConnection = TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
+		$this->_secureConnection=TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 	{
 		if(!$this->_customUrl || $this->getPattern()===null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -864,13 +864,13 @@ 
 			}
 		}
 
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
-				if (!isset($getItems[$key]))
+				if(!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key]!=$value)
+				if($getItems[$key]!=$value)
 					return false;
 			}
 		}
@@ -885,9 +885,9 @@ 
 	 * @return string the constructed URL
 	 * @since 3.1.1
 	 */
-	public function constructUrl($getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
@@ -906,19 +906,19 @@ 
 				$extra[$key]=$value;
 		}
 
-		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(),$replace),'/');
+		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
-		if(count($extra)>0)
+		if(count($extra) > 0)
 		{
-			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name=>$value)
-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+			if($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach($extra as $name=>$value)
+					$url.='/'.$name.$this->_separator.($encodeGetItems ? rawurlencode($value) : $value);
 				return $url;
 			}
 
 			$url2='';
-			$amp=$encodeAmpersand?'&amp;':'&';
+			$amp=$encodeAmpersand ? '&amp;' : '&';
 			if($encodeGetItems)
 			{
 				foreach($extra as $name=>$value)
@@ -946,7 +946,7 @@ 
 						$url2.=$amp.$name.'='.$value;
 				}
 			}
-			$url=$url.'?'.substr($url2,strlen($amp));
+			$url=$url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -962,26 +962,26 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request===null) $request=Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection===null) $isSecureConnection=$request -> getIsSecureConnection();
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
 				if($isSecureConnection) return $url;
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
 				if(!$isSecureConnection) return $url;
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Disable:
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Automatic:
 			default:
@@ -1007,29 +1007,29 @@ 
 	 * Keep current SecureConnection status
 	 * means no prefixing
 	 */
-	const Automatic = 'Automatic';
+	const Automatic='Automatic';
 
 	/**
 	 * Force use secured connection
 	 * always prefixing with https://example.com/path/to/app
 	 */
-	const Enable = 'Enable';
+	const Enable='Enable';
 
 	/**
 	 * Force use unsecured connection
 	 * always prefixing with http://example.com/path/to/app
 	 */
-	const Disable = 'Disable';
+	const Disable='Disable';
 
 	/**
 	 * Force use secured connection, if in unsecured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const EnableIfNotSecure = 'EnableIfNotSecure';
+	const EnableIfNotSecure='EnableIfNotSecure';
 
 	/**
 	 * Force use unsecured connection, if in secured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const DisableIfSecure = 'DisableIfSecure';
+	const DisableIfSecure='DisableIfSecure';
 }

Braces +11 added lines, -18 removed lines

@@ -131,15 +131,13 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 	}
 
@@ -246,8 +244,7 @@ 
 					$this->buildUrlMapping($class,$properties,$url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
@@ -361,8 +358,7 @@ 
 					if($rule->supportCustomUrl($getItems))
 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{
@@ -733,10 +729,10 @@ 
 			$params=explode('/',$matches['urlparams']);
 			if ($this->_separator==='/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
-			}
-			else
+				while($key=array_shift($params)) {
+									$matches[$key]=($value=array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -928,12 +924,10 @@ 
 						$name=rawurlencode($name.'[]');
 						foreach($value as $v)
 							$url2.=$amp.$name.'='.rawurlencode($v);
-					}
-					else
+					} else
 						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name=>$value)
 				{
@@ -941,8 +935,7 @@ 
 					{
 						foreach($value as $v)
 							$url2.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url2.=$amp.$name.'='.$value;
 				}
 			}

framework/Web/UI/TControl.php

Doc Comments +36 added lines

@@ -261,6 +261,7 @@ 
 	 * Sets the page for a control.
 	 * Only framework developers should use this method.
 	 * @param TPage the page that contains this control
+	 * @param TPage $page
 	 */
 	public function setPage($page)
 	{
@@ -542,6 +543,7 @@ 
 
 	/**
 	 * @param boolean whether the control is visible
+	 * @param boolean $value
 	 */
 	public function setVisible($value)
 	{
@@ -609,6 +611,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return boolean whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -620,6 +623,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -634,6 +638,7 @@ 
 	 * Sets a custom control attribute.
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{
@@ -671,6 +676,7 @@ 
 
 	/**
 	 * @param boolean set whether to enable viewstate
+	 * @param boolean $value
 	 */
 	public function setEnableViewState($value)
 	{
@@ -687,6 +693,8 @@ 
 	 * that must be kept in controlstate.
 	 * @param string the name of the controlstate value to be returned
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
+	 * @param string $key
+	 * @param integer $defaultValue
 	 * @return mixed the controlstate value corresponding to $key
 	 */
 	protected function getControlState($key,$defaultValue=null)
@@ -703,6 +711,8 @@ 
 	 * @param string the name of the controlstate value
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
+	 * @param string $key
+	 * @param integer $defaultValue
 	 */
 	protected function setControlState($key,$value,$defaultValue=null)
 	{
@@ -726,6 +736,7 @@ 
 	 * When it is false, data saved via setViewState() will not be persisted.
 	 * By default, it is true, meaning data will be persisted across postbacks.
 	 * @param boolean whether data should be persisted
+	 * @param boolean $enabled
 	 */
 	public function trackViewState($enabled)
 	{
@@ -764,6 +775,7 @@ 
 	 * @param string the name of the viewstate value
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
+	 * @param string $key
 	 */
 	public function setViewState($key,$value,$defaultValue=null)
 	{
@@ -788,6 +800,7 @@ 
 	/**
 	 * Clears a viewstate value.
 	 * @param string the name of the viewstate value to be cleared
+	 * @param string $key
 	 */
 	public function clearViewState($key)
 	{
@@ -893,6 +906,7 @@ 
 	 * Sets a value indicating whether child controls are created.
 	 * If false, any existing child controls will be cleared up.
 	 * @param boolean whether child controls are created
+	 * @param boolean $value
 	 */
 	final protected function setChildControlsCreated($value)
 	{
@@ -983,6 +997,7 @@ 
 	 * Finds all child and grand-child controls that are of the specified type.
 	 * @param string the class name
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
+	 * @param string $type
 	 * @return array list of controls found
 	 */
 	public function findControlsByType($type,$strict=true)
@@ -1117,6 +1132,7 @@ 
 	 * A component with explicit ID on a template will be registered to
 	 * the template owner. This method allows you to obtain this component
 	 * with the ID.
+	 * @param string $name
 	 * @return mixed the named registered object. Null if object is not found.
 	 */
 	public function getRegisteredObject($name)
@@ -1174,6 +1190,7 @@ 
 	 * Control lifecycles will be caught up during the addition.
 	 * Only framework developers should use this method.
 	 * @param TControl the new child control
+	 * @param TControl $control
 	 */
 	public function addedControl($control)
 	{
@@ -1219,6 +1236,7 @@ 
 	 * Removes a control from the child collection of the control.
 	 * Only framework developers should use this method.
 	 * @param TControl the child control removed
+	 * @param TControl $control
 	 */
 	public function removedControl($control)
 	{
@@ -1470,6 +1488,7 @@ 
 	 * @param string name of the broadcast event
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
+	 * @param TBroadcastEventParameter $param
 	 */
 	private function broadcastEventInternal($name,$sender,$param)
 	{
@@ -1694,6 +1713,7 @@ 
 	 * Clears the cached UniqueID.
 	 * If $recursive=true, all children's cached UniqueID will be cleared as well.
 	 * @param boolean whether the clearing is recursive.
+	 * @param boolean $recursive
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
@@ -1731,6 +1751,7 @@ 
 	 * Updates the list of the controls whose IDs are managed by the specified naming container.
 	 * @param TControl the naming container
 	 * @param TControlCollection list of controls
+	 * @param TControl $container
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
 	private function fillNameTable($container,$controls)
@@ -1900,6 +1921,7 @@ 
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnClick, OnCommand)
 	 * indicating the component is responsible for the postback event.
 	 * @param string the parameter associated with the postback event
+	 * @return void
 	 */
 	public function raisePostBackEvent($param);
 }
@@ -1928,6 +1950,7 @@ 
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
 	 * indicating the control data is changed.
+	 * @return void
 	 */
 	public function raisePostDataChangedEvent();
 	/**
@@ -1961,6 +1984,7 @@ 
 	public function getIsValid();
 	/**
 	 * @param boolean whether the validator validates successfully
+	 * @return void
 	 */
 	public function setIsValid($value);
 	/**
@@ -1969,6 +1993,7 @@ 
 	public function getErrorMessage();
 	/**
 	 * @param string error message for the validation
+	 * @return void
 	 */
 	public function setErrorMessage($value);
 }
@@ -2036,6 +2061,7 @@ 
 	/**
 	 * Applies this theme to the specified control.
 	 * @param TControl the control to be applied with this theme
+	 * @return boolean
 	 */
 	public function applySkin($control);
 }
@@ -2057,6 +2083,7 @@ 
 	 * Content in the template will be instantiated as components and text strings
 	 * and passed to the specified parent control.
 	 * @param TControl the parent control
+	 * @return void
 	 */
 	public function instantiateIn($parent);
 }
@@ -2081,6 +2108,8 @@ 
 
 	/**
 	 * @param string caption of the button
+	 * @param string $value
+	 * @return void
 	 */
 	public function setText($value);
 
@@ -2091,6 +2120,7 @@ 
 
 	/**
 	 * @param boolean whether postback event trigger by this button will cause input validation
+	 * @return void
 	 */
 	public function setCausesValidation($value);
 
@@ -2101,6 +2131,7 @@ 
 
 	/**
 	 * @param string the command name associated with the {@link onCommand OnCommand} event.
+	 * @return void
 	 */
 	public function setCommandName($value);
 
@@ -2111,6 +2142,7 @@ 
 
 	/**
 	 * @param string the parameter associated with the {@link onCommand OnCommand} event.
+	 * @return void
 	 */
 	public function setCommandParameter($value);
 
@@ -2121,23 +2153,27 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @return void
 	 */
 	public function setValidationGroup($value);
 
 	/**
 	 * Raises <b>OnClick</b> event.
 	 * @param TEventParameter event parameter to be passed to the event handlers
+	 * @return void
 	 */
 	public function onClick($param);
 
 	/**
 	 * Raises <b>OnCommand</b> event.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @return void
 	 */
 	public function onCommand($param);
 
 	/**
 	 * @param boolean set by a panel to register this button as the default button for the panel.
+	 * @return void
 	 */
 	public function setIsDefaultButton($value);
 

Spacing +136 added lines, -136 removed lines

@@ -110,17 +110,17 @@ 
 	 * Indexes for the rare fields.
 	 * In order to save memory, rare fields will only be created if they are needed.
 	 */
-	const RF_CONTROLS=0;			// child controls
-	const RF_CHILD_STATE=1;			// child state field
-	const RF_NAMED_CONTROLS=2;		// list of controls whose namingcontainer is this control
-	const RF_NAMED_CONTROLS_ID=3;	// counter for automatic id
-	const RF_SKIN_ID=4;				// skin ID
-	const RF_DATA_BINDINGS=5;		// data bindings
-	const RF_EVENTS=6;				// event handlers
-	const RF_CONTROLSTATE=7;		// controlstate
-	const RF_NAMED_OBJECTS=8;		// controls declared with ID on template
-	const RF_ADAPTER=9;				// adapter
-	const RF_AUTO_BINDINGS=10;		// auto data bindings
+	const RF_CONTROLS=0; // child controls
+	const RF_CHILD_STATE=1; // child state field
+	const RF_NAMED_CONTROLS=2; // list of controls whose namingcontainer is this control
+	const RF_NAMED_CONTROLS_ID=3; // counter for automatic id
+	const RF_SKIN_ID=4; // skin ID
+	const RF_DATA_BINDINGS=5; // data bindings
+	const RF_EVENTS=6; // event handlers
+	const RF_CONTROLSTATE=7; // controlstate
+	const RF_NAMED_OBJECTS=8; // controls declared with ID on template
+	const RF_ADAPTER=9; // adapter
+	const RF_AUTO_BINDINGS=10; // auto data bindings
 
 	/**
 	 * @var string control ID
@@ -208,7 +208,7 @@ 
 	 */
 	public function getAdapter()
 	{
-		return isset($this->_rf[self::RF_ADAPTER])?$this->_rf[self::RF_ADAPTER]:null;
+		return isset($this->_rf[self::RF_ADAPTER]) ? $this->_rf[self::RF_ADAPTER] : null;
 	}
 
 	/**
@@ -348,10 +348,10 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT,$id))
-			throw new TInvalidDataValueException('control_id_invalid',get_class($this),$id);
+		if(!preg_match(self::ID_FORMAT, $id))
+			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
 		$this->_id=$id;
-		$this->_flags |= self::IS_ID_SET;
+		$this->_flags|=self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
 		if($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
@@ -368,7 +368,7 @@ 
 	{
 		if($this->_uid==='' || $this->_uid===null)	// need to build the UniqueID
 		{
-			$this->_uid='';  // set to not-null, so that clearCachedUniqueID() may take action
+			$this->_uid=''; // set to not-null, so that clearCachedUniqueID() may take action
 			if($namingContainer=$this->getNamingContainer())
 			{
 				if($this->getPage()===$namingContainer)
@@ -402,7 +402,7 @@ 
 	 */
 	public function getClientID()
 	{
-		return strtr($this->getUniqueID(),self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($this->getUniqueID(), self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 	 */
 	public static function convertUniqueIdToClientId($uniqueID)
 	{
-		return strtr($uniqueID,self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($uniqueID, self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 */
 	public function getSkinID()
 	{
-		return isset($this->_rf[self::RF_SKIN_ID])?$this->_rf[self::RF_SKIN_ID]:'';
+		return isset($this->_rf[self::RF_SKIN_ID]) ? $this->_rf[self::RF_SKIN_ID] : '';
 	}
 
 	/**
@@ -429,8 +429,8 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
+		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
 			$this->_rf[self::RF_SKIN_ID]=$value;
 	}
@@ -453,7 +453,7 @@ 
 		if($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 
 	/**
@@ -462,12 +462,12 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
+		if($this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
 		else if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
+			$this->_flags&=~self::IS_DISABLE_THEMING;
 		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+			$this->_flags|=self::IS_DISABLE_THEMING;
 	}
 
 	/**
@@ -479,7 +479,7 @@ 
 	 */
 	public function getCustomData()
 	{
-		return $this->getViewState('CustomData',null);
+		return $this->getViewState('CustomData', null);
 	}
 
 	/**
@@ -489,7 +489,7 @@ 
 	 */
 	public function setCustomData($value)
 	{
-		$this->setViewState('CustomData',$value,null);
+		$this->setViewState('CustomData', $value, null);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 */
 	public function getHasControls()
 	{
-		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount()>0;
+		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount() > 0;
 	}
 
 	/**
@@ -517,7 +517,7 @@ 
 	 */
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 
 	/**
@@ -531,13 +531,13 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
+			for($control=$this; $control; $control=$control->_parent)
 				if(!$control->getVisible(false))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Visible',true);
+			return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -545,7 +545,7 @@ 
 	 */
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -562,13 +562,13 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for($control=$this; $control; $control=$control->_parent)
+				if(!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Enabled',true);
+			return $this->getViewState('Enabled', true);
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->setViewState('Enabled',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Enabled', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -584,8 +584,8 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
+		if($attributes=$this->getViewState('Attributes', null))
+			return $attributes->getCount() > 0;
 		else
 			return false;
 	}
@@ -598,12 +598,12 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
 			$attributes=new TAttributeCollection;
-			$this->setViewState('Attributes',$attributes,null);
+			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -613,7 +613,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -624,7 +624,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -635,9 +635,9 @@ 
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -647,7 +647,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -660,7 +660,7 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
+			for($control=$this; $control!==null; $control=$control->getParent())
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
@@ -675,9 +675,9 @@ 
 	public function setEnableViewState($value)
 	{
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+			$this->_flags&=~self::IS_DISABLE_VIEWSTATE;
 		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+			$this->_flags|=self::IS_DISABLE_VIEWSTATE;
 	}
 
 	/**
@@ -689,9 +689,9 @@ 
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
 	 * @return mixed the controlstate value corresponding to $key
 	 */
-	protected function getControlState($key,$defaultValue=null)
+	protected function getControlState($key, $defaultValue=null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
 
 	/**
@@ -704,7 +704,7 @@ 
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
 	 */
-	protected function setControlState($key,$value,$defaultValue=null)
+	protected function setControlState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
@@ -741,10 +741,10 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	public function getViewState($key,$defaultValue=null)
+	public function getViewState($key, $defaultValue=null)
 	{
 		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
+			return $this->_viewState[$key]!==null ? $this->_viewState[$key] : $defaultValue;
 		else if(isset($this->_tempState[$key]))
 		{
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
@@ -765,7 +765,7 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	public function setViewState($key,$value,$defaultValue=null)
+	public function setViewState($key, $value, $defaultValue=null)
 	{
 		if($this->_trackViewState)
 		{
@@ -801,7 +801,7 @@ 
 	 * @param string the property name, or property path
 	 * @param string the expression
 	 */
-	public function bindProperty($name,$expression)
+	public function bindProperty($name, $expression)
 	{
 		$this->_rf[self::RF_DATA_BINDINGS][$name]=$expression;
 	}
@@ -823,7 +823,7 @@ 
 	 * @param string the property name, or property path
 	 * @param string the expression
 	 */
-	public function autoBindProperty($name,$expression)
+	public function autoBindProperty($name, $expression)
 	{
 		$this->_rf[self::RF_AUTO_BINDINGS][$name]=$expression;
 	}
@@ -843,13 +843,13 @@ 
 	 */
 	protected function dataBindProperties()
 	{
-		Prado::trace("Data bind properties",'System.Web.UI.TControl');
+		Prado::trace("Data bind properties", 'System.Web.UI.TControl');
 		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
 			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 
@@ -863,7 +863,7 @@ 
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
 			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 
@@ -872,7 +872,7 @@ 
 	 */
 	protected function dataBindChildren()
 	{
-		Prado::trace("dataBindChildren()",'System.Web.UI.TControl');
+		Prado::trace("dataBindChildren()", 'System.Web.UI.TControl');
 		if(isset($this->_rf[self::RF_CONTROLS]))
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
@@ -897,12 +897,12 @@ 
 	final protected function setChildControlsCreated($value)
 	{
 		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
+			$this->_flags|=self::IS_CHILD_CREATED;
 		else
 		{
 			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
-			$this->_flags &= ~self::IS_CHILD_CREATED;
+			$this->_flags&=~self::IS_CHILD_CREATED;
 		}
 	}
 
@@ -917,18 +917,18 @@ 
 		{
 			try
 			{
-				$this->_flags |= self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CREATING_CHILD;
 				if(isset($this->_rf[self::RF_ADAPTER]))
 					$this->_rf[self::RF_ADAPTER]->createChildControls();
 				else
 					$this->createChildControls();
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 			}
 			catch(Exception $e)
 			{
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 				throw $e;
 			}
 		}
@@ -957,21 +957,21 @@ 
 	 */
 	public function findControl($id)
 	{
-		$id=strtr($id,'.',self::ID_SEPARATOR);
-		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
+		$id=strtr($id, '.', self::ID_SEPARATOR);
+		$container=($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
 		if(!$container || !$container->getHasControls())
 			return null;
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS]=array();
-			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
+			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if(($pos=strpos($id, self::ID_SEPARATOR))===false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
-			$cid=substr($id,0,$pos);
-			$sid=substr($id,$pos+1);
+			$cid=substr($id, 0, $pos);
+			$sid=substr($id, $pos + 1);
 			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
@@ -985,7 +985,7 @@ 
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
 	 * @return array list of controls found
 	 */
-	public function findControlsByType($type,$strict=true)
+	public function findControlsByType($type, $strict=true)
 	{
 		$controls=array();
 		if($this->getHasControls())
@@ -995,7 +995,7 @@ 
 				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type))))
 					$controls[]=$control;
 				if(($control instanceof TControl) && $control->getHasControls())
-					$controls=array_merge($controls,$control->findControlsByType($type,$strict));
+					$controls=array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
 		return $controls;
@@ -1021,7 +1021,7 @@ 
 				{
 					if($control->_id===$id)
 						$controls[]=$control;
-					$controls=array_merge($controls,$control->findControlsByID($id));
+					$controls=array_merge($controls, $control->findControlsByID($id));
 				}
 			}
 		}
@@ -1046,10 +1046,10 @@ 
 	 * @param object object to be declared
 	 * @see __get
 	 */
-	public function registerObject($name,$object)
+	public function registerObject($name, $object)
 	{
 		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered',$name);
+			throw new TInvalidOperationException('control_object_reregistered', $name);
 		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
 	}
 
@@ -1121,7 +1121,7 @@ 
 	 */
 	public function getRegisteredObject($name)
 	{
-		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
+		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name]) ? $this->_rf[self::RF_NAMED_OBJECTS][$name] : null;
 	}
 
 	/**
@@ -1181,7 +1181,7 @@ 
 			$control->_parent->getControls()->remove($control);
 		$control->_parent=$this;
 		$control->_page=$this->getPage();
-		$namingContainer=($this instanceof INamingContainer)?$this:$this->_namingContainer;
+		$namingContainer=($this instanceof INamingContainer) ? $this : $this->_namingContainer;
 		if($namingContainer)
 		{
 			$control->_namingContainer=$namingContainer;
@@ -1192,10 +1192,10 @@ 
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
+		if($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage>=self::CS_STATE_LOADED)
+			if($this->_stage >= self::CS_STATE_LOADED)
 			{
 				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
@@ -1204,11 +1204,11 @@ 
 				}
 				else
 					$state=null;
-				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage>=self::CS_LOADED)
+				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+				if($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage>=self::CS_PRERENDERED)
+					if($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -1262,13 +1262,13 @@ 
 				}
 			}
 		}
-		if($this->_stage<self::CS_INITIALIZED)
+		if($this->_stage < self::CS_INITIALIZED)
 		{
 			$this->_stage=self::CS_CHILD_INITIALIZED;
 			if(($page=$this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
-				$this->_flags |= self::IS_SKIN_APPLIED;
+				$this->_flags|=self::IS_SKIN_APPLIED;
 			}
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
@@ -1284,7 +1284,7 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_stage<self::CS_LOADED)
+		if($this->_stage < self::CS_LOADED)
 		{
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
@@ -1299,7 +1299,7 @@ 
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage<self::CS_LOADED)
+		if($this->_stage < self::CS_LOADED)
 			$this->_stage=self::CS_LOADED;
 	}
 
@@ -1360,7 +1360,7 @@ 
 	 */
 	public function onInit($param)
 	{
-		$this->raiseEvent('OnInit',$this,$param);
+		$this->raiseEvent('OnInit', $this, $param);
 	}
 
 	/**
@@ -1372,7 +1372,7 @@ 
 	 */
 	public function onLoad($param)
 	{
-		$this->raiseEvent('OnLoad',$this,$param);
+		$this->raiseEvent('OnLoad', $this, $param);
 	}
 
 	/**
@@ -1382,8 +1382,8 @@ 
 	 */
 	public function onDataBinding($param)
 	{
-		Prado::trace("onDataBinding()",'System.Web.UI.TControl');
-		$this->raiseEvent('OnDataBinding',$this,$param);
+		Prado::trace("onDataBinding()", 'System.Web.UI.TControl');
+		$this->raiseEvent('OnDataBinding', $this, $param);
 	}
 
 
@@ -1396,7 +1396,7 @@ 
 	 */
 	public function onUnload($param)
 	{
-		$this->raiseEvent('OnUnload',$this,$param);
+		$this->raiseEvent('OnUnload', $this, $param);
 	}
 
 	/**
@@ -1408,7 +1408,7 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$this->raiseEvent('OnPreRender',$this,$param);
+		$this->raiseEvent('OnPreRender', $this, $param);
 	}
 
 	/**
@@ -1418,12 +1418,12 @@ 
 	 * @param TEventParameter event parameter
 	 * @see bubbleEvent
 	 */
-	protected function raiseBubbleEvent($sender,$param)
+	protected function raiseBubbleEvent($sender, $param)
 	{
 		$control=$this;
 		while($control=$control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
+			if($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
@@ -1437,7 +1437,7 @@ 
 	 * @return boolean true if the event bubbling is handled and no more bubbling.
 	 * @see raiseBubbleEvent
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		return false;
 	}
@@ -1458,10 +1458,10 @@ 
 	 * @param TControl sender of this event
 	 * @param TEventParameter event parameter
 	 */
-	public function broadcastEvent($name,$sender,$param)
+	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl=(($page=$this->getPage())===null)?$this:$page;
-		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
+		$rootControl=(($page=$this->getPage())===null) ? $this : $page;
+		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
 
 	/**
@@ -1471,18 +1471,18 @@ 
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
 	 */
-	private function broadcastEventInternal($name,$sender,$param)
+	private function broadcastEventInternal($name, $sender, $param)
 	{
 		if($this->hasEvent($name))
-			$this->raiseEvent($name,$sender,$param->getParameter());
+			$this->raiseEvent($name, $sender, $param->getParameter());
 		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender,$param);
+			$this->broadcastEventReceived($sender, $param);
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
-					$control->broadcastEventInternal($name,$sender,$param);
+					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
 	}
@@ -1504,22 +1504,22 @@ 
 	 * @param callback callback invoked before traversing child controls. If null, it is ignored.
 	 * @param callback callback invoked after traversing child controls. If null, it is ignored.
 	 */
-	protected function traverseChildControls($param,$preCallback=null,$postCallback=null)
+	protected function traverseChildControls($param, $preCallback=null, $postCallback=null)
 	{
 		if($preCallback!==null)
-			call_user_func($preCallback,$this,$param);
+			call_user_func($preCallback, $this, $param);
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
 				{
-					$control->traverseChildControls($param,$preCallback,$postCallback);
+					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
 		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+			call_user_func($postCallback, $this, $param);
 	}
 
 	/**
@@ -1596,7 +1596,7 @@ 
 	 * @param array the collection of the state
 	 * @param boolean whether the viewstate should be loaded
 	 */
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState=true)
 	{
 		if(is_array($state))
 		{
@@ -1626,7 +1626,7 @@ 
 					{
 						if(isset($state[$control->_id]))
 						{
-							$control->loadStateRecursive($state[$control->_id],$needViewState);
+							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
 						}
 					}
@@ -1662,7 +1662,7 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
+					if(count($tmp=&$control->saveStateRecursive($needViewState)))
 						$state[$control->_id]=$tmp;
 				}
 			}
@@ -1684,10 +1684,10 @@ 
 		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
-			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+			$this->_flags|=self::IS_STYLESHEET_APPLIED;
 		}
 		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
+			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
 	/**
@@ -1711,11 +1711,11 @@ 
 	 */
 	private function generateAutomaticID()
 	{
-		$this->_flags &= ~self::IS_ID_SET;
+		$this->_flags&=~self::IS_ID_SET;
 		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
 			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
 		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id=self::AUTOMATIC_ID_PREFIX . $id;
+		$this->_id=self::AUTOMATIC_ID_PREFIX.$id;
 		$this->_namingContainer->clearNameTable();
 	}
 
@@ -1733,7 +1733,7 @@ 
 	 * @param TControlCollection list of controls
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
-	private function fillNameTable($container,$controls)
+	private function fillNameTable($container, $controls)
 	{
 		foreach($controls as $control)
 		{
@@ -1742,12 +1742,12 @@ 
 				if($control->_id!=='')
 				{
 					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$control->_id);
+						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
 						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
 				}
 				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container,$control->_rf[self::RF_CONTROLS]);
+					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}
@@ -1777,10 +1777,10 @@ 
 	 * @param TControl the control that owns this collection.
 	 * @param boolean whether the list is read-only
 	 */
-	public function __construct(TControl $owner,$readOnly=false)
+	public function __construct(TControl $owner, $readOnly=false)
 	{
 		$this->_o=$owner;
-		parent::__construct(null,$readOnly);
+		parent::__construct(null, $readOnly);
 	}
 
 	/**
@@ -1799,15 +1799,15 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is neither a string nor a TControl.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TControl)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
 		}
 		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
@@ -1856,7 +1856,7 @@ 
 	 */
 	public function __construct(TControl $owner)
 	{
-		parent::__construct($owner,true);
+		parent::__construct($owner, true);
 	}
 
 	/**
@@ -1865,10 +1865,10 @@ 
 	 * @param integer the speicified position.
 	 * @param mixed new item
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(!is_string($item))  // string is possible if property tag is used. we simply ignore it in this case
-			parent::insertAt($index,$item);  // this will generate an exception in parent implementation
+			parent::insertAt($index, $item); // this will generate an exception in parent implementation
 	}
 }
 
@@ -1923,7 +1923,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values);
+	public function loadPostData($key, $values);
 	/**
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
@@ -2019,7 +2019,7 @@ 
 	 * @param TControl sender of the event
 	 * @param TBroadCastEventParameter event parameter
 	 */
-	public function broadcastEventReceived($sender,$param);
+	public function broadcastEventReceived($sender, $param);
 }
 
 /**
@@ -2192,7 +2192,7 @@ 
 	 * @param string name of the broadcast event
 	 * @param mixed parameter of the broadcast event
 	 */
-	public function __construct($name='',$parameter=null)
+	public function __construct($name='', $parameter=null)
 	{
 		$this->_name=$name;
 		$this->_param=$parameter;
@@ -2253,7 +2253,7 @@ 
 	 * @param string name of the command
 	 * @param string parameter of the command
 	 */
-	public function __construct($name='',$parameter='')
+	public function __construct($name='', $parameter='')
 	{
 		$this->_name=$name;
 		$this->_param=$parameter;
@@ -2345,7 +2345,7 @@ 
 	 */
 	public function evaluateDynamicContent()
 	{
-		$context=$this->_container===null?$this:$this->_container;
+		$context=$this->_container===null ? $this : $this->_container;
 		foreach($this->_expressions as $id=>$expression)
 			$this->_items[$id]=$context->evaluateExpression($expression);
 		foreach($this->_statements as $id=>$statement)
@@ -2358,7 +2358,7 @@ 
 	 */
 	public function dataBind()
 	{
-		$context=$this->_container===null?$this:$this->_container;
+		$context=$this->_container===null ? $this : $this->_container;
 		foreach($this->_bindings as $id=>$binding)
 			$this->_items[$id]=$context->evaluateExpression($binding);
 	}
@@ -2370,7 +2370,7 @@ 
 	 */
 	public function render($writer)
 	{
-		$writer->write(implode('',$this->_items));
+		$writer->write(implode('', $this->_items));
 	}
 }
 

Braces +16 added lines, -28 removed lines

@@ -377,11 +377,9 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
-			}
-			else	// no naming container
+			} else	// no naming container
 				return $this->_id;
-		}
-		else
+		} else
 			return $this->_uid;
 	}
 
@@ -535,8 +533,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible',true);
 	}
 
@@ -566,8 +563,7 @@ 
 				if(!$control->getViewState('Enabled',true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled',true);
 	}
 
@@ -664,8 +660,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
@@ -750,8 +745,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 
@@ -774,8 +768,7 @@ 
 				unset($this->_viewState[$key]);
 			else
 				$this->_viewState[$key]=$value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value===$defaultValue)
@@ -924,8 +917,7 @@ 
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -1164,8 +1156,9 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
+		while($control!==$ancestor && $control->_parent) {
+					$control=$control->_parent;
+		}
 		return $control===$ancestor;
 	}
 
@@ -1201,8 +1194,7 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
-				}
-				else
+				} else
 					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
@@ -1607,8 +1599,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -1685,8 +1676,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 
@@ -1805,8 +1795,7 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
-		}
-		else if(is_string($item) || ($item instanceof IRenderable))
+		} else if(is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index,$item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
@@ -2318,8 +2307,7 @@ 
 				else if($item[0]===self::TYPE_DATABINDING)
 					$this->_bindings[$id]=$item[1];
 				$this->_items[$id]='';
-			}
-			else
+			} else
 				$this->_items[$id]=$item;
 		}
 	}

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TControl, TControlCollection, TEventParameter and INamingContainer class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI
- */
+	 * TControl, TControlCollection, TEventParameter and INamingContainer class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI
+	 */
 
 /**
  * Includes TAttributeCollection and TControlAdapter class

framework/Web/UI/WebControls/TImageButton.php

Doc Comments +5 added lines

@@ -220,6 +220,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageClickEventParameter event parameter to be passed to the event handlers
+	 * @param TImageClickEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -232,6 +233,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{
@@ -324,6 +326,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -396,6 +399,8 @@ 
 	 * Constructor.
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
+	 * @param integer $x
+	 * @param integer $y
 	 */
 	public function __construct($x,$y)
 	{

Braces +2 added lines, -4 removed lines

@@ -106,8 +106,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -141,8 +140,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +29 added lines, -29 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -99,16 +99,16 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
+		$writer->addAttribute('type', 'image');
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getEnabled(true))
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -117,9 +117,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -151,7 +151,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -177,10 +177,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 
 		return $options;
 	}
@@ -192,7 +192,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uid=$this->getUniqueID();
 		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
@@ -223,7 +223,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
 	 */
-	public function __construct($x,$y)
+	public function __construct($x, $y)
 	{
 		$this->_x=$x;
 		$this->_y=$y;