pradosoft / prado

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/IUserManager.php

Doc Comments +3 added lines

@@ -37,6 +37,7 @@ 
 	/**
 	 * Returns a user instance according to auth data stored in a cookie.
 	 * @param THttpCookie the cookie storing user authentication information
+	 * @param \Prado\Web\THttpCookie $cookie
 	 * @return TUser the user instance generated based on the cookie auth data, null if the cookie does not have valid auth data.
 	 * @since 3.1.1
 	 */
@@ -44,7 +45,9 @@ 
 	/**
 	 * Saves user auth data into a cookie.
 	 * @param THttpCookie the cookie to receive the user auth data.
+	 * @param \Prado\Web\THttpCookie $cookie
 	 * @since 3.1.1
+	 * @return void
 	 */
 	public function saveUserToCookie($cookie);
 	/**

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username = null);
+	public function getUser($username=null);
 	/**
 	 * Returns a user instance according to auth data stored in a cookie.
 	 * @param THttpCookie the cookie storing user authentication information

framework/Security/TAuthManager.php

Doc Comments +2 added lines

@@ -228,6 +228,7 @@ 
 	/**
 	 * Sets the URL that the browser should be redirected to when login succeeds.
 	 * @param string the URL to be redirected to.
+	 * @param string $value
 	 */
 	public function setReturnUrl($value)
 	{
@@ -376,6 +377,7 @@ 
 	/**
 	 * Updates the user data stored in session.
 	 * @param IUser user object
+	 * @param TUser $user
 	 * @throws new TConfigurationException if session module is not loaded.
 	 */
 	public function updateSessionUser($user)

Braces +1 added lines, -2 removed lines

@@ -430,8 +430,7 @@
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +49 added lines, -49 removed lines

@@ -47,11 +47,11 @@ 
 	/**
 	 * GET variable name for return url
 	 */
-	const RETURN_URL_VAR = 'ReturnUrl';
+	const RETURN_URL_VAR='ReturnUrl';
 	/**
 	 * @var boolean if the module has been initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var IUserManager user manager instance
 	 */
@@ -63,7 +63,7 @@ 
 	/**
 	 * @var boolean whether authorization should be skipped
 	 */
-	private $_skipAuthorization = false;
+	private $_skipAuthorization=false;
 	/**
 	 * @var string the session var name for storing return URL
 	 */
@@ -71,7 +71,7 @@ 
 	/**
 	 * @var boolean whether to allow auto login (using cookie)
 	 */
-	private $_allowAutoLogin = false;
+	private $_allowAutoLogin=false;
 	/**
 	 * @var string variable name used to store user session or cookie
 	 */
@@ -79,7 +79,7 @@ 
 	/**
 	 * @var integer authentication expiration time in seconds. Defaults to zero (no expiration)
 	 */
-	private $_authExpire = 0;
+	private $_authExpire=0;
 
 	/**
 	 * Initializes this module.
@@ -89,23 +89,23 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager === null)
+		if($this->_userManager===null)
 			throw new TConfigurationException('authmanager_usermanager_required');
-		if($this->_returnUrlVarName === null)
-			$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
-		$application = $this->getApplication();
+		if($this->_returnUrlVarName===null)
+			$this->_returnUrlVarName=$this->getApplication()->getID().':'.self::RETURN_URL_VAR;
+		$application=$this->getApplication();
 		if(is_string($this->_userManager))
 		{
-			if(($users = $application->getModule($this->_userManager)) === null)
+			if(($users=$application->getModule($this->_userManager))===null)
 				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
 			if(!($users instanceof IUserManager))
 				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
-			$this->_userManager = $users;
+			$this->_userManager=$users;
 		}
-		$application->attachEventHandler('OnAuthentication', [$this,'doAuthentication']);
-		$application->attachEventHandler('OnEndRequest', [$this,'leave']);
-		$application->attachEventHandler('OnAuthorization', [$this,'doAuthorization']);
-		$this->_initialized = true;
+		$application->attachEventHandler('OnAuthentication', [$this, 'doAuthentication']);
+		$application->attachEventHandler('OnEndRequest', [$this, 'leave']);
+		$application->attachEventHandler('OnAuthorization', [$this, 'doAuthorization']);
+		$this->_initialized=true;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
 		if(!is_string($provider) && !($provider instanceof IUserManager))
 			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
-		$this->_userManager = $provider;
+		$this->_userManager=$provider;
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	public function setLoginPage($pagePath)
 	{
-		$this->_loginPage = $pagePath;
+		$this->_loginPage=$pagePath;
 	}
 
 	/**
@@ -159,9 +159,9 @@ 
 	{
 		$this->onAuthenticate($param);
 
-		$service = $this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
-			$this->_skipAuthorization = true;
+		$service=$this->getService();
+		if(($service instanceof TPageService) && $service->getRequestedPagePath()===$this->getLoginPage())
+			$this->_skipAuthorization=true;
 	}
 
 	/**
@@ -188,15 +188,15 @@ 
 	 */
 	public function leave($sender, $param)
 	{
-		$application = $this->getApplication();
-		if($application->getResponse()->getStatusCode() === 401)
+		$application=$this->getApplication();
+		if($application->getResponse()->getStatusCode()===401)
 		{
-			$service = $application->getService();
+			$service=$application->getService();
 			if($service instanceof TPageService)
 			{
-				$returnUrl = $application->getRequest()->getRequestUri();
+				$returnUrl=$application->getRequest()->getRequestUri();
 				$this->setReturnUrl($returnUrl);
-				$url = $service->constructUrl($this->getLoginPage());
+				$url=$service->constructUrl($this->getLoginPage());
 				$application->getResponse()->redirect($url);
 			}
 		}
@@ -215,7 +215,7 @@ 
 	 */
 	public function setReturnUrlVarName($value)
 	{
-		$this->_returnUrlVarName = $value;
+		$this->_returnUrlVarName=$value;
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	 */
 	public function setAllowAutoLogin($value)
 	{
-		$this->_allowAutoLogin = TPropertyValue::ensureBoolean($value);
+		$this->_allowAutoLogin=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setAuthExpire($value)
 	{
-		$this->_authExpire = TPropertyValue::ensureInteger($value);
+		$this->_authExpire=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -281,31 +281,31 @@ 
 	 */
 	public function onAuthenticate($param)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 
 		// restoring user info from session
-		if(($session = $application->getSession()) === null)
+		if(($session=$application->getSession())===null)
 			throw new TConfigurationException('authmanager_session_required');
 		$session->open();
-		$sessionInfo = $session->itemAt($this->getUserKey());
-		$user = $this->_userManager->getUser(null)->loadFromString($sessionInfo);
+		$sessionInfo=$session->itemAt($this->getUserKey());
+		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire > 0 && !$user->getIsGuest() &&
-		($expiretime = $session->itemAt('AuthExpireTime')) && $expiretime < time();
+		$isAuthExpired=$this->_authExpire > 0 && !$user->getIsGuest() &&
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
 		{
-			$cookie = $this->getRequest()->getCookies()->itemAt($this->getUserKey());
+			$cookie=$this->getRequest()->getCookies()->itemAt($this->getUserKey());
 			if($cookie instanceof THttpCookie)
 			{
-				if(($user2 = $this->_userManager->getUserFromCookie($cookie)) !== null)
+				if(($user2=$this->_userManager->getUserFromCookie($cookie))!==null)
 				{
-					$user = $user2;
+					$user=$user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
-					$isAuthExpired = false;
+					$isAuthExpired=false;
 				}
 			}
 		}
@@ -344,7 +344,7 @@ 
 	 */
 	public function onAuthorize($param)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 		if($this->hasEventHandler('OnAuthorize'))
 			$this->raiseEvent('OnAuthorize', $this, $application);
 		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
@@ -360,8 +360,8 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey === null)
-			$this->_userKey = $this->generateUserKey();
+		if($this->_userKey===null)
+			$this->_userKey=$this->generateUserKey();
 		return $this->_userKey;
 	}
 
@@ -371,7 +371,7 @@ 
 	 */
 	protected function generateUserKey()
 	{
-		return md5($this->getApplication()->getUniqueID() . 'prado:user');
+		return md5($this->getApplication()->getUniqueID().'prado:user');
 	}
 
 	/**
@@ -383,7 +383,7 @@ 
 	{
 		if(!$user->getIsGuest())
 		{
-			if(($session = $this->getSession()) === null)
+			if(($session=$this->getSession())===null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
 				$session->add($this->getUserKey(), $user->saveToString());
@@ -398,7 +398,7 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user = $this->_userManager->getUser($username)) === null)
+		if(($user=$this->_userManager->getUser($username))===null)
 			return false;
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
@@ -414,18 +414,18 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username, $password, $expire = 0)
+	public function login($username, $password, $expire=0)
 	{
 		if($this->_userManager->validateUser($username, $password))
 		{
-			if(($user = $this->_userManager->getUser($username)) === null)
+			if(($user=$this->_userManager->getUser($username))===null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
 			if($expire > 0)
 			{
-				$cookie = new THttpCookie($this->getUserKey(), '');
+				$cookie=new THttpCookie($this->getUserKey(), '');
 				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
@@ -443,13 +443,13 @@ 
 	 */
 	public function logout()
 	{
-		if(($session = $this->getSession()) === null)
+		if(($session=$this->getSession())===null)
 			throw new TConfigurationException('authmanager_session_required');
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
 		if($this->getAllowAutoLogin())
 		{
-			$cookie = new THttpCookie($this->getUserKey(), '');
+			$cookie=new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

framework/Security/TDbUserManager.php

Doc Comments +2 added lines, -1 removed lines

@@ -162,7 +162,8 @@
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
-	 * @return TDbConnection the created DB connection
+	 * @param string $connectionID
+	 * @return \Prado\Data\TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
 	protected function createDbConnection($connectionID)

Spacing +16 added lines, -16 removed lines

@@ -48,10 +48,10 @@ 
  */
 class TDbUserManager extends \Prado\TModule implements IUserManager
 {
-	private $_connID = '';
+	private $_connID='';
 	private $_conn;
-	private $_guestName = 'Guest';
-	private $_userClass = '';
+	private $_guestName='Guest';
+	private $_userClass='';
 	private $_userFactory;
 
 	/**
@@ -61,9 +61,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass === '')
+		if($this->_userClass==='')
 			throw new TConfigurationException('dbusermanager_userclass_required');
-		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
+		$this->_userFactory=Prado::createComponent($this->_userClass, $this);
 		if(!($this->_userFactory instanceof TDbUser))
 			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
@@ -81,7 +81,7 @@ 
 	 */
 	public function setUserClass($value)
 	{
-		$this->_userClass = $value;
+		$this->_userClass=$value;
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setGuestName($value)
 	{
-		$this->_guestName = $value;
+		$this->_guestName=$value;
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username = null)
+	public function getUser($username=null)
 	{
-		if($username === null)
+		if($username===null)
 		{
-			$user = Prado::createComponent($this->_userClass, $this);
+			$user=Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
 		}
@@ -144,7 +144,7 @@ 
 	 */
 	public function setConnectionID($value)
 	{
-		$this->_connID = $value;
+		$this->_connID=$value;
 	}
 
 	/**
@@ -152,9 +152,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn === null)
+		if($this->_conn===null)
 		{
-			$this->_conn = $this->createDbConnection($this->_connID);
+			$this->_conn=$this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
 		}
 		return $this->_conn;
@@ -168,9 +168,9 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID !== '')
+		if($connectionID!=='')
 		{
-			$conn = $this->getApplication()->getModule($connectionID);
+			$conn=$this->getApplication()->getModule($connectionID);
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
@@ -198,7 +198,7 @@ 
 	 */
 	public function saveUserToCookie($cookie)
 	{
-		$user = $this->getApplication()->getUser();
+		$user=$this->getApplication()->getUser();
 		if($user instanceof TDbUser)
 			$user->saveUserToCookie($cookie);
 	}

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

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)

Spacing +82 added lines, -82 removed lines

@@ -29,35 +29,35 @@ 
 	/**
 	 * @var array list of application initial property values, indexed by property names
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var array list of namespaces to be used
 	 */
-	private $_usings = [];
+	private $_usings=[];
 	/**
 	 * @var array list of path aliases, indexed by alias names
 	 */
-	private $_aliases = [];
+	private $_aliases=[];
 	/**
 	 * @var array list of module configurations
 	 */
-	private $_modules = [];
+	private $_modules=[];
 	/**
 	 * @var array list of service configurations
 	 */
-	private $_services = [];
+	private $_services=[];
 	/**
 	 * @var array list of parameters
 	 */
-	private $_parameters = [];
+	private $_parameters=[];
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes = [];
+	private $_includes=[];
 	/**
 	 * @var boolean whether this configuration contains actual stuff
 	 */
-	private $_empty = true;
+	private $_empty=true;
 
 	/**
 	 * Parses the application configuration file.
@@ -66,14 +66,14 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
+			$fcontent=include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
-			$dom = new TXmlDocument;
+			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
 			$this->loadFromXml($dom, dirname($fname));
 		}
@@ -99,9 +99,9 @@ 
 		{
 			foreach($config['application'] as $name => $value)
 			{
-				$this->_properties[$name] = $value;
+				$this->_properties[$name]=$value;
 			}
-			$this->_empty = false;
+			$this->_empty=false;
 		}
 
 		if(isset($config['paths']) && is_array($config['paths']))
@@ -130,8 +130,8 @@ 
 		// application properties
 		foreach($dom->getAttributes() as $name => $value)
 		{
-			$this->_properties[$name] = $value;
-			$this->_empty = false;
+			$this->_properties[$name]=$value;
+			$this->_empty=false;
 		}
 
 		foreach($dom->getElements() as $element)
@@ -171,16 +171,16 @@ 
 		{
 			foreach($pathsNode['aliases'] as $id => $path)
 			{
-				$path = str_replace('\\', '/', $path);
+				$path=str_replace('\\', '/', $path);
 				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
-					$p = realpath($path);
+					$p=realpath($path);
 				else
-					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-				if($p === false || !is_dir($p))
+					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+				if($p===false || !is_dir($p))
 					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 				if(isset($this->_aliases[$id]))
 					throw new TConfigurationException('appconfig_alias_redefined', $id);
-				$this->_aliases[$id] = $p;
+				$this->_aliases[$id]=$p;
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 		{
 			foreach($pathsNode['using'] as $namespace)
 			{
-				$this->_usings[] = $namespace;
+				$this->_usings[]=$namespace;
 			}
 		}
 	}
@@ -206,31 +206,31 @@ 
 			{
 				case 'alias':
 				{
-					if(($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
+					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
 					{
-						$path = str_replace('\\', '/', $path);
+						$path=str_replace('\\', '/', $path);
 						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
-							$p = realpath($path);
+							$p=realpath($path);
 						else
-							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-						if($p === false || !is_dir($p))
+							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+						if($p===false || !is_dir($p))
 							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined', $id);
-						$this->_aliases[$id] = $p;
+						$this->_aliases[$id]=$p;
 					}
 					else
 						throw new TConfigurationException('appconfig_alias_invalid');
-					$this->_empty = false;
+					$this->_empty=false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace = $element->getAttribute('namespace')) !== null)
-						$this->_usings[] = $namespace;
+					if(($namespace=$element->getAttribute('namespace'))!==null)
+						$this->_usings[]=$namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
-					$this->_empty = false;
+					$this->_empty=false;
 					break;
 				}
 				default:
@@ -250,17 +250,17 @@ 
 		{
 			if(!isset($module['class']))
 				throw new TConfigurationException('appconfig_moduletype_required', $id);
-			$type = $module['class'];
+			$type=$module['class'];
 			unset($module['class']);
-			$properties = [];
+			$properties=[];
 			if(isset($module['properties']))
 			{
-				$properties = $module['properties'];
+				$properties=$module['properties'];
 				unset($module['properties']);
 			}
-			$properties['id'] = $id;
-			$this->_modules[$id] = [$type,$properties,$module];
-			$this->_empty = false;
+			$properties['id']=$id;
+			$this->_modules[$id]=[$type, $properties, $module];
+			$this->_empty=false;
 		}
 	}
 
@@ -273,19 +273,19 @@ 
 	{
 		foreach($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'module')
+			if($element->getTagName()==='module')
 			{
-				$properties = $element->getAttributes();
-				$id = $properties->itemAt('id');
-				$type = $properties->remove('class');
-				if($type === null)
+				$properties=$element->getAttributes();
+				$id=$properties->itemAt('id');
+				$type=$properties->remove('class');
+				if($type===null)
 					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
+				if($id===null)
+					$this->_modules[]=[$type, $properties->toArray(), $element];
 				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
-				$this->_empty = false;
+					$this->_modules[$id]=[$type, $properties->toArray(), $element];
+				$this->_empty=false;
 			}
 			else
 				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
@@ -303,12 +303,12 @@ 
 		{
 			if(!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
-			$type = $service['class'];
-			$properties = isset($service['properties']) ? $service['properties'] : [];
+			$type=$service['class'];
+			$properties=isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
-			$properties['id'] = $id;
-			$this->_services[$id] = [$type,$properties,$service];
-			$this->_empty = false;
+			$properties['id']=$id;
+			$this->_services[$id]=[$type, $properties, $service];
+			$this->_empty=false;
 		}
 	}
 
@@ -321,16 +321,16 @@ 
 	{
 		foreach($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'service')
+			if($element->getTagName()==='service')
 			{
-				$properties = $element->getAttributes();
-				if(($id = $properties->itemAt('id')) === null)
+				$properties=$element->getAttributes();
+				if(($id=$properties->itemAt('id'))===null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type = $properties->remove('class')) === null)
+				if(($type=$properties->remove('class'))===null)
 					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id] = [$type,$properties->toArray(),$element];
-				$this->_empty = false;
+				$this->_services[$id]=[$type, $properties->toArray(), $element];
+				$this->_empty=false;
 			}
 			else
 				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
@@ -350,16 +350,16 @@ 
 			{
 				if(isset($parameter['class']))
 				{
-					$type = $parameter['class'];
+					$type=$parameter['class'];
 					unset($parameter['class']);
-					$properties = isset($service['properties']) ? $service['properties'] : [];
-					$properties['id'] = $id;
-					$this->_parameters[$id] = [$type,$properties];
+					$properties=isset($service['properties']) ? $service['properties'] : [];
+					$properties['id']=$id;
+					$this->_parameters[$id]=[$type, $properties];
 				}
 			}
 			else
 			{
-				$this->_parameters[$id] = $parameter;
+				$this->_parameters[$id]=$parameter;
 			}
 		}
 	}
@@ -373,21 +373,21 @@ 
 	{
 		foreach($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'parameter')
+			if($element->getTagName()==='parameter')
 			{
-				$properties = $element->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				$properties=$element->getAttributes();
+				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type = $properties->remove('class')) === null)
+				if(($type=$properties->remove('class'))===null)
 				{
-					if(($value = $properties->remove('value')) === null)
-						$this->_parameters[$id] = $element;
+					if(($value=$properties->remove('value'))===null)
+						$this->_parameters[$id]=$element;
 					else
-						$this->_parameters[$id] = $value;
+						$this->_parameters[$id]=$value;
 				}
 				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
-				$this->_empty = false;
+					$this->_parameters[$id]=[$type, $properties->toArray()];
+				$this->_empty=false;
 			}
 			else
 				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
@@ -403,15 +403,15 @@ 
 	{
 		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 . ')';
+				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
 			else
-				$$this->_includes[$filePath] = $when;
-			$this->_empty = false;
+				$$this->_includes[$filePath]=$when;
+			$this->_empty=false;
 		}
 	}
 
@@ -422,15 +422,15 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when = $includeNode->getAttribute('when')) === null)
-			$when = true;
-		if(($filePath = $includeNode->getAttribute('file')) === null)
+		if(($when=$includeNode->getAttribute('when'))===null)
+			$when=true;
+		if(($filePath=$includeNode->getAttribute('file'))===null)
 			throw new TConfigurationException('appconfig_includefile_required');
 		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
 		else
-			$this->_includes[$filePath] = $when;
-		$this->_empty = false;
+			$this->_includes[$filePath]=$when;
+		$this->_empty=false;
 	}
 
 	/**

Braces +7 added lines, -14 removed lines

@@ -70,8 +70,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -218,8 +217,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;
@@ -286,8 +284,7 @@ 
 				else
 					$this->_modules[$id] = [$type,$properties->toArray(),$element];
 				$this->_empty = false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
@@ -331,8 +328,7 @@ 
 				$element->setParent(null);
 				$this->_services[$id] = [$type,$properties->toArray(),$element];
 				$this->_empty = false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
@@ -356,8 +352,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = [$type,$properties];
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -384,12 +379,10 @@ 
 						$this->_parameters[$id] = $element;
 					else
 						$this->_parameters[$id] = $value;
-				}
-				else
+				} else
 					$this->_parameters[$id] = [$type,$properties->toArray()];
 				$this->_empty = false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}

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)

Spacing +195 added lines, -195 removed lines

@@ -301,23 +301,23 @@ 
 	/**
 	 * @var array event handler lists
 	 */
-	private $_e = [];
+	private $_e=[];
 
 	/**
 	 * @var boolean if listening is enabled.  Automatically turned on or off in
 	 * constructor according to {@link getAutoGlobalListen}.  Default false, off
 	 */
-	private $_listeningenabled = false;
+	private $_listeningenabled=false;
 
 	/**
 	 * @var array static registered global event handler lists
 	 */
-	private static $_ue = [];
+	private static $_ue=[];
 
 	/**
 	 * @var boolean if object behaviors are on or off.  default true, on
 	 */
-	private $_behaviorsenabled = true;
+	private $_behaviorsenabled=true;
 
 	/**
 	 * @var TPriorityMap list of object behaviors
@@ -327,13 +327,13 @@ 
 	/**
 	 * @var array static global class behaviors, these behaviors are added upon instantiation of a class
 	 */
-	private static $_um = [];
+	private static $_um=[];
 
 
 	/**
 	 * @const string the name of the global {@link raiseEvent} listener
 	 */
-	const GLOBAL_RAISE_EVENT_LISTENER = 'fxGlobalListener';
+	const GLOBAL_RAISE_EVENT_LISTENER='fxGlobalListener';
 
 
 	/**
@@ -347,7 +347,7 @@ 
 		if($this->getAutoGlobalListen())
 			$this->listen();
 
-		$classes = array_reverse($this->getClassHierarchy(true));
+		$classes=array_reverse($this->getClassHierarchy(true));
 		foreach($classes as $class) {
 			if(isset(self::$_um[$class]))
 				$this->attachBehaviors(self::$_um[$class]);
@@ -390,7 +390,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;
 	}
 
 
@@ -400,11 +400,11 @@ 
 	 * @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 = [$class];
-		while($class = get_parent_class($class)){array_unshift($classes, $class);}
+		$class=get_class($this);
+		$classes=[$class];
+		while($class=get_parent_class($class)) {array_unshift($classes, $class); }
 		if($lowercase)
 			return array_map('strtolower', $classes);
 		return $classes;
@@ -429,17 +429,17 @@ 
 		if($this->_listeningenabled)
 			return;
 
-		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
+		$fx=array_filter(get_class_methods($this), [$this, 'filter_prado_fx']);
 
 		foreach($fx as $func)
-			$this->attachEventHandler($func, [$this,$func]);
+			$this->attachEventHandler($func, [$this, $func]);
 
 		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this, '__dycall']);
 			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
-		$this->_listeningenabled = true;
+		$this->_listeningenabled=true;
 
 		$this->dyListen($fx);
 
@@ -463,17 +463,17 @@ 
 		if(!$this->_listeningenabled)
 			return;
 
-		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
+		$fx=array_filter(get_class_methods($this), [$this, 'filter_prado_fx']);
 
 		foreach($fx as $func)
-			$this->detachEventHandler($func, [$this,$func]);
+			$this->detachEventHandler($func, [$this, $func]);
 
 		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this, '__dycall']);
 			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
-		$this->_listeningenabled = false;
+		$this->_listeningenabled=false;
 
 		$this->dyUnlisten($fx);
 
@@ -515,41 +515,41 @@ 
 	 */
 	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);
-			$jsmethod = $getset . 'js' . $propname;
+			$propname=substr($method, 3);
+			$jsmethod=$getset.'js'.$propname;
 			if(method_exists($this, $jsmethod))
 			{
 				if(count($args) > 0)
 					if($args[0] && !($args[0] instanceof TJavaScriptString))
-						$args[0] = new TJavaScriptString($args[0]);
-				return call_user_func_array([$this,$jsmethod], $args);
+						$args[0]=new TJavaScriptString($args[0]);
+				return call_user_func_array([$this, $jsmethod], $args);
 			}
 
-			if (($getset == 'set') && method_exists($this, 'getjs' . $propname))
+			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);
+				$callchain=new TCallChain($method);
 				foreach($this->_m->toArray() as $behavior)
 				{
 					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods)))
 					{
-						$behavior_args = $args;
+						$behavior_args=$args;
 						if($behavior instanceof IClassBehavior)
 							array_unshift($behavior_args, $this);
-						$callchain->addCall([$behavior,$method], $behavior_args);
+						$callchain->addCall([$behavior, $method], $behavior_args);
 					}
 
 				}
 				if($callchain->getCount() > 0)
-					return call_user_func_array([$callchain,'call'], $args);
+					return call_user_func_array([$callchain, 'call'], $args);
 			}
 			else
 			{
@@ -559,21 +559,21 @@ 
 					{
 						if($behavior instanceof IClassBehavior)
 							array_unshift($args, $this);
-						return call_user_func_array([$behavior,$method], $args);
+						return call_user_func_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 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)) {
+		if(!method_exists($this, $method)) {
 			throw new TApplicationException('component_method_undefined', get_class($this), $method);
 		}
 	}
@@ -604,30 +604,30 @@ 
 	 */
 	public function __get($name)
 	{
-		if(method_exists($this, $getter = 'get' . $name))
+		if(method_exists($this, $getter='get'.$name))
 		{
 			// getting a property
 			return $this->$getter();
 		}
-		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
+		elseif(method_exists($this, $jsgetter='getjs'.$name))
 		{
 			// getting a javascript property
-			return (string)$this->$jsgetter();
+			return (string) $this->$jsgetter();
 		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		elseif(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			// getting an event (handler list)
-			$name = strtolower($name);
+			$name=strtolower($name);
 			if(!isset($this->_e[$name]))
-				$this->_e[$name] = new TPriorityList;
+				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
 		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		elseif(strncasecmp($name, 'fx', 2)===0)
 		{
 			// getting a global event (handler list)
-			$name = strtolower($name);
+			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name] = new TPriorityList;
+				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
 		}
 		elseif($this->_behaviorsenabled)
@@ -635,7 +635,7 @@ 
 			// getting a behavior property/event (handler list)
 			if(isset($this->_m[$name]))
 				return $this->_m[$name];
-			elseif($this->_m !== null)
+			elseif($this->_m!==null)
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -665,30 +665,30 @@ 
 	 */
 	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);
 		}
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
+		elseif(method_exists($this, $jssetter='setjs'.$name))
 		{
 			if($value && !($value instanceof TJavaScriptString))
-				$value = new TJavaScriptString($value);
+				$value=new TJavaScriptString($value);
 			return $this->$jssetter($value);
 		}
-		elseif((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0)
+		elseif((strncasecmp($name, 'on', 2)===0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2)===0)
 		{
 			return $this->attachEventHandler($name, $value);
 		}
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			$sets = 0;
+			$sets=0;
 			foreach($this->_m->toArray() as $behavior)
 			{
 				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
 					(property_exists($behavior, $name) || $behavior->canSetProperty($name) || $behavior->hasEvent($name))) {
-					$behavior->$name = $value;
+					$behavior->$name=$value;
 					$sets++;
 				}
 			}
@@ -696,7 +696,7 @@ 
 
 		}
 
