pradosoft / prado

framework/IModule.php

Doc Comments +2 added lines

@@ -25,6 +25,7 @@ 
 	/**
 	 * Initializes the module.
 	 * @param TXmlElement the configuration for the module
+	 * @return void
 	 */
 	public function init($config);
 	/**
@@ -33,6 +34,7 @@ 
 	public function getID();
 	/**
 	 * @param string ID of the module
+	 * @return void
 	 */
 	public function setID($id);
 }
\ No newline at end of file

framework/IService.php

Doc Comments +4 added lines

@@ -25,6 +25,7 @@ 
 	/**
 	 * Initializes the service.
 	 * @param TXmlElement the configuration for the service
+	 * @return void
 	 */
 	public function init($config);
 	/**
@@ -33,6 +34,7 @@ 
 	public function getID();
 	/**
 	 * @param string ID of the service
+	 * @return void
 	 */
 	public function setID($id);
 	/**
@@ -41,10 +43,12 @@ 
 	public function getEnabled();
 	/**
 	 * @param boolean whether the service is enabled
+	 * @return void
 	 */
 	public function setEnabled($value);
 	/**
 	 * Runs the service.
+	 * @return void
 	 */
 	public function run();
 }
\ No newline at end of file

framework/IStatePersister.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Saves state into a persistent storage.
 	 * @param mixed the state to be saved
+	 * @return void
 	 */
 	public function save($state);
 }
\ No newline at end of file

framework/Security/IUser.php

Doc Comments +2 added lines

@@ -28,6 +28,7 @@ 
 	public function getName();
 	/**
 	 * @param string username
+	 * @return void
 	 */
 	public function setName($value);
 	/**
@@ -36,6 +37,7 @@ 
 	public function getIsGuest();
 	/**
 	 * @param boolean if the user is a guest
+	 * @return void
 	 */
 	public function setIsGuest($value);
 	/**

framework/Security/TAuthorizationRule.php

Doc Comments +7 added lines, -1 removed lines

@@ -165,7 +165,7 @@ 
 	}
 
 	/**
-	 * @return array list of IP rules.
+	 * @return string list of IP rules.
 	 * @since 3.1.1
 	 */
 	public function getIPRules()
@@ -223,11 +223,17 @@ 
 		return 0;
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	private function isUserMatched($user)
 	{
 		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	private function isRoleMatched($user)
 	{
 		foreach($this->_roles as $role)

Spacing +11 added lines, -11 removed lines

@@ -74,13 +74,13 @@ 
 	 * @param string verb, can be empty, 'get', or 'post'
 	 * @param string IP rules (separated by comma, can contain wild card *)
 	 */
-	public function __construct($action,$users,$roles,$verb='',$ipRules='')
+	public function __construct($action, $users, $roles, $verb='', $ipRules='')
 	{
 		$action=strtolower(trim($action));
 		if($action==='allow' || $action==='deny')
 			$this->_action=$action;
 		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
+			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
 		$this->_users=array();
 		$this->_roles=array();
 		$this->_ipRules=array();
@@ -90,7 +90,7 @@ 
 
 		if(trim($users)==='')
 			$users='*';
-		foreach(explode(',',$users) as $user)
+		foreach(explode(',', $users) as $user)
 		{
 			if(($user=trim(strtolower($user)))!=='')
 			{
@@ -110,7 +110,7 @@ 
 
 		if(trim($roles)==='')
 			$roles='*';
-		foreach(explode(',',$roles) as $role)
+		foreach(explode(',', $roles) as $role)
 		{
 			if(($role=trim(strtolower($role)))!=='')
 				$this->_roles[]=$role;
@@ -121,11 +121,11 @@ 
 		if($verb==='*' || $verb==='get' || $verb==='post')
 			$this->_verb=$verb;
 		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 
 		if(trim($ipRules)==='')
 			$ipRules='*';
-		foreach(explode(',',$ipRules) as $ipRule)
+		foreach(explode(',', $ipRules) as $ipRule)
 		{
 			if(($ipRule=trim($ipRule))!=='')
 				$this->_ipRules[]=$ipRule;
@@ -203,10 +203,10 @@ 
 	 * @param string the request IP address
 	 * @return integer 1 if the user is allowed, -1 if the user is denied, 0 if the rule does not apply to the user
 	 */
-	public function isUserAllowed(IUser $user,$verb,$ip)
+	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
 		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
+			return ($this->_action==='allow') ? 1 : -1;
 		else
 			return 0;
 	}
@@ -217,7 +217,7 @@ 
 			return 1;
 		foreach($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
+			if($rule==='*' || $rule===$ip || (($pos=strpos($rule, '*'))!==false && strncmp($ip, $rule, $pos)===0))
 				return 1;
 		}
 		return 0;
@@ -225,7 +225,7 @@ 
 
 	private function isUserMatched($user)
 	{
-		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
+		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()), $this->_users));
 	}
 
 	private function isRoleMatched($user)
@@ -240,6 +240,6 @@ 
 
 	private function isVerbMatched($verb)
 	{
-		return ($this->_verb==='*' || strcasecmp($verb,$this->_verb)===0);
+		return ($this->_verb==='*' || strcasecmp($verb, $this->_verb)===0);
 	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 				{
 					$this->_everyone=true;
 					break;
-				}
-				else if($user==='?')
+				} else if($user==='?')
 					$this->_guest=true;
 				else if($user==='@')
 					$this->_authenticated=true;

framework/TApplicationConfiguration.php

Doc Comments +1 added lines

@@ -61,6 +61,7 @@
 	/**
 	 * Parses the application configuration file.
 	 * @param string configuration file name
+	 * @param string $fname
 	 * @throws TConfigurationException if there is any parsing error
 	 */
 	public function loadFromFile($fname)

Braces +7 added lines, -14 removed lines

@@ -69,8 +69,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -217,8 +216,7 @@ 
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined',$id);
 						$this->_aliases[$id]=$p;
-					}
-					else
+					} else
 						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty=false;
 					break;
@@ -285,8 +283,7 @@ 
 				else
 					$this->_modules[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 		}
 	}