-		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);
 		}
@@ -720,21 +720,21 @@ 
 	 */
 	public function __isset($name)
 	{
-		if(method_exists($this, $getter = 'get' . $name))
-			return $this->$getter() !== null;
-		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
-			return $this->$jsgetter() !== null;
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		if(method_exists($this, $getter='get'.$name))
+			return $this->$getter()!==null;
+		elseif(method_exists($this, $jsgetter='getjs'.$name))
+			return $this->$jsgetter()!==null;
+		elseif(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
-			$name = strtolower($name);
+			$name=strtolower($name);
 			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
 		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		elseif(strncasecmp($name, 'fx', 2)===0)
 		{
-			$name = strtolower($name);
+			$name=strtolower($name);
 			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
 		}
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				return true;
@@ -761,20 +761,20 @@ 
 	 */
 	public function __unset($name)
 	{
-		if(method_exists($this, $setter = 'set' . $name))
+		if(method_exists($this, $setter='set'.$name))
 			$this->$setter(null);
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
+		elseif(method_exists($this, $jssetter='setjs'.$name))
 			$this->$jssetter(null);
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		elseif(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 			$this->_e[strtolower($name)]->clear();
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		elseif(strncasecmp($name, 'fx', 2)===0)
 			$this->getEventHandlers($name)->remove([$this, $name]);
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				$this->detachBehavior($name);
 			else {
-				$unset = 0;
+				$unset=0;
 				foreach($this->_m->toArray() as $behavior)
 				{
 					if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
@@ -782,10 +782,10 @@ 
 						$unset++;
 					}
 				}
-				if(!$unset && method_exists($this, 'get' . $name))
+				if(!$unset && method_exists($this, 'get'.$name))
 					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 			}
-		} elseif(method_exists($this, 'get' . $name))
+		} elseif(method_exists($this, 'get'.$name))
 			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 	}
 
@@ -812,9 +812,9 @@ 
 	 */
 	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;
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -836,9 +836,9 @@ 
 	 */
 	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;
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -861,9 +861,9 @@ 
 	 */
 	public function getSubProperty($path)
 	{
-		$object = $this;
+		$object=$this;
 		foreach(explode('.', $path) as $property)
-			$object = $object->$property;
+			$object=$object->$property;
 		return $object;
 	}
 
@@ -879,15 +879,15 @@ 
 	 */
 	public function setSubProperty($path, $value)
 	{
-		$object = $this;
-		if(($pos = strrpos($path, '.')) === false)
-			$property = $path;
+		$object=$this;
+		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;
+		$object->$property=$value;
 	}
 
 	/**
@@ -904,10 +904,10 @@ 
 	 */
 	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;
 
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -927,14 +927,14 @@ 
 	 */
 	public function hasEventHandler($name)
 	{
-		$name = strtolower($name);
-		if(strncasecmp($name, 'fx', 2) === 0)
+		$name=strtolower($name);
+		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)
 				return true;
-			elseif($this->_m !== null && $this->_behaviorsenabled) {
+			elseif($this->_m!==null && $this->_behaviorsenabled) {
 				foreach($this->_m->toArray() as $behavior)
 				{
 					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name))
@@ -953,21 +953,21 @@ 
 	 */
 	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);