@@ -330,8 +327,7 @@ 
 				$element->setParent(null);
 				$this->_services[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 		}
 	}
@@ -355,8 +351,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -383,12 +378,10 @@ 
 						$this->_parameters[$id]=$element;
 					else
 						$this->_parameters[$id]=$value;
-				}
-				else
+				} else
 					$this->_parameters[$id]=array($type,$properties->toArray());
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 		}
 	}

Spacing +59 added lines, -59 removed lines

@@ -67,14 +67,14 @@ 
 	{
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname));
+			$fcontent=include $fname;
+			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
-			$this->loadFromXml($dom,dirname($fname));
+			$this->loadFromXml($dom, dirname($fname));
 		}
 	}
 
@@ -100,23 +100,23 @@ 
 			{
 				$this->_properties[$name]=$value;
 			}
-			$this->_empty = false;
+			$this->_empty=false;
 		}
 
 		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
+			$this->loadPathsPhp($config['paths'], $configPath);
 
 		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
+			$this->loadModulesPhp($config['modules'], $configPath);
 
 		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
+			$this->loadServicesPhp($config['services'], $configPath);
 
 		if(isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
 
 		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'],$configPath);
+			$this->loadExternalXml($config['includes'], $configPath);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 * @param TXmlElement the XML element
 	 * @param string the context path (for specifying relative paths)
 	 */
-	public function loadFromXml($dom,$configPath)
+	public function loadFromXml($dom, $configPath)
 	{
 		// application properties
 		foreach($dom->getAttributes() as $name=>$value)
@@ -138,19 +138,19 @@ 
 			switch($element->getTagName())
 			{
 				case 'paths':
-					$this->loadPathsXml($element,$configPath);
+					$this->loadPathsXml($element, $configPath);
 					break;
 				case 'modules':
-					$this->loadModulesXml($element,$configPath);
+					$this->loadModulesXml($element, $configPath);
 					break;
 				case 'services':
-					$this->loadServicesXml($element,$configPath);
+					$this->loadServicesXml($element, $configPath);
 					break;
 				case 'parameters':
-					$this->loadParametersXml($element,$configPath);
+					$this->loadParametersXml($element, $configPath);
 					break;
 				case 'include':
-					$this->loadExternalXml($element,$configPath);
+					$this->loadExternalXml($element, $configPath);
 					break;
 				default:
 					//throw new TConfigurationException('appconfig_tag_invalid',$element->getTagName());
@@ -170,15 +170,15 @@ 
 		{
 			foreach($pathsNode['aliases'] as $id=>$path)
 			{
-				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
+				$path=str_replace('\\', '/', $path);
+				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
 					$p=realpath($path);
 				else
 					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
 				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
+					throw new TConfigurationException('appconfig_alias_redefined', $id);
 				$this->_aliases[$id]=$p;
 			}
 		}
@@ -187,7 +187,7 @@ 
 		{
 			foreach($pathsNode['using'] as $namespace)
 			{
-				$this->_usings[] = $namespace;
+				$this->_usings[]=$namespace;
 			}
 		}
 	}
@@ -197,7 +197,7 @@ 
 	 * @param TXmlElement the paths XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadPathsXml($pathsNode,$configPath)
+	protected function loadPathsXml($pathsNode, $configPath)
 	{
 		foreach($pathsNode->getElements() as $element)
 		{
@@ -207,15 +207,15 @@ 
 				{
 					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
 					{
-						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
+						$path=str_replace('\\', '/', $path);
+						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
 							$p=realpath($path);
 						else
 							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
 						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
+							throw new TConfigurationException('appconfig_alias_redefined', $id);
 						$this->_aliases[$id]=$p;
 					}
 					else
@@ -233,7 +233,7 @@ 
 					break;
 				}
 				default:
-					throw new TConfigurationException('appconfig_paths_invalid',$element->getTagName());
+					throw new TConfigurationException('appconfig_paths_invalid', $element->getTagName());
 			}
 		}
 	}
@@ -248,17 +248,17 @@ 
 		foreach($modulesNode as $id=>$module)
 		{
 			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
-			$type = $module['class'];
+				throw new TConfigurationException('appconfig_moduletype_required', $id);
+			$type=$module['class'];
 			unset($module['class']);
-			$properties = array();
+			$properties=array();
 			if(isset($module['properties']))
 			{
-				$properties = $module['properties'];
+				$properties=$module['properties'];
 				unset($module['properties']);
 			}
-			$properties['id'] = $id;
-			$this->_modules[$id]=array($type,$properties,$module);
+			$properties['id']=$id;
+			$this->_modules[$id]=array($type, $properties, $module);
 			$this->_empty=false;
 		}
 	}