+			$name=strtolower($name);
 			if(!isset($this->_e[$name]))
-				$this->_e[$name] = new TPriorityList;
+				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
 		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		elseif(strncasecmp($name, 'fx', 2)===0)
 		{
-			$name = strtolower($name);
+			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name] = new TPriorityList;
+				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
 		}
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		elseif($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -1023,7 +1023,7 @@ 
 	 * 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);
 	}
@@ -1038,7 +1038,7 @@ 
 	 * 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))
 		{
@@ -1126,75 +1126,75 @@ 
 	 * @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;
+		$p=$param;
 		if(is_callable($responsetype))
 		{
-			$postfunction = $responsetype;
-			$responsetype = null;
+			$postfunction=$responsetype;
+			$responsetype=null;
 		}
 
-		if($responsetype === null)
-			$responsetype = TEventResults::EVENT_RESULT_FILTER;
+		if($responsetype===null)
+			$responsetype=TEventResults::EVENT_RESULT_FILTER;
 
-		$name = strtolower($name);
-		$responses = [];
+		$name=strtolower($name);
+		$responses=[];
 
-		$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))
 		{
-			$handlers = $this->getEventHandlers($name);
-			$handlerArray = $handlers->toArray();
-			if(strncasecmp($name, 'fx', 2) === 0 && $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))
 			{
-				$globalhandlers = $this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
-				$handlerArray = array_merge($globalhandlers->toArrayBelowPriority(0), $handlerArray, $globalhandlers->toArrayAbovePriority(0));
+				$globalhandlers=$this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+				$handlerArray=array_merge($globalhandlers->toArrayBelowPriority(0), $handlerArray, $globalhandlers->toArrayAbovePriority(0));
 			}
-			$response = null;
+			$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, [$sender,$param,$name]);
+							if($method=='__dycall')
+								$response=$object->__dycall($name, [$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);
 					}
 					else
-						$response = call_user_func($handler, $sender, $param, $name);
+						$response=call_user_func($handler, $sender, $param, $name);
 				}
 				elseif(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, [$sender,$param,$name]);
+							if($method=='__dycall')
+								$response=$object->__dycall($name, [$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]);
@@ -1206,25 +1206,25 @@ 
 				$this->dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $response);
 
 				if($postfunction)
-					$response = call_user_func_array($postfunction, [$sender,$param,$this,$response]);
+					$response=call_user_func_array($postfunction, [$sender, $param, $this, $response]);
 
 				if($responsetype & TEventResults::EVENT_RESULT_ALL)
-					$responses[] = ['sender' => $sender,'param' => $param,'response' => $response];
+					$responses[]=['sender' => $sender, 'param' => $param, 'response' => $response];
 				else
-					$responses[] = $response;
+					$responses[]=$response;
 
-				if($response !== null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD))
-					$param = $response;
+				if($response!==null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD))
+					$param=$response;
 
 			}
 		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name))
+		elseif(strncasecmp($name, 'on', 2)===0 && !$this->hasEvent($name))
 			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 
 		if($responsetype & TEventResults::EVENT_RESULT_FILTER)