@@ -268,7 +268,7 @@ 
 	 * @param TXmlElement the modules XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadModulesXml($modulesNode,$configPath)
+	protected function loadModulesXml($modulesNode, $configPath)
 	{
 		foreach($modulesNode->getElements() as $element)
 		{
@@ -278,16 +278,16 @@ 
 				$id=$properties->itemAt('id');
 				$type=$properties->remove('class');
 				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
 				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
+					$this->_modules[]=array($type, $properties->toArray(), $element);
 				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
+					$this->_modules[$id]=array($type, $properties->toArray(), $element);
 				$this->_empty=false;
 			}
 			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
 
@@ -296,18 +296,18 @@ 
 	 * @param array the services PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadServicesPhp($servicesNode,$configPath)
+	protected function loadServicesPhp($servicesNode, $configPath)
 	{
 		foreach($servicesNode as $id => $service)
 		{
 			if(!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
-			$type = $service['class'];
-			$properties = isset($service['properties']) ? $service['properties'] : array();
+			$type=$service['class'];
+			$properties=isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
-			$properties['id'] = $id;
-			$this->_services[$id] = array($type,$properties,$service);
-			$this->_empty = false;
+			$properties['id']=$id;
+			$this->_services[$id]=array($type, $properties, $service);
+			$this->_empty=false;
 		}
 	}
 
@@ -316,7 +316,7 @@ 
 	 * @param TXmlElement the services XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadServicesXml($servicesNode,$configPath)
+	protected function loadServicesXml($servicesNode, $configPath)
 	{
 		foreach($servicesNode->getElements() as $element)
 		{
@@ -326,13 +326,13 @@ 
 				if(($id=$properties->itemAt('id'))===null)
 					throw new TConfigurationException('appconfig_serviceid_required');
 				if(($type=$properties->remove('class'))===null)
-					throw new TConfigurationException('appconfig_servicetype_required',$id);
+					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id]=array($type,$properties->toArray(),$element);
+				$this->_services[$id]=array($type, $properties->toArray(), $element);
 				$this->_empty=false;
 			}
 			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
 
@@ -341,7 +341,7 @@ 
 	 * @param array the parameters PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadParametersPhp($parametersNode,$configPath)
+	protected function loadParametersPhp($parametersNode, $configPath)
 	{
 		foreach($parametersNode as $id => $parameter)
 		{
@@ -349,16 +349,16 @@ 
 			{
 				if(isset($parameter['class']))
 				{
-					$type = $parameter['class'];
+					$type=$parameter['class'];
 					unset($parameter['class']);
-					$properties = isset($service['properties']) ? $service['properties'] : array();
-					$properties['id'] = $id;
-					$this->_parameters[$id] = array($type,$properties);
+					$properties=isset($service['properties']) ? $service['properties'] : array();
+					$properties['id']=$id;
+					$this->_parameters[$id]=array($type, $properties);
 				}
 			}
 			else
 			{
-				$this->_parameters[$id] = $parameter;
+				$this->_parameters[$id]=$parameter;
 			}
 		}
 	}
@@ -368,7 +368,7 @@ 
 	 * @param TXmlElement the parameters XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadParametersXml($parametersNode,$configPath)
+	protected function loadParametersXml($parametersNode, $configPath)
 	{
 		foreach($parametersNode->getElements() as $element)
 		{
@@ -385,11 +385,11 @@ 
 						$this->_parameters[$id]=$value;
 				}
 				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
+					$this->_parameters[$id]=array($type, $properties->toArray());
 				$this->_empty=false;
 			}
 			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
 
@@ -398,14 +398,14 @@ 
 	 * @param array the application PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadExternalPhp($includeNode,$configPath)
+	protected function loadExternalPhp($includeNode, $configPath)
 	{
 		foreach($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
+			$when=isset($include['when']) ?true:false;
 			if(!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
-			$filePath = $include['file'];
+			$filePath=$include['file'];
 			if(isset($this->_includes[$filePath]))
 				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
 			else
@@ -419,7 +419,7 @@ 
 	 * @param TXmlElement the application DOM element
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadExternalXml($includeNode,$configPath)
+	protected function loadExternalXml($includeNode, $configPath)
 	{
 		if(($when=$includeNode->getAttribute('when'))===null)
 			$when=true;

framework/TComponent.php

Doc Comments +3 added lines, -2 removed lines

@@ -422,7 +422,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)
@@ -456,7 +456,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)
@@ -793,6 +793,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)

Braces +23 added lines, -46 removed lines

@@ -549,8 +549,7 @@ 
 				}
 				if($callchain->getCount()>0)
 					return call_user_func_array(array($callchain,'call'),$args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -607,29 +606,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]))