-			$responses = array_filter($responses);
+			$responses=array_filter($responses);
 
-		$responses = $this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
+		$responses=$this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
 
 		return $responses;
 	}
@@ -1248,10 +1248,10 @@ 
 	 */
 	public function evaluateExpression($expression)
 	{
-		$expression = $this->dyEvaluateExpressionFilter($expression);
+		$expression=$this->dyEvaluateExpressionFilter($expression);
 		try
 		{
-			if(eval("\$result=$expression;") === false)
+			if(eval("\$result=$expression;")===false)
 				throw new \Exception('');
 			return $result;
 		}
@@ -1280,13 +1280,13 @@ 
 	 */
 	public function evaluateStatements($statements)
 	{
-		$statements = $this->dyEvaluateStatementsFilter($statements);
+		$statements=$this->dyEvaluateStatementsFilter($statements);
 		try
 		{
 			ob_start();
-			if(eval($statements) === false)
+			if(eval($statements)===false)
 				throw new \Exception('');
-			$content = ob_get_contents();
+			$content=ob_get_contents();
 			ob_end_clean();
 			return $content;
 		}
@@ -1317,7 +1317,7 @@ 
 	 */
 	public function createdOnTemplate($parent)
 	{
-		$parent = $this->dyCreatedOnTemplate($parent);
+		$parent=$this->dyCreatedOnTemplate($parent);
 		$parent->addParsedObject($this);
 	}
 
@@ -1390,24 +1390,24 @@ 
 	 * @throws TInvalidOperationException if the class behavior is already defined
 	 * @since 3.2.3
 	 */
-	public static function attachClassBehavior($name, $behavior, $class = null, $priority = null) {
+	public static function attachClassBehavior($name, $behavior, $class=null, $priority=null) {
 		if(!$class && function_exists('get_called_class'))
-			$class = get_called_class();
+			$class=get_called_class();
 		if(!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
 
 		if(!is_string($name))
-			$name = get_class($name);
-		$class = strtolower($class);
-		if($class === 'tcomponent')
+			$name=get_class($name);
+		$class=strtolower($class);
+		if($class==='tcomponent')
 			throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
 		if(empty(self::$_um[$class]))
-			self::$_um[$class] = [];
+			self::$_um[$class]=[];
 		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] = [$name => $param] + self::$_um[$class];
-		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
+		$param=new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
+		self::$_um[$class]=[$name => $param] + self::$_um[$class];
+		$behaviorObject=is_string($behavior) ? new $behavior : $behavior;
 		return $behaviorObject->raiseEvent('fxAttachClassBehavior', null, $param);
 	}
 
@@ -1424,21 +1424,21 @@ 
 	 * not supplied as a parameter.
 	 * @since 3.2.3
 	 */
-	public static function detachClassBehavior($name, $class = null, $priority = false) {
+	public static function detachClassBehavior($name, $class=null, $priority=false) {
 		if(!$class && function_exists('get_called_class'))
-			$class = get_called_class();
+			$class=get_called_class();
 		if(!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
 
-		$class = strtolower($class);
+		$class=strtolower($class);
 		if(!is_string($name))
-			$name = get_class($name);
+			$name=get_class($name);
 		if(empty(self::$_um[$class]) || !isset(self::$_um[$class][$name]))
 			return false;
-		$param = self::$_um[$class][$name];
-		$behavior = $param->getBehavior();
+		$param=self::$_um[$class][$name];
+		$behavior=$param->getBehavior();
 		unset(self::$_um[$class][$name]);
-		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
+		$behaviorObject=is_string($behavior) ? new $behavior : $behavior;
 		return $behaviorObject->raiseEvent('fxDetachClassBehavior', null, $param);
 	}
 
@@ -1451,7 +1451,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1477,15 +1477,15 @@ 
 	{
 		if($this instanceof $class)
 			return true;
-		if($this->_m !== null && $this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
+		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;
@@ -1518,13 +1518,13 @@ 
 	 */
 	public function detachBehaviors($behaviors)
 	{
-		if($this->_m !== null)
+		if($this->_m!==null)
 		{
 			foreach($behaviors as $name => $behavior)
 				if($behavior instanceof TClassBehaviorEventParameter)
 					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
 		}
 	}
 
@@ -1534,11 +1534,11 @@ 
 	 */
 	public function clearBehaviors()
 	{
-		if($this->_m !== null)
+		if($this->_m!==null)
 		{
 			foreach($this->_m->toArray() as $name => $behavior)
 				$this->detachBehavior($name);
-			$this->_m = null;
+			$this->_m=null;
 		}
 	}
 
@@ -1562,16 +1562,16 @@ 
 	 * @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);
+			$behavior=Prado::createComponent($behavior);
 		if(!($behavior instanceof IBaseBehavior))
 			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;
+		if($this->_m===null)
+			$this->_m=new TPriorityMap;
 		$behavior->attach($this);
 		$this->dyAttachBehavior($name, $behavior);
 		$this->_m->add($name, $behavior, $priority);
@@ -1595,12 +1595,12 @@ 
 	 * @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);
+			$behavior=$this->_m->itemAt($name);
 			$this->_m->remove($name, $priority);
 			$this->dyDetachBehavior($name, $behavior);
 			return $behavior;
@@ -1623,7 +1623,7 @@ 
 	{
 		if(!$this->_behaviorsenabled)
 		{
-			$this->_behaviorsenabled = true;
+			$this->_behaviorsenabled=true;
 			$this->dyEnableBehaviors();
 		}
 	}
@@ -1645,7 +1645,7 @@ 
 		if($this->_behaviorsenabled)
 		{
 			$this->dyDisableBehaviors();
-			$this->_behaviorsenabled = false;
+			$this->_behaviorsenabled=false;
 		}
 	}
 
@@ -1678,7 +1678,7 @@ 
 	 */
 	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]);
@@ -1706,7 +1706,7 @@ 
 	 */
 	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]);
@@ -1724,9 +1724,9 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
-		$a = array_keys($a);
-		$exprops = [];
+		$a=(array) $this;
+		$a=array_keys($a);
+		$exprops=[];
 		$this->_getZappableSleepProps($exprops);
 		return array_diff($a, $exprops);
 	}
@@ -1739,13 +1739,13 @@ 
 	 */
 	protected function _getZappableSleepProps(&$exprops)
 	{
-		if($this->_listeningenabled === false)
-			$exprops[] = "\0Prado\TComponent\0_listeningenabled";
-		if($this->_behaviorsenabled === true)
-			$exprops[] = "\0Prado\TComponent\0_behaviorsenabled";
-		if ($this->_e === [])
-			$exprops[] = "\0Prado\TComponent\0_e";
-		if ($this->_m === null)
-			$exprops[] = "\0Prado\TComponent\0_m";
+		if($this->_listeningenabled===false)
+			$exprops[]="\0Prado\TComponent\0_listeningenabled";
+		if($this->_behaviorsenabled===true)
+			$exprops[]="\0Prado\TComponent\0_behaviorsenabled";
+		if($this->_e===[])
+			$exprops[]="\0Prado\TComponent\0_e";
+		if($this->_m===null)
+			$exprops[]="\0Prado\TComponent\0_m";
 	}
 }