@@ -669,18 +664,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)
@@ -698,8 +690,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);
 		}
@@ -727,13 +718,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;
@@ -743,8 +732,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -958,15 +946,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)
 			{
@@ -1045,8 +1031,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler,$priority);
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 			}
 		}
@@ -1169,14 +1154,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))
@@ -1194,12 +1176,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);
@@ -1216,8 +1196,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)
@@ -1253,8 +1232,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());
 		}
@@ -1288,8 +1266,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());
 		}

Spacing +193 added lines, -193 removed lines

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

framework/TComponentReflection.php

Doc Comments +6 added lines

@@ -55,6 +55,9 @@ 
 		$this->reflect();
 	}
 
+	/**
+	 * @param \ReflectionMethod $method
+	 */
 	private function isPropertyMethod($method)
 	{
 		$methodName=$method->getName();
@@ -63,6 +66,9 @@ 
 				&& isset($methodName[3]);
 	}
 
+	/**
+	 * @param \ReflectionMethod $method
+	 */
 	private function isEventMethod($method)
 	{
 		$methodName=$method->getName();

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,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);
@@ -59,14 +59,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]);
 	}
 
@@ -76,7 +76,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())
@@ -85,14 +85,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;
 			}
 		}
@@ -142,7 +142,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}';

framework/Util/IBaseBehavior.php

Doc Comments +3 added lines

@@ -27,11 +27,14 @@
 	/**
 	 * Attaches the behavior object to the component.
 	 * @param CComponent the component that this behavior is to be attached to.
+	 * @param \Prado\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);
 }
\ No newline at end of file