\ No newline at end of file

Braces +23 added lines, -46 removed lines

@@ -550,8 +550,7 @@ 
 				}
 				if($callchain->getCount() > 0)
 					return call_user_func_array([$callchain,'call'], $args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -608,29 +607,25 @@ 
 		{
 			// getting a property
 			return $this->$getter();
-		}
-		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
+		} elseif(method_exists($this, $jsgetter = 'getjs' . $name))
 		{
 			// getting a javascript property
 			return (string)$this->$jsgetter();
-		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		} elseif(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];
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(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];
-		}
-		elseif($this->_behaviorsenabled)
+		} elseif($this->_behaviorsenabled)
 		{
 			// getting a behavior property/event (handler list)
 			if(isset($this->_m[$name]))
@@ -670,18 +665,15 @@ 
 			if(strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral))
 				$value = new TJavaScriptLiteral($value);
 			return $this->$setter($value);
-		}
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
+		} elseif(method_exists($this, $jssetter = 'setjs' . $name))
 		{
 			if($value && !($value instanceof TJavaScriptString))
 				$value = new TJavaScriptString($value);
 			return $this->$jssetter($value);
-		}
-		elseif((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0)
+		} elseif((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0)
 		{
 			return $this->attachEventHandler($name, $value);
-		}
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			$sets = 0;
 			foreach($this->_m->toArray() as $behavior)
@@ -699,8 +691,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);
 		}
@@ -728,13 +719,11 @@ 
 		{
 			$name = strtolower($name);
 			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(strncasecmp($name, 'fx', 2) === 0)
 		{
 			$name = strtolower($name);
 			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
-		}
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				return true;
@@ -744,8 +733,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -959,15 +947,13 @@ 
 			if(!isset($this->_e[$name]))
 				$this->_e[$name] = new TPriorityList;
 			return $this->_e[$name];
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(strncasecmp($name, 'fx', 2) === 0)
 		{
 			$name = strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name] = new TPriorityList;
 			return self::$_ue[$name];
-		}
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -1046,8 +1032,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 			}
 		}
@@ -1170,14 +1155,11 @@ 
 								$response = $object->__dycall($name, [$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);
-				}
-				elseif(is_callable($handler, true))
+				} elseif(is_callable($handler, true))
 				{
 					list($object, $method) = $handler;
 					if(is_string($object))
@@ -1195,12 +1177,10 @@ 
 								$response = $object->__dycall($name, [$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);
@@ -1217,8 +1197,7 @@ 
 					$param = $response;
 
 			}
-		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name))
+		} elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name))
 			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 
 		if($responsetype & TEventResults::EVENT_RESULT_FILTER)
@@ -1254,8 +1233,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());
 		}
@@ -1289,8 +1267,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());
 		}

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

framework/Util/IBehavior.php

Doc Comments +2 added lines

@@ -34,6 +34,8 @@
 	public function getEnabled();
 	/**
 	 * @param boolean whether this behavior is enabled
+	 * @param boolean $value
+	 * @return void
 	 */
 	public function setEnabled($value);
 }
\ No newline at end of file

framework/Web/Services/TRpcApiProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	}
 
 	/**
-	 * @return rpc server instance
+	 * @return TRpcServer server instance
 	 */
 	public function getRpcServer()
 	{

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 */
 	public function __construct(TRpcServer $rpcServer)
 	{
-		$this->rpcServer = $rpcServer;
+		$this->rpcServer=$rpcServer;
 
 		foreach($this->registerMethods() as $_methodName => $_methodDetails)
 			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);