pradosoft / prado

framework/Security/TUser.php

Doc Comments +4 added lines

@@ -72,6 +72,7 @@ 
 
 	/**
 	 * @param string username
+	 * @param string $value
 	 */
 	public function setName($value)
 	{
@@ -88,6 +89,7 @@ 
 
 	/**
 	 * @param boolean if the user is a guest
+	 * @param boolean $value
 	 */
 	public function setIsGuest($value)
 	{
@@ -169,6 +171,7 @@ 
 	 *
 	 * @param string variable name
 	 * @param mixed default value
+	 * @param string $key
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
@@ -189,6 +192,7 @@ 
 	 * @param string variable name
 	 * @param mixed variable value
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
+	 * @param string $key
 	 * @see getState
 	 */
 	protected function setState($key, $value, $defaultValue = null)

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var boolean whether user state is changed
 	 */
-	private $_stateChanged = false;
+	private $_stateChanged=false;
 	/**
 	 * @var IUserManager user manager
 	 */
@@ -49,8 +49,8 @@ 
 	 */
 	public function __construct(IUserManager $manager)
 	{
-		$this->_state = [];
-		$this->_manager = $manager;
+		$this->_state=[];
+		$this->_manager=$manager;
 		$this->setName($manager->getGuestName());
 	}
 
@@ -91,7 +91,7 @@ 
 	 */
 	public function setIsGuest($value)
 	{
-		if($isGuest = TPropertyValue::ensureBoolean($value))
+		if($isGuest=TPropertyValue::ensureBoolean($value))
 		{
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles([]);
@@ -116,11 +116,11 @@ 
 			$this->setState('Roles', $value, []);
 		else
 		{
-			$roles = [];
+			$roles=[];
 			foreach(explode(',', $value) as $role)
 			{
-				if(($role = trim($role)) !== '')
-					$roles[] = $role;
+				if(($role=trim($role))!=='')
+					$roles[]=$role;
 			}
 			$this->setState('Roles', $roles, []);
 		}
@@ -133,7 +133,7 @@ 
 	public function isInRole($role)
 	{
 		foreach($this->getRoles() as $r)
-			if(strcasecmp($role, $r) === 0)
+			if(strcasecmp($role, $r)===0)
 				return true;
 		return false;
 	}
@@ -153,9 +153,9 @@ 
 	public function loadFromString($data)
 	{
 		if(!empty($data))
-			$this->_state = unserialize($data);
+			$this->_state=unserialize($data);
 		if(!is_array($this->_state))
-			$this->_state = [];
+			$this->_state=[];
 		return $this;
 	}
 
@@ -172,9 +172,9 @@ 
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
-	protected function getState($key, $defaultValue = null)
+	protected function getState($key, $defaultValue=null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -191,13 +191,13 @@ 
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
 	 * @see getState
 	 */
-	protected function setState($key, $value, $defaultValue = null)
+	protected function setState($key, $value, $defaultValue=null)
 	{
-		if($value === $defaultValue)
+		if($value===$defaultValue)
 			unset($this->_state[$key]);
 		else
-			$this->_state[$key] = $value;
-		$this->_stateChanged = true;
+			$this->_state[$key]=$value;
+		$this->_stateChanged=true;
 	}
 
 	/**
@@ -213,7 +213,7 @@ 
 	 */
 	public function setStateChanged($value)
 	{
-		$this->_stateChanged = TPropertyValue::ensureBoolean($value);
+		$this->_stateChanged=TPropertyValue::ensureBoolean($value);
 	}
 }
 

framework/TApplication.php

Doc Comments +9 added lines

@@ -317,6 +317,7 @@ 
 	 * to determine the application configuration file,
 	 * application root path and the runtime path.
 	 * @param string the application root path or the application configuration file
+	 * @param string $basePath
 	 * @see setBasePath
 	 * @see setRuntimePath
 	 * @see setConfigurationFile
@@ -415,6 +416,7 @@ 
 	 * A global value is one that is persistent across users sessions and requests.
 	 * @param string the name of the value to be returned
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
+	 * @param integer $defaultValue
 	 * @return mixed the global value corresponding to $key
 	 */
 	public function getGlobalState($key, $defaultValue = null)
@@ -431,6 +433,7 @@ 
 	 * @param mixed the global value to be set
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
+	 * @param string $key
 	 */
 	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
@@ -545,6 +548,7 @@ 
 
 	/**
 	 * @param string the directory containing the application configuration file
+	 * @param string $value
 	 */
 	public function setBasePath($value)
 	{
@@ -561,6 +565,7 @@ 
 
 	/**
 	 * @param string the application configuration file (absolute path)
+	 * @param string $value
 	 */
 	public function setConfigurationFile($value)
 	{
@@ -577,6 +582,7 @@ 
 
 	/**
 	 * @param string the application configuration type. 'xml' and 'php' are valid values
+	 * @param string $value
 	 */
 	public function setConfigurationType($value)
 	{
@@ -632,6 +638,7 @@ 
 
 	/**
 	 * @param string the directory storing cache data and application-level persistent data. (absolute path)
+	 * @param string $value
 	 */
 	public function setRuntimePath($value)
 	{
@@ -1063,6 +1070,7 @@ 
 	 * The service instance will be created. Its properties will be initialized
 	 * and the configurations will be applied, if any.
 	 * @param string service ID
+	 * @param string $serviceID
 	 */
 	public function startService($serviceID)
 	{
@@ -1101,6 +1109,7 @@ 
 	 * This method is invoked when an exception is raised during the lifecycles
 	 * of the application.
 	 * @param mixed event parameter
+	 * @param \Exception $param
 	 */
 	public function onError($param)
 	{

Spacing +124 added lines, -124 removed lines

@@ -96,48 +96,48 @@ 
 	/**
 	 * Page service ID
 	 */
-	const PAGE_SERVICE_ID = 'page';
+	const PAGE_SERVICE_ID='page';
 	/**
 	 * Application configuration file name
 	 */
-	const CONFIG_FILE_XML = 'application.xml';
+	const CONFIG_FILE_XML='application.xml';
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_XML = '.xml';
+	const CONFIG_FILE_EXT_XML='.xml';
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
-	const CONFIG_TYPE_XML = 'xml';
+	const CONFIG_TYPE_XML='xml';
 	/**
 	 * Application configuration file name
 	 */
-	const CONFIG_FILE_PHP = 'application.php';
+	const CONFIG_FILE_PHP='application.php';
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_PHP = '.php';
+	const CONFIG_FILE_EXT_PHP='.php';
 	/**
 	 * Configuration file type, application.php and config.php
 	 */
-	const CONFIG_TYPE_PHP = 'php';
+	const CONFIG_TYPE_PHP='php';
 	/**
 	 * Runtime directory name
 	 */
-	const RUNTIME_PATH = 'runtime';
+	const RUNTIME_PATH='runtime';
 	/**
 	 * Config cache file
 	 */
-	const CONFIGCACHE_FILE = 'config.cache';
+	const CONFIGCACHE_FILE='config.cache';
 	/**
 	 * Global data file
 	 */
-	const GLOBAL_FILE = 'global.cache';
+	const GLOBAL_FILE='global.cache';
 
 	/**
 	 * @var array list of events that define application lifecycles
 	 */
-	private static $_steps = [
+	private static $_steps=[
 		'onBeginRequest',
 		'onLoadState',
 		'onLoadStateComplete',
@@ -164,7 +164,7 @@ 
 	/**
 	 * @var boolean whether the request is completed
 	 */
-	private $_requestCompleted = false;
+	private $_requestCompleted=false;
 	/**
 	 * @var integer application state
 	 */
@@ -180,11 +180,11 @@ 
 	/**
 	 * @var array list of loaded application modules
 	 */
-	private $_modules = [];
+	private $_modules=[];
 	/**
 	 * @var array list of application modules yet to be loaded
 	 */
-	private $_lazyModules = [];
+	private $_lazyModules=[];
 	/**
 	 * @var \Prado\Collections\TMap list of application parameters
 	 */
@@ -212,11 +212,11 @@ 
 	/**
 	 * @var boolean if any global state is changed during the current request
 	 */
-	private $_stateChanged = false;
+	private $_stateChanged=false;
 	/**
 	 * @var array global variables (persistent across sessions, requests)
 	 */
-	private $_globals = [];
+	private $_globals=[];
 	/**
 	 * @var string cache file
 	 */
@@ -268,12 +268,12 @@ 
 	/**
 	 * @var TApplicationMode application mode
 	 */
-	private $_mode = TApplicationMode::Debug;
+	private $_mode=TApplicationMode::Debug;
 
 	/**
 	 * @var string Customizable page service ID
 	 */
-	private $_pageServiceID = self::PAGE_SERVICE_ID;
+	private $_pageServiceID=self::PAGE_SERVICE_ID;
 
 	/**
 	 * Constructor.
@@ -293,7 +293,7 @@ 
 	 * @param boolean whether to cache application configuration. Defaults to true.
 	 * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid.
 	 */
-	public function __construct($basePath = 'protected', $cacheConfig = true, $configType = self::CONFIG_TYPE_XML)
+	public function __construct($basePath='protected', $cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
 	{
 		// register application as a singleton
 		Prado::setApplication($this);
@@ -301,12 +301,12 @@ 
 		$this->resolvePaths($basePath);
 
 		if($cacheConfig)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
 
 		// generates unique ID by hashing the runtime path
-		$this->_uniqueID = md5($this->_runtimePath);
-		$this->_parameters = new \Prado\Collections\TMap;
-		$this->_services = [$this->getPageServiceID() => ['TPageService',[],null]];
+		$this->_uniqueID=md5($this->_runtimePath);
+		$this->_parameters=new \Prado\Collections\TMap;
+		$this->_services=[$this->getPageServiceID() => ['TPageService', [], null]];
 
 		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
@@ -324,28 +324,28 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath = realpath($basePath)) === false)
+		if(empty($basePath) || ($basePath=realpath($basePath))===false)
 			throw new TConfigurationException('application_basepath_invalid', $basePath);
-		if(is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
-			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
+		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
+			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
 		elseif(is_file($basePath))
 		{
-			$configFile = $basePath;
-			$basePath = dirname($configFile);
+			$configFile=$basePath;
+			$basePath=dirname($configFile);
 		}
 		else
-			$configFile = null;
+			$configFile=null;
 
 		// determine runtime path
-		$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
+		$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
 		if(is_writable($runtimePath))
 		{
-			if($configFile !== null)
+			if($configFile!==null)
 			{
-				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
+				$runtimePath.=DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
 				if(!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath) === false)
+					if(@mkdir($runtimePath)===false)
 						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
@@ -369,16 +369,16 @@ 
 		try
 		{
 			$this->initApplication();
-			$n = count(self::$_steps);
-			$this->_step = 0;
-			$this->_requestCompleted = false;
+			$n=count(self::$_steps);
+			$this->_step=0;
+			$this->_requestCompleted=false;
 			while($this->_step < $n)
 			{
-				if($this->_mode === TApplicationMode::Off)
+				if($this->_mode===TApplicationMode::Off)
 					throw new THttpException(503, 'application_unavailable');
 				if($this->_requestCompleted)
 					break;
-				$method = self::$_steps[$this->_step];
+				$method=self::$_steps[$this->_step];
 				Prado::trace("Executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
@@ -398,7 +398,7 @@ 
 	 */
 	public function completeRequest()
 	{
-		$this->_requestCompleted = true;
+		$this->_requestCompleted=true;
 	}
 
 	/**
@@ -417,9 +417,9 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @return mixed the global value corresponding to $key
 	 */
-	public function getGlobalState($key, $defaultValue = null)
+	public function getGlobalState($key, $defaultValue=null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -432,13 +432,13 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
 	 */
-	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
+	public function setGlobalState($key, $value, $defaultValue=null, $forceSave=false)
 	{
-		$this->_stateChanged = true;
-		if($value === $defaultValue)
+		$this->_stateChanged=true;
+		if($value===$defaultValue)
 			unset($this->_globals[$key]);
 		else
-			$this->_globals[$key] = $value;
+			$this->_globals[$key]=$value;
 		if($forceSave)
 			$this->saveGlobals();
 	}
@@ -451,7 +451,7 @@ 
 	 */
 	public function clearGlobalState($key)
 	{
-		$this->_stateChanged = true;
+		$this->_stateChanged=true;
 		unset($this->_globals[$key]);
 	}
 
@@ -463,7 +463,7 @@ 
 	 */
 	protected function loadGlobals()
 	{
-		$this->_globals = $this->getApplicationStatePersister()->load();
+		$this->_globals=$this->getApplicationStatePersister()->load();
 	}
 
 	/**
@@ -474,7 +474,7 @@ 
 	{
 		if($this->_stateChanged)
 		{
-			$this->_stateChanged = false;
+			$this->_stateChanged=false;
 			$this->getApplicationStatePersister()->save($this->_globals);
 		}
 	}
@@ -492,7 +492,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -508,7 +508,7 @@ 
 	 */
 	public function setPageServiceID($value)
 	{
-		$this->_pageServiceID = $value;
+		$this->_pageServiceID=$value;
 	}
 
 	/**
@@ -532,7 +532,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->_mode = TPropertyValue::ensureEnum($value, '\Prado\TApplicationMode');
+		$this->_mode=TPropertyValue::ensureEnum($value, '\Prado\TApplicationMode');
 	}
 
 	/**
@@ -548,7 +548,7 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		$this->_basePath = $value;
+		$this->_basePath=$value;
 	}
 
 	/**
@@ -564,7 +564,7 @@ 
 	 */
 	public function setConfigurationFile($value)
 	{
-		$this->_configFile = $value;
+		$this->_configFile=$value;
 	}
 
 	/**
@@ -580,7 +580,7 @@ 
 	 */
 	public function setConfigurationType($value)
 	{
-		$this->_configType = $value;
+		$this->_configType=$value;
 	}
 
 	/**
@@ -588,15 +588,15 @@ 
 	 */
 	public function getConfigurationFileExt()
 	{
-		if($this->_configFileExt === null)
+		if($this->_configFileExt===null)
 		{
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_PHP;
 					break;
 				default:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_XML;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_XML;
 			}
 		}
 		return $this->_configFileExt;
@@ -608,15 +608,15 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if($fileName==null)
 		{
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$fileName = TApplication::CONFIG_FILE_PHP;
+					$fileName=TApplication::CONFIG_FILE_PHP;
 					break;
 				default:
-					$fileName = TApplication::CONFIG_FILE_XML;
+					$fileName=TApplication::CONFIG_FILE_XML;
 			}
 		}
 		return $fileName;
@@ -635,11 +635,11 @@ 
 	 */
 	public function setRuntimePath($value)
 	{
-		$this->_runtimePath = $value;
+		$this->_runtimePath=$value;
 		if($this->_cacheFile)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
 		// generates unique ID by hashing the runtime path
-		$this->_uniqueID = md5($this->_runtimePath);
+		$this->_uniqueID=md5($this->_runtimePath);
 	}
 
 	/**
@@ -655,7 +655,7 @@ 
 	 */
 	public function setService($value)
 	{
-		$this->_service = $value;
+		$this->_service=$value;
 	}
 
 	/**
@@ -664,12 +664,12 @@ 
 	 * @param string ID of the module
 	 * @param IModule module object or null if the module has not been loaded yet
 	 */
-	public function setModule($id, IModule $module = null)
+	public function setModule($id, IModule $module=null)
 	{
 		if(isset($this->_modules[$id]))
 			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
-			$this->_modules[$id] = $module;
+			$this->_modules[$id]=$module;
 	}
 
 	/**
@@ -681,9 +681,9 @@ 
 			return null;
 
 		// force loading of a lazy module
-		if($this->_modules[$id] === null)
+		if($this->_modules[$id]===null)
 		{
-			$module = $this->internalLoadModule($id, true);
+			$module=$this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
 		}
 
@@ -718,7 +718,7 @@ 
 	{
 		if(!$this->_request)
 		{
-			$this->_request = new \Prado\Web\THttpRequest;
+			$this->_request=new \Prado\Web\THttpRequest;
 			$this->_request->init(null);
 		}
 		return $this->_request;
@@ -729,7 +729,7 @@ 
 	 */
 	public function setRequest(THttpRequest $request)
 	{
-		$this->_request = $request;
+		$this->_request=$request;
 	}
 
 	/**
@@ -739,7 +739,7 @@ 
 	{
 		if(!$this->_response)
 		{
-			$this->_response = new THttpResponse;
+			$this->_response=new THttpResponse;
 			$this->_response->init(null);
 		}
 		return $this->_response;
@@ -750,7 +750,7 @@ 
 	 */
 	public function setResponse(THttpResponse $response)
 	{
-		$this->_response = $response;
+		$this->_response=$response;
 	}
 
 	/**
@@ -760,7 +760,7 @@ 
 	{
 		if(!$this->_session)
 		{
-			$this->_session = new THttpSession;
+			$this->_session=new THttpSession;
 			$this->_session->init(null);
 		}
 		return $this->_session;
@@ -771,7 +771,7 @@ 
 	 */
 	public function setSession(THttpSession $session)
 	{
-		$this->_session = $session;
+		$this->_session=$session;
 	}
 
 	/**
@@ -781,7 +781,7 @@ 
 	{
 		if(!$this->_errorHandler)
 		{
-			$this->_errorHandler = new TErrorHandler;
+			$this->_errorHandler=new TErrorHandler;
 			$this->_errorHandler->init(null);
 		}
 		return $this->_errorHandler;
@@ -792,7 +792,7 @@ 
 	 */
 	public function setErrorHandler(TErrorHandler $handler)
 	{
-		$this->_errorHandler = $handler;
+		$this->_errorHandler=$handler;
 	}
 
 	/**
@@ -802,7 +802,7 @@ 
 	{
 		if(!$this->_security)
 		{
-			$this->_security = new TSecurityManager;
+			$this->_security=new TSecurityManager;
 			$this->_security->init(null);
 		}
 		return $this->_security;
@@ -813,7 +813,7 @@ 
 	 */
 	public function setSecurityManager(TSecurityManager $sm)
 	{
-		$this->_security = $sm;
+		$this->_security=$sm;
 	}
 
 	/**
@@ -823,7 +823,7 @@ 
 	{
 		if(!$this->_assetManager)
 		{
-			$this->_assetManager = new TAssetManager;
+			$this->_assetManager=new TAssetManager;
 			$this->_assetManager->init(null);
 		}
 		return $this->_assetManager;
@@ -834,7 +834,7 @@ 
 	 */
 	public function setAssetManager(TAssetManager $value)
 	{
-		$this->_assetManager = $value;
+		$this->_assetManager=$value;
 	}
 
 	/**
@@ -844,7 +844,7 @@ 
 	{
 		if(!$this->_statePersister)
 		{
-			$this->_statePersister = new TApplicationStatePersister;
+			$this->_statePersister=new TApplicationStatePersister;
 			$this->_statePersister->init(null);
 		}
 		return $this->_statePersister;
@@ -855,7 +855,7 @@ 
 	 */
 	public function setApplicationStatePersister(IStatePersister $persister)
 	{
-		$this->_statePersister = $persister;
+		$this->_statePersister=$persister;
 	}
 
 	/**
@@ -871,7 +871,7 @@ 
 	 */
 	public function setCache(\Prado\Caching\ICache $cache)
 	{
-		$this->_cache = $cache;
+		$this->_cache=$cache;
 	}
 
 	/**
@@ -887,18 +887,18 @@ 
 	 */
 	public function setUser(\Prado\Security\IUser $user)
 	{
-		$this->_user = $user;
+		$this->_user=$user;
 	}
 
 	/**
 	 * @param boolean whether to create globalization if it does not exist
 	 * @return TGlobalization globalization module
 	 */
-	public function getGlobalization($createIfNotExists = true)
+	public function getGlobalization($createIfNotExists=true)
 	{
-		if($this->_globalization === null && $createIfNotExists)
+		if($this->_globalization===null && $createIfNotExists)
 		{
-			$this->_globalization = new TGlobalization;
+			$this->_globalization=new TGlobalization;
 			$this->_globalization->init(null);
 		}
 		return $this->_globalization;
@@ -909,7 +909,7 @@ 
 	 */
 	public function setGlobalization(\Prado\I18N\TGlobalization $glob)
 	{
-		$this->_globalization = $glob;
+		$this->_globalization=$glob;
 	}
 
 	/**
@@ -917,8 +917,8 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules === null)
-			$this->_authRules = new \Prado\Security\TAuthorizationRuleCollection;
+		if($this->_authRules===null)
+			$this->_authRules=new \Prado\Security\TAuthorizationRuleCollection;
 		return $this->_authRules;
 	}
 
@@ -927,9 +927,9 @@ 
 		return '\Prado\TApplicationConfiguration';
 	}
 
-	protected function internalLoadModule($id, $force = false)
+	protected function internalLoadModule($id, $force=false)
 	{
-		list($moduleClass, $initProperties, $configElement) = $this->_lazyModules[$id];
+		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
 		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
 			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", '\Prado\TApplication');
@@ -938,24 +938,24 @@ 
 		}
 
 		Prado::trace("Loading module $id ({$moduleClass})", '\Prado\TApplication');
-		$module = Prado::createComponent($moduleClass);
+		$module=Prado::createComponent($moduleClass);
 		foreach($initProperties as $name => $value)
 		{
-			if($name === 'lazy') continue;
+			if($name==='lazy') continue;
 			$module->setSubProperty($name, $value);
 		}
 		$this->setModule($id, $module);
 		// keep the key to avoid reuse of the old module id
-		$this->_lazyModules[$id] = null;
+		$this->_lazyModules[$id]=null;
 
-		return [$module,$configElement];
+		return [$module, $configElement];
 	}
 	/**
 	 * Applies an application configuration.
 	 * @param TApplicationConfiguration the configuration
 	 * @param boolean whether the configuration is specified within a service.
 	 */
-	public function applyConfiguration($config, $withinService = false)
+	public function applyConfiguration($config, $withinService=false)
 	{
 		if($config->getIsEmpty())
 			return;
@@ -974,14 +974,14 @@ 
 		}
 
 		if(empty($this->_services))
-			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+			$this->_services=[$this->getPageServiceID() => ['Prado\Web\Services\TPageService', [], null]];
 
 		// load parameters
 		foreach($config->getParameters() as $id => $parameter)
 		{
 			if(is_array($parameter))
 			{
-				$component = Prado::createComponent($parameter[0]);
+				$component=Prado::createComponent($parameter[0]);
 				foreach($parameter[1] as $name => $value)
 					$component->setSubProperty($name, $value);
 				$this->_parameters->add($id, $component);
@@ -991,33 +991,33 @@ 
 		}
 
 		// load and init modules specified in app config
-		$modules = [];
+		$modules=[];
 		foreach($config->getModules() as $id => $moduleConfig)
 		{
 			if(!is_string($id))
-				$id = '_module' . count($this->_lazyModules);
-			$this->_lazyModules[$id] = $moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[] = $module;
+				$id='_module'.count($this->_lazyModules);
+			$this->_lazyModules[$id]=$moduleConfig;
+			if($module=$this->internalLoadModule($id))
+				$modules[]=$module;
 		}
 		foreach($modules as $module)
 			$module[0]->init($module[1]);
 
 		// load service
 		foreach($config->getServices() as $serviceID => $serviceConfig)
-			$this->_services[$serviceID] = $serviceConfig;
+			$this->_services[$serviceID]=$serviceConfig;
 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath => $condition)
 		{
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			if($condition!==true)
+				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
+				if(($path=Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt()))===null || !is_file($path))
 					throw new TConfigurationException('application_includefile_invalid', $filePath);
-				$cn = $this->getApplicationConfigurationClass();
-				$c = new $cn;
+				$cn=$this->getApplicationConfigurationClass();
+				$c=new $cn;
 				$c->loadFromFile($path);
 				$this->applyConfiguration($c, $withinService);
 			}
@@ -1037,23 +1037,23 @@ 
 	{
 		Prado::trace('Initializing application', 'Prado\TApplication');
 
-		if($this->_configFile !== null)
+		if($this->_configFile!==null)
 		{
-			if($this->_cacheFile === null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
+			if($this->_cacheFile===null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
-				$config = new TApplicationConfiguration;
+				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile !== null)
+				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
-				$config = unserialize(file_get_contents($this->_cacheFile));
+				$config=unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config, false);
 		}
 
-		if(($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
-			$serviceID = $this->getPageServiceID();
+		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
+			$serviceID=$this->getPageServiceID();
 
 		$this->startService($serviceID);
 	}
@@ -1068,8 +1068,8 @@ 
 	{
 		if(isset($this->_services[$serviceID]))
 		{
-			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
-			$service = Prado::createComponent($serviceClass);
+			list($serviceClass, $initProperties, $configElement)=$this->_services[$serviceID];
+			$service=Prado::createComponent($serviceClass);
 			if(!($service instanceof IService))
 				throw new THttpException(500, 'application_service_invalid', $serviceClass);
 			if(!$service->getEnabled())
@@ -1080,10 +1080,10 @@ 
 			foreach($initProperties as $name => $value)
 				$service->setSubProperty($name, $value);
 
-			if($configElement !== null)
+			if($configElement!==null)
 			{
-				$config = new TApplicationConfiguration;
-				if($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
+				$config=new TApplicationConfiguration;
+				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
 					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
 					$config->loadFromXml($configElement, $this->getBasePath());
@@ -1226,7 +1226,7 @@ 
 	 * Flushes output to client side.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushOutput($continueBuffering = true)
+	public function flushOutput($continueBuffering=true)
 	{
 		$this->getResponse()->flush($continueBuffering);
 	}
@@ -1238,7 +1238,7 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
+		$this->saveGlobals(); // save global state
 		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }

Braces +6 added lines, -12 removed lines

@@ -332,8 +332,7 @@ 
 		{
 			$configFile = $basePath;
 			$basePath = dirname($configFile);
-		}
-		else
+		} else
 			$configFile = null;
 
 		// determine runtime path
@@ -353,8 +352,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
@@ -383,8 +381,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -985,8 +982,7 @@ 
 				foreach($parameter[1] as $name => $value)
 					$component->setSubProperty($name, $value);
 				$this->_parameters->add($id, $component);
-			}
-			else
+			} else
 				$this->_parameters->add($id, $parameter);
 		}
 
@@ -1045,8 +1041,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile !== null)
 					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
-			}
-			else
+			} else
 				$config = unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config, false);
@@ -1091,8 +1086,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 

framework/TApplicationComponent.php

Doc Comments +5 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequest the current user request
+	 * @return Web\THttpRequest the current user request
 	 */
 	public function getRequest()
 	{
@@ -59,7 +59,7 @@ 
 	}
 
 	/**
-	 * @return THttpResponse the response
+	 * @return Web\THttpResponse the response
 	 */
 	public function getResponse()
 	{
@@ -67,7 +67,7 @@ 
 	}
 
 	/**
-	 * @return THttpSession user session
+	 * @return Web\THttpSession user session
 	 */
 	public function getSession()
 	{
@@ -94,6 +94,7 @@ 
 	 *
 	 * @param string path of the asset that is relative to the directory containing the specified class file.
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
+	 * @param string $assetPath
 	 * @return string URL to the asset path.
 	 */
 	public function publishAsset($assetPath, $className = null)
@@ -108,6 +109,7 @@ 
 	/**
 	 * Publishes a file or directory and returns its URL.
 	 * @param string absolute path of the file or directory to be published
+	 * @param string $fullPath
 	 * @return string URL to the published file or directory
 	 */
 	public function publishFilePath($fullPath, $checkTimestamp = false)

Spacing +6 added lines, -6 removed lines

@@ -96,12 +96,12 @@ 
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
 	 * @return string URL to the asset path.
 	 */
-	public function publishAsset($assetPath, $className = null)
+	public function publishAsset($assetPath, $className=null)
 	{
-		if($className === null)
-			$className = get_class($this);
-		$class = new \ReflectionClass($className);
-		$fullPath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $assetPath;
+		if($className===null)
+			$className=get_class($this);
+		$class=new \ReflectionClass($className);
+		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);
 	}
 
@@ -110,7 +110,7 @@ 
 	 * @param string absolute path of the file or directory to be published
 	 * @return string URL to the published file or directory
 	 */
-	public function publishFilePath($fullPath, $checkTimestamp = false)
+	public function publishFilePath($fullPath, $checkTimestamp=false)
 	{
 		return Prado::getApplication()->getAssetManager()->publishFilePath($fullPath, $checkTimestamp);
 	}

framework/TComponentReflection.php

Doc Comments +6 added lines

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

Spacing +30 added lines, -30 removed lines

@@ -36,9 +36,9 @@ 
 class TComponentReflection extends \Prado\TComponent
 {
 	private $_className;
-	private $_properties = [];
-	private $_events = [];
-	private $_methods = [];
+	private $_properties=[];
+	private $_events=[];
+	private $_methods=[];
 
 	/**
 	 * Constructor.
@@ -48,9 +48,9 @@ 
 	public function __construct($component)
 	{
 		if(is_string($component) && class_exists($component, false))
-			$this->_className = $component;
+			$this->_className=$component;
 		elseif(is_object($component))
-			$this->_className = get_class($component);
+			$this->_className=get_class($component);
 		else
 			throw new TInvalidDataTypeException('componentreflection_class_invalid');
 		$this->reflect();
@@ -58,74 +58,74 @@ 
 
 	private function isPropertyMethod($method)
 	{
-		$methodName = $method->getName();
-		return $method->getNumberOfRequiredParameters() === 0
-				&& strncasecmp($methodName, 'get', 3) === 0
+		$methodName=$method->getName();
+		return $method->getNumberOfRequiredParameters()===0
+				&& strncasecmp($methodName, 'get', 3)===0
 				&& isset($methodName[3]);
 	}
 
 	private function isEventMethod($method)
 	{
-		$methodName = $method->getName();
-		return strncasecmp($methodName, 'on', 2) === 0
+		$methodName=$method->getName();
+		return strncasecmp($methodName, 'on', 2)===0
 				&& isset($methodName[2]);
 	}
 
 	private function reflect()
 	{
-		$class = new \ReflectionClass($this->_className);
-		$properties = [];
-		$events = [];
-		$methods = [];
-		$isComponent = is_subclass_of($this->_className, 'TComponent') || strcasecmp($this->_className, 'TComponent') === 0;
+		$class=new \ReflectionClass($this->_className);
+		$properties=[];
+		$events=[];
+		$methods=[];
+		$isComponent=is_subclass_of($this->_className, 'TComponent') || strcasecmp($this->_className, 'TComponent')===0;
 		foreach($class->getMethods() as $method)
 		{
 			if($method->isPublic() || $method->isProtected())
 			{
-				$methodName = $method->getName();
+				$methodName=$method->getName();
 				if(!$method->isStatic() && $isComponent)
 				{
 					if($this->isPropertyMethod($method))
-						$properties[substr($methodName, 3)] = $method;
+						$properties[substr($methodName, 3)]=$method;
 					elseif($this->isEventMethod($method))
 					{
-						$methodName[0] = 'O';
-						$events[$methodName] = $method;
+						$methodName[0]='O';
+						$events[$methodName]=$method;
 					}
 				}
-				if(strncmp($methodName, '__', 2) !== 0)
-					$methods[$methodName] = $method;
+				if(strncmp($methodName, '__', 2)!==0)
+					$methods[$methodName]=$method;
 			}
 		}
-		$reserved = [];
+		$reserved=[];
 		ksort($properties);
 		foreach($properties as $name => $method)
 		{
-			$this->_properties[$name] = [
+			$this->_properties[$name]=[
 				'type' => $this->determinePropertyType($method),
-				'readonly' => !$class->hasMethod('set' . $name),
+				'readonly' => !$class->hasMethod('set'.$name),
 				'protected' => $method->isProtected(),
 				'class' => $method->getDeclaringClass()->getName(),
 				'comments' => $method->getDocComment()
 			];
-			$reserved['get' . strtolower($name)] = 1;
-			$reserved['set' . strtolower($name)] = 1;
+			$reserved['get'.strtolower($name)]=1;
+			$reserved['set'.strtolower($name)]=1;
 		}
 		ksort($events);
 		foreach($events as $name => $method)
 		{
-			$this->_events[$name] = [
+			$this->_events[$name]=[
 				'class' => $method->getDeclaringClass()->getName(),
 				'protected' => $method->isProtected(),
 				'comments' => $method->getDocComment()
 			];
-			$reserved[strtolower($name)] = 1;
+			$reserved[strtolower($name)]=1;
 		}
 		ksort($methods);
 		foreach($methods as $name => $method)
 		{
 			if(!isset($reserved[strtolower($name)]))
-				$this->_methods[$name] = [
+				$this->_methods[$name]=[
 					'class' => $method->getDeclaringClass()->getName(),
 					'protected' => $method->isProtected(),
 					'static' => $method->isStatic(),
@@ -142,7 +142,7 @@ 
 	 */
 	protected function determinePropertyType($method)
 	{
-		$comment = $method->getDocComment();
+		$comment=$method->getDocComment();
 		if(preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
 			return $matches[1];
 		else

framework/Util/TSimpleDateFormatter.php

Doc Comments +11 added lines, -1 removed lines

@@ -65,6 +65,7 @@ 
 	 * Constructor, create a new date time formatter.
 	 * @param string formatting pattern.
 	 * @param string pattern and value charset
+	 * @param string $pattern
 	 */
 	public function __construct($pattern, $charset = 'UTF-8')
 	{
@@ -98,6 +99,7 @@ 
 
 	/**
 	 * @param string formatting charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -172,7 +174,7 @@ 
 	/**
 	 * Gets the time stamp from string or integer.
 	 * @param string|int date to parse
-	 * @return array date info array
+	 * @return \DateTime date info array
 	 */
 	private function getDate($value)
 	{
@@ -324,6 +326,7 @@ 
 
 	/**
 	 * Calculate the length of a string, may be consider iconv_strlen?
+	 * @param string $string
 	 */
 	private function length($string)
 	{
@@ -349,6 +352,9 @@ 
 
 	/**
 	 * Returns true if char at position equals a particular char.
+	 * @param string $string
+	 * @param integer $pos
+	 * @param string $char
 	 */
 	private function charEqual($string, $pos, $char)
 	{
@@ -361,6 +367,10 @@ 
 	 * @param int starting position
 	 * @param int minimum integer length
 	 * @param int maximum integer length
+	 * @param string $str
+	 * @param integer $i
+	 * @param integer|null $minlength
+	 * @param integer|null $maxlength
 	 * @return string integer portion of the string, null otherwise
 	 */
 	private function getInteger($str, $i, $minlength, $maxlength)

Spacing +80 added lines, -80 removed lines

@@ -59,14 +59,14 @@ 
 	 * Charset, default is 'UTF-8'
 	 * @var string
 	 */
-	private $charset = 'UTF-8';
+	private $charset='UTF-8';
 
 	/**
 	 * Constructor, create a new date time formatter.
 	 * @param string formatting pattern.
 	 * @param string pattern and value charset
 	 */
-	public function __construct($pattern, $charset = 'UTF-8')
+	public function __construct($pattern, $charset='UTF-8')
 	{
 		$this->setPattern($pattern);
 		$this->setCharset($charset);
@@ -85,7 +85,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->pattern = $pattern;
+		$this->pattern=$pattern;
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -111,17 +111,17 @@ 
 	 */
 	public function format($value)
 	{
-		$dt = $this->getDate($value);
-		$bits['yyyy'] = $dt->format('Y');
-		$bits['yy'] = $dt->format('y');
+		$dt=$this->getDate($value);
+		$bits['yyyy']=$dt->format('Y');
+		$bits['yy']=$dt->format('y');
 
-		$bits['MM'] = $dt->format('m');
-		$bits['M'] = $dt->format('n');
+		$bits['MM']=$dt->format('m');
+		$bits['M']=$dt->format('n');
 
-		$bits['dd'] = $dt->format('d');
-		$bits['d'] = $dt->format('j');
+		$bits['dd']=$dt->format('d');
+		$bits['d']=$dt->format('j');
 
-		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		$pattern=preg_replace('/M{3,4}/', 'MM', $this->pattern);
 		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
@@ -158,13 +158,13 @@ 
 
 	public function getDayMonthYearOrdering()
 	{
-		$ordering = [];
-		if(is_int($day = strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month = strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year = strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		$ordering=[];
+		if(is_int($day=strpos($this->pattern, 'd')))
+			$ordering['day']=$day;
+		if(is_int($month=strpos($this->pattern, 'M')))
+			$ordering['month']=$month;
+		if(is_int($year=strpos($this->pattern, 'yy')))
+			$ordering['year']=$year;
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -178,10 +178,10 @@ 
 	{
 		if(is_numeric($value))
 		{
-			$date = new \DateTime;
+			$date=new \DateTime;
 			$date->setTimeStamp($value);
 		} else {
-			$date = new \DateTime($value);
+			$date=new \DateTime($value);
 		}
 		return $date;
 	}
@@ -191,10 +191,10 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if($value===null) {
 			return false;
 		} else {
-			return $this->parse($value, false) !== null;
+			return $this->parse($value, false)!==null;
 		}
 	}
 
@@ -204,7 +204,7 @@ 
 	 * @return int date time stamp
 	 * @throws TInvalidDataValueException if date string is malformed.
 	 */
-	public function parse($value, $defaultToCurrentTime = true)
+	public function parse($value, $defaultToCurrentTime=true)
 	{
 		if(is_int($value) || is_float($value))
 			return $value;
@@ -213,109 +213,109 @@ 
 
 		if(empty($this->pattern)) return time();
 
-		$date = time();
+		$date=time();
 
 		if($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
-		$pattern = $this->pattern;
+		$pattern=$this->pattern;
 
-		$i_val = 0;
-		$i_format = 0;
-		$pattern_length = $this->length($pattern);
-		$c = '';
-		$token = '';
-		$x = null; $y = null;
+		$i_val=0;
+		$i_format=0;
+		$pattern_length=$this->length($pattern);
+		$c='';
+		$token='';
+		$x=null; $y=null;
 
 
 		if($defaultToCurrentTime)
 		{
-			$year = "{$date['year']}";
-			$month = $date['mon'];
-			$day = $date['mday'];
+			$year="{$date['year']}";
+			$month=$date['mon'];
+			$day=$date['mday'];
 		}
 		else
 		{
-			$year = null;
-			$month = null;
-			$day = null;
+			$year=null;
+			$month=null;
+			$day=null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
-			$c = $this->charAt($pattern, $i_format);
-			$token = '';
-			while ($this->charEqual($pattern, $i_format, $c)
+			$c=$this->charAt($pattern, $i_format);
+			$token='';
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
-				$token .= $this->charAt($pattern, $i_format++);
+				$token.=$this->charAt($pattern, $i_format++);
 			}
 
-			if ($token == 'yyyy' || $token == 'yy' || $token == 'y')
+			if($token=='yyyy' || $token=='yy' || $token=='y')
 			{
-				if ($token == 'yyyy') { $x = 4;$y = 4; }
-				if ($token == 'yy')   { $x = 2;$y = 2; }
-				if ($token == 'y')    { $x = 2;$y = 4; }
-				$year = $this->getInteger($value, $i_val, $x, $y);
-				if($year === null)
+				if($token=='yyyy') { $x=4; $y=4; }
+				if($token=='yy') { $x=2; $y=2; }
+				if($token=='y') { $x=2; $y=4; }
+				$year=$this->getInteger($value, $i_val, $x, $y);
+				if($year===null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
-				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				$i_val+=strlen($year);
+				if(strlen($year)==2)
 				{
-					$iYear = (int)$year;
+					$iYear=(int) $year;
 					if($iYear > 70)
-						$year = $iYear + 1900;
+						$year=$iYear + 1900;
 					else
-						$year = $iYear + 2000;
+						$year=$iYear + 2000;
 				}
-				$year = (int)$year;
+				$year=(int) $year;
 			}
-			elseif($token == 'MM' || $token == 'M')
+			elseif($token=='MM' || $token=='M')
 			{
-				$month = $this->getInteger($value,$i_val,
+				$month=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12)
+				$iMonth=(int) $month;
+				if($month===null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
-				$i_val += strlen($month);
-				$month = $iMonth;
+				$i_val+=strlen($month);
+				$month=$iMonth;
 			}
-			elseif ($token == 'dd' || $token == 'd')
+			elseif($token=='dd' || $token=='d')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay > 31)
+				$iDay=(int) $day;
+				if($day===null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
-				$i_val += strlen($day);
-				$day = $iDay;
+				$i_val+=strlen($day);
+				$day=$iDay;
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if($this->substring($value, $i_val, $this->length($token))!=$token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
-					$i_val += $this->length($token);
+					$i_val+=$this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val!=$this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if(!$defaultToCurrentTime && ($month===null || $day===null || $year===null))
 			return null;
 		else
 		{
 			if(empty($year)) {
-				$year = date('Y');
+				$year=date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
+			$day=(int) $day <= 0 ? 1 : (int) $day;
+			$month=(int) $month <= 0 ? 1 : (int) $month;
 
-			$s = new \DateTime;
+			$s=new \DateTime;
 			$s->setDate($year, $month, $day);
 			$s->setTime(0, 0, 0);
 			return $s->getTimeStamp();
@@ -352,7 +352,7 @@ 
 	 */
 	private function charEqual($string, $pos, $char)
 	{
-		return $this->charAt($string, $pos) == $char;
+		return $this->charAt($string, $pos)==$char;
 	}
 
 	/**
@@ -366,12 +366,12 @@ 
 	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x=$maxlength; $x >= $minlength; $x--)
 		{
-			$token = $this->substring($str, $i, $x);
-			if ($this->length($token) < $minlength)
+			$token=$this->substring($str, $i, $x);
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;

Braces +4 added lines, -8 removed lines

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

framework/Web/Services/TPageService.php

Doc Comments +6 added lines, -1 removed lines

@@ -170,6 +170,7 @@ 
 	 * parameter initialization, module loadings, page initial properties
 	 * and authorization rules.
 	 * @param TPageConfiguration
+	 * @param TPageConfiguration $pageConfig
 	 */
 	protected function initPageContext($pageConfig)
 	{
@@ -377,6 +378,7 @@ 
 
 	/**
 	 * @param string default page path to be served if no explicit page is request
+	 * @param string $value
 	 * @throws TInvalidOperationException if the page service is initialized
 	 */
 	public function setDefaultPage($value)
@@ -479,7 +481,8 @@ 
 	/**
 	 * Creates a page instance based on requested page path.
 	 * @param string requested page path
-	 * @return TPage the requested page instance
+	 * @param string $pagePath
+	 * @return \Prado\TComponent the requested page instance
 	 * @throws THttpException if requested page path is invalid
 	 * @throws TConfigurationException if the page class cannot be found
 	 */
@@ -527,6 +530,7 @@ 
 	 * Executes a page.
 	 * @param TPage the page instance to be run
 	 * @param array list of initial page properties
+	 * @param \Prado\TComponent $page
 	 */
 	protected function runPage($page, $properties)
 	{
@@ -541,6 +545,7 @@ 
 	 * @param array list of GET parameters, null if no GET parameters required
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
+	 * @param string $pagePath
 	 * @return string URL for the page and GET parameters
 	 */
 	public function constructUrl($pagePath, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)

Spacing +85 added lines, -85 removed lines

@@ -81,31 +81,31 @@ 
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_XML = 'config.xml';
+	const CONFIG_FILE_XML='config.xml';
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_PHP = 'config.php';
+	const CONFIG_FILE_PHP='config.php';
 	/**
 	 * Default base path
 	 */
-	const DEFAULT_BASEPATH = 'Pages';
+	const DEFAULT_BASEPATH='Pages';
 	/**
 	 * Fallback base path - used to be the default up to Prado < 3.2
 	 */
-	const FALLBACK_BASEPATH = 'pages';
+	const FALLBACK_BASEPATH='pages';
 	/**
 	 * Prefix of ID used for storing parsed configuration in cache
 	 */
-	const CONFIG_CACHE_PREFIX = 'prado:pageservice:';
+	const CONFIG_CACHE_PREFIX='prado:pageservice:';
 	/**
 	 * Page template file extension
 	 */
-	const PAGE_FILE_EXT = '.page';
+	const PAGE_FILE_EXT='.page';
 	/**
 	 * Prefix of Pages used for instantiating new pages
 	 */
-	const PAGE_NAMESPACE_PREFIX = 'Application\\Pages\\';
+	const PAGE_NAMESPACE_PREFIX='Application\\Pages\\';
 	/**
 	 * @var string root path of pages
 	 */
@@ -113,16 +113,16 @@ 
 	/**
 	 * @var string base path class in namespace format
 	 */
-	private $_basePageClass = '\Prado\Web\UI\TPage';
+	private $_basePageClass='\Prado\Web\UI\TPage';
 	/**
 	 * @var string clientscript manager class in namespace format
 	 * @since 3.1.7
 	 */
-	private $_clientScriptManagerClass = '\Prado\Web\UI\TClientScriptManager';
+	private $_clientScriptManagerClass='\Prado\Web\UI\TClientScriptManager';
 	/**
 	 * @var string default page
 	 */
-	private $_defaultPage = 'Home';
+	private $_defaultPage='Home';
 	/**
 	 * @var string requested page (path)
 	 */
@@ -134,11 +134,11 @@ 
 	/**
 	 * @var array list of initial page property values
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var boolean whether service is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var TThemeManager theme manager
 	 */
@@ -157,11 +157,11 @@ 
 	{
 		Prado::trace("Initializing TPageService", '\Prado\Web\Services\TPageService');
 
-		$pageConfig = $this->loadPageConfig($config);
+		$pageConfig=$this->loadPageConfig($config);
 
 		$this->initPageContext($pageConfig);
 
-		$this->_initialized = true;
+		$this->_initialized=true;
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	protected function initPageContext($pageConfig)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
 			$application->applyConfiguration($appConfig);
 
@@ -187,20 +187,20 @@ 
 	protected function applyConfiguration($config)
 	{
 		// initial page properties (to be set when page runs)
-		$this->_properties = array_merge($this->_properties, $config->getProperties());
+		$this->_properties=array_merge($this->_properties, $config->getProperties());
 		$this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
-		$pagePath = $this->getRequestedPagePath();
+		$pagePath=$this->getRequestedPagePath();
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath => $params)
 		{
-			list($configPagePath, $condition) = $params;
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			list($configPagePath, $condition)=$params;
+			if($condition!==true)
+				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
+				if(($path=Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
 					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
-				$c = new TPageConfiguration($pagePath);
+				$c=new TPageConfiguration($pagePath);
 				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
@@ -214,9 +214,9 @@ 
 	 */
 	protected function determineRequestedPagePath()
 	{
-		$pagePath = $this->getRequest()->getServiceParameter();
+		$pagePath=$this->getRequest()->getServiceParameter();
 		if(empty($pagePath))
-			$pagePath = $this->getDefaultPage();
+			$pagePath=$this->getDefaultPage();
 		return $pagePath;
 	}
 
@@ -227,14 +227,14 @@ 
 	 */
 	protected function loadPageConfig($config)
 	{
-		$application = $this->getApplication();
-		$pagePath = $this->getRequestedPagePath();
-		if(($cache = $application->getCache()) === null)
+		$application=$this->getApplication();
+		$pagePath=$this->getRequestedPagePath();
+		if(($cache=$application->getCache())===null)
 		{
-			$pageConfig = new TPageConfiguration($pagePath);
-			if($config !== null)
+			$pageConfig=new TPageConfiguration($pagePath);
+			if($config!==null)
 			{
-				if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
 					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
@@ -243,61 +243,61 @@ 
 		}
 		else
 		{
-			$configCached = true;
-			$currentTimestamp = [];
-			$arr = $cache->get(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath);
+			$configCached=true;
+			$currentTimestamp=[];
+			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig, $timestamps) = $arr;
-				if($application->getMode() !== TApplicationMode::Performance)
+				list($pageConfig, $timestamps)=$arr;
+				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName => $timestamp)
 					{
-						if($fileName === 0) // application config file
+						if($fileName===0) // application config file
 						{
-							$appConfigFile = $application->getConfigurationFile();
-							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+							$appConfigFile=$application->getConfigurationFile();
+							$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
-								$configCached = false;
+								$configCached=false;
 						}
 						else
 						{
-							$currentTimestamp[$fileName] = @filemtime($fileName);
+							$currentTimestamp[$fileName]=@filemtime($fileName);
 							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
-								$configCached = false;
+								$configCached=false;
 						}
 					}
 				}
 			}
 			else
 			{
-				$configCached = false;
-				$paths = explode('.', $pagePath);
-				$configPath = $this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
+				$configCached=false;
+				$paths=explode('.', $pagePath);
+				$configPath=$this->getBasePath();
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
 				{
-					$configFile = $configPath . DIRECTORY_SEPARATOR . $fileName;
-					$currentTimestamp[$configFile] = @filemtime($configFile);
-					$configPath .= DIRECTORY_SEPARATOR . $path;
+					$configFile=$configPath.DIRECTORY_SEPARATOR.$fileName;
+					$currentTimestamp[$configFile]=@filemtime($configFile);
+					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
-				$appConfigFile = $application->getConfigurationFile();
-				$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+				$appConfigFile=$application->getConfigurationFile();
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
-				$pageConfig = new TPageConfiguration($pagePath);
-				if($config !== null)
+				$pageConfig=new TPageConfiguration($pagePath);
+				if($config!==null)
 				{
-					if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
 						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, [$pageConfig,$currentTimestamp]);
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, [$pageConfig, $currentTimestamp]);
 			}
 		}
 		return $pageConfig;
@@ -310,7 +310,7 @@ 
 	{
 		if(!$this->_templateManager)
 		{
-			$this->_templateManager = new TTemplateManager;
+			$this->_templateManager=new TTemplateManager;
 			$this->_templateManager->init(null);
 		}
 		return $this->_templateManager;
@@ -321,7 +321,7 @@ 
 	 */
 	public function setTemplateManager(TTemplateManager $value)
 	{
-		$this->_templateManager = $value;
+		$this->_templateManager=$value;
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	{
 		if(!$this->_themeManager)
 		{
-			$this->_themeManager = new TThemeManager;
+			$this->_themeManager=new TThemeManager;
 			$this->_themeManager->init(null);
 		}
 		return $this->_themeManager;
@@ -342,7 +342,7 @@ 
 	 */
 	public function setThemeManager(TThemeManager $value)
 	{
-		$this->_themeManager = $value;
+		$this->_themeManager=$value;
 	}
 
 	/**
@@ -350,9 +350,9 @@ 
 	 */
 	public function getRequestedPagePath()
 	{
-		if($this->_pagePath === null)
+		if($this->_pagePath===null)
 		{
-			$this->_pagePath = strtr($this->determineRequestedPagePath(), '/\\', '..');
+			$this->_pagePath=strtr($this->determineRequestedPagePath(), '/\\', '..');
 			if(empty($this->_pagePath))
 				throw new THttpException(404, 'pageservice_page_required');
 		}
@@ -384,7 +384,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
 		else
-			$this->_defaultPage = $value;
+			$this->_defaultPage=$value;
 	}
 
 	/**
@@ -400,13 +400,13 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath === null)
+		if($this->_basePath===null)
 		{
-			$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+			$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 			{
-				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
-				if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
+				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
@@ -421,9 +421,9 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		elseif(($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
+		elseif(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
 			throw new TConfigurationException('pageservice_basepath_invalid', $value);
-		$this->_basePath = realpath($path);
+		$this->_basePath=realpath($path);
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 */
 	public function setBasePageClass($value)
 	{
-		$this->_basePageClass = $value;
+		$this->_basePageClass=$value;
 	}
 
 	/**
@@ -452,7 +452,7 @@ 
 	 */
 	public function setClientScriptManagerClass($value)
 	{
-		$this->_clientScriptManagerClass = $value;
+		$this->_clientScriptManagerClass=$value;
 	}
 
 	/**
@@ -472,7 +472,7 @@ 
 	public function run()
 	{
 		Prado::trace("Running page service", 'Prado\Web\Services\TPageService');
-		$this->_page = $this->createPage($this->getRequestedPagePath());
+		$this->_page=$this->createPage($this->getRequestedPagePath());
 		$this->runPage($this->_page, $this->_properties);
 	}
 
@@ -485,40 +485,40 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path = $this->getBasePath() . DIRECTORY_SEPARATOR . strtr($pagePath, '.', DIRECTORY_SEPARATOR);
-		$hasTemplateFile = is_file($path . self::PAGE_FILE_EXT);
-		$hasClassFile = is_file($path . Prado::CLASS_FILE_EXT);
+		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath, '.', DIRECTORY_SEPARATOR);
+		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
+		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
 
 		if(!$hasTemplateFile && !$hasClassFile)
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		if($hasClassFile)
 		{
-			$className = basename($path);
-			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX . str_replace('.', '\\', $pagePath);
+			$className=basename($path);
+			$namespacedClassName=static::PAGE_NAMESPACE_PREFIX.str_replace('.', '\\', $pagePath);
 
 			if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
-				include_once($path . Prado::CLASS_FILE_EXT);
+				include_once($path.Prado::CLASS_FILE_EXT);
 
 			if(!class_exists($className, false))
-				$className = $namespacedClassName;
+				$className=$namespacedClassName;
 		}
 		else
 		{
-			$className = $this->getBasePageClass();
+			$className=$this->getBasePageClass();
 			Prado::using($className);
-			if(($pos = strrpos($className, '.')) !== false)
-				$className = substr($className, $pos + 1);
+			if(($pos=strrpos($className, '.'))!==false)
+				$className=substr($className, $pos + 1);
 		}
 
-		if($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
+		if($className!=='\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
-		$page = Prado::createComponent($className);
+		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
 		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
 
 		return $page;
 	}
@@ -543,7 +543,7 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($pagePath, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)
+	public function constructUrl($pagePath, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}

Braces +4 added lines, -8 removed lines

@@ -240,8 +240,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached = true;
 			$currentTimestamp = [];
@@ -259,8 +258,7 @@ 
 							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
 							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
 								$configCached = false;
-						}
-						else
+						} else
 						{
 							$currentTimestamp[$fileName] = @filemtime($fileName);
 							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
@@ -268,8 +266,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached = false;
 				$paths = explode('.', $pagePath);
@@ -502,8 +499,7 @@ 
 
 			if(!class_exists($className, false))
 				$className = $namespacedClassName;
-		}
-		else
+		} else
 		{
 			$className = $this->getBasePageClass();
 			Prado::using($className);

framework/Web/TAssetManager.php

Doc Comments +9 added lines

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

Spacing +52 added lines, -52 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Default web accessible base path for storing private files
 	 */
-	const DEFAULT_BASEPATH = 'assets';
+	const DEFAULT_BASEPATH='assets';
 	/**
 	 * @var string base web accessible path for storing private files
 	 */
@@ -67,7 +67,7 @@ 
 	/**
 	 * @var boolean whether to use timestamp checking to ensure files are published with up-to-date versions.
 	 */
-	private $_checkTimestamp = false;
+	private $_checkTimestamp=false;
 	/**
 	 * @var TApplication application instance
 	 */
@@ -75,11 +75,11 @@ 
 	/**
 	 * @var array published assets
 	 */
-	private $_published = [];
+	private $_published=[];
 	/**
 	 * @var boolean whether the module is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 
 	/**
 	 * Initializes the module.
@@ -88,15 +88,15 @@ 
 	 */
 	public function init($config)
 	{
-		$application = $this->getApplication();
-		if($this->_basePath === null)
-			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+		$application=$this->getApplication();
+		if($this->_basePath===null)
+			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
 			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
-		if($this->_baseUrl === null)
-			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		if($this->_baseUrl===null)
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
-		$this->_initialized = true;
+		$this->_initialized=true;
 	}
 
 	/**
@@ -119,8 +119,8 @@ 
 			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
 		else
 		{
-			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
+			$this->_basePath=Prado::getPathOfNamespace($value);
+			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
 				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
@@ -142,7 +142,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl = rtrim($value, '/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -159,30 +159,30 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path, $checkTimestamp = false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
-		elseif(empty($path) || ($fullpath = realpath($path)) === false)
+		elseif(empty($path) || ($fullpath=realpath($path))===false)
 			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
 		elseif(is_file($fullpath))
 		{
-			$dir = $this->hash(dirname($fullpath));
-			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dir=$this->hash(dirname($fullpath));
+			$fileName=basename($fullpath);
+			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
+			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
 		{
-			$dir = $this->hash($fullpath);
-			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dir=$this->hash($fullpath);
+			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
 				Prado::trace("Publishing directory $fullpath", 'Prado\Web\TAssetManager');
-				$this->copyDirectory($fullpath, $this->_basePath . DIRECTORY_SEPARATOR . $dir);
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -199,9 +199,9 @@ 
 	 * @param $values List of published assets
 	 * @since 3.1.6
 	 */
-	protected function setPublished($values = [])
+	protected function setPublished($values=[])
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -213,11 +213,11 @@ 
 	 */
 	public function getPublishedPath($path)
 	{
-		$path = realpath($path);
+		$path=realpath($path);
 		if(is_file($path))
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
 		else
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
 	}
 
 	/**
@@ -229,11 +229,11 @@ 
 	 */
 	public function getPublishedUrl($path)
 	{
-		$path = realpath($path);
+		$path=realpath($path);
 		if(is_file($path))
-			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
+			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
 		else
-			return $this->_baseUrl . '/' . $this->hash($path);
+			return $this->_baseUrl.'/'.$this->hash($path);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x', crc32($dir . Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		$dstFile = $dst . DIRECTORY_SEPARATOR . basename($src);
+		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
 		if(@filemtime($dstFile) < @filemtime($src))
 		{
 			Prado::trace("Publishing file $src to $dstFile", 'Prado\Web\TAssetManager');
@@ -284,22 +284,22 @@ 
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		if($folder = @opendir($src))
+		if($folder=@opendir($src))
 		{
-			while($file = @readdir($folder))
+			while($file=@readdir($folder))
 			{
-				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
+				if($file==='.' || $file==='..' || $file==='.svn' || $file==='.git')
 					continue;
-				elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
+				elseif(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
-						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
+						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -318,26 +318,26 @@ 
 	 * @param boolean Wether or not to check the time stamp of the file for publishing. Defaults to false.
 	 * @return string URL path to the directory where the tar file was extracted.
 	 */
-	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
+	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
-		elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
+		elseif(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
 			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
-			$dir = $this->hash(dirname($fullpath));
-			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dir=$this->hash(dirname($fullpath));
+			$fileName=basename($fullpath);
+			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst . DIRECTORY_SEPARATOR . $fileName) < @filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
 					$this->copyFile($fullpath, $dst);
 					$this->deployTarFile($tarfile, $dst);
 				}
 			}
-			return $this->_published[$md5sum] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -350,11 +350,11 @@ 
 	 */
 	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath = realpath($path)) === false || !is_file($fullpath))
+		if(($fullpath=realpath($path))===false || !is_file($fullpath))
 			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}

Braces +2 added lines, -4 removed lines

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

framework/Web/THttpCookieCollection.php

Doc Comments +2 added lines

@@ -38,6 +38,7 @@ 
 	/**
 	 * Constructor.
 	 * @param mixed owner of this collection.
+	 * @param THttpResponse $owner
 	 */
 	public function __construct($owner = null)
 	{
@@ -81,6 +82,7 @@ 
 
 	/**
 	 * @param integer|string index of the cookie in the collection or the cookie's name
+	 * @param string $index
 	 * @return THttpCookie the cookie found
 	 */
 	public function itemAt($index)

Spacing +4 added lines, -4 removed lines

@@ -39,9 +39,9 @@ 
 	 * Constructor.
 	 * @param mixed owner of this collection.
 	 */
-	public function __construct($owner = null)
+	public function __construct($owner=null)
 	{
-		$this->_o = $owner;
+		$this->_o=$owner;
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	 */
 	public function removeAt($index)
 	{
-		$item = parent::removeAt($index);
+		$item=parent::removeAt($index);
 		if($this->_o instanceof THttpResponse)
 			$this->_o->removeCookie($item);
 		return $item;
@@ -99,7 +99,7 @@ 
 	public function findCookieByName($name)
 	{
 		foreach($this as $cookie)
-			if($cookie->getName() === $name)
+			if($cookie->getName()===$name)
 				return $cookie;
 		return null;
 	}

framework/Web/THttpResponse.php

Doc Comments +4 added lines

@@ -234,6 +234,7 @@ 
 
 	/**
 	 * @param string|boolean output charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -403,6 +404,7 @@ 
 	 * The current application will be terminated after this method is invoked.
 	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of
 	 * the current request will be inserted at the beginning.
+	 * @param string $url
 	 */
 	public function redirect($url)
 	{
@@ -618,6 +620,7 @@ 
 	 * Sends a header.
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
+	 * @param string $value
 	 */
 	public function appendHeader($value, $replace = true)
 	{
@@ -643,6 +646,7 @@ 
 	 * Sends a cookie.
 	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
 	 * @param THttpCookie cook to be sent
+	 * @param THttpCookie $cookie
 	 */
 	public function addCookie($cookie)
 	{

Spacing +94 added lines, -94 removed lines

@@ -66,13 +66,13 @@ 
  */
 class THttpResponse extends \Prado\TModule implements \Prado\IO\ITextWriter
 {
-	const DEFAULT_CONTENTTYPE = 'text/html';
-	const DEFAULT_CHARSET = 'UTF-8';
+	const DEFAULT_CONTENTTYPE='text/html';
+	const DEFAULT_CHARSET='UTF-8';
 
 	/**
 	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
 	 */
-	private static $HTTP_STATUS_CODES = [
+	private static $HTTP_STATUS_CODES=[
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -83,11 +83,11 @@ 
 	/**
 	 * @var boolean whether to buffer output
 	 */
-	private $_bufferOutput = true;
+	private $_bufferOutput=true;
 	/**
 	 * @var boolean if the application is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var THttpCookieCollection list of cookies to return
 	 */
@@ -95,15 +95,15 @@ 
 	/**
 	 * @var integer response status code
 	 */
-	private $_status = 200;
+	private $_status=200;
 	/**
 	 * @var string reason correspond to status code
 	 */
-	private $_reason = 'OK';
+	private $_reason='OK';
 	/**
 	 * @var string HTML writer type
 	 */
-	private $_htmlWriterType = '\Prado\Web\UI\THtmlWriter';
+	private $_htmlWriterType='\Prado\Web\UI\THtmlWriter';
 	/**
 	 * @var string content type
 	 */
@@ -111,7 +111,7 @@ 
 	/**
 	 * @var string|boolean character set, e.g. UTF-8 or false if no character set should be send to client
 	 */
-	private $_charset = '';
+	private $_charset='';
 	/**
 	 * @var THttpResponseAdapter adapter.
 	 */
@@ -140,7 +140,7 @@ 
 	 */
 	public function setAdapter(THttpResponseAdapter $adapter)
 	{
-		$this->_adapter = $adapter;
+		$this->_adapter=$adapter;
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getHasAdapter()
 	{
-		return $this->_adapter !== null;
+		return $this->_adapter!==null;
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_start();
-		$this->_initialized = true;
+		$this->_initialized=true;
 		$this->getApplication()->setResponse($this);
 	}
 
@@ -203,7 +203,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none','nocache','private','private_no_expire','public']));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none', 'nocache', 'private', 'private_no_expire', 'public']));
 	}
 
 	/**
@@ -211,9 +211,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new \Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
-			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -276,24 +276,24 @@ 
 	 * @param integer HTTP status code
 	 * @param string HTTP status reason, defaults to standard HTTP reasons
 	 */
-	public function setStatusCode($status, $reason = null)
+	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new \Exception('Unable to alter response as HTTP header already sent');
-		$status = TPropertyValue::ensureInteger($status);
+		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
-			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason === null || $reason === '') {
+			$this->_reason=self::$HTTP_STATUS_CODES[$status];
+		} else {
+			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
-			$reason = TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
+			$reason=TPropertyValue::ensureString($reason);
+			if(strpos($reason, "\r")!=false || strpos($reason, "\n")!=false) {
 				throw new TInvalidDataValueException("response_status_reason_barchars");
 			}
-			$this->_reason = $reason;
+			$this->_reason=$reason;
 		}
-		$this->_status = $status;
+		$this->_status=$status;
 	}
 
 	/**
@@ -308,8 +308,8 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
-			$this->_cookies = new THttpCookieCollection($this);
+		if($this->_cookies===null)
+			$this->_cookies=new THttpCookieCollection($this);
 		return $this->_cookies;
 	}
 
@@ -321,7 +321,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -338,9 +338,9 @@ 
 	 * @param integer size of file or content in bytes if already known. Defaults to 'null' means auto-detect.
 	 * @throws TInvalidDataValueException if the file cannot be found
 	 */
-	public function writeFile($fileName, $content = null, $mimeType = null, $headers = null, $forceDownload = true, $clientFileName = null, $fileSize = null)
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
 	{
-		static $defaultMimeTypes = [
+		static $defaultMimeTypes=[
 			'css' => 'text/css',
 			'gif' => 'image/gif',
 			'png' => 'image/png',
@@ -353,26 +353,26 @@ 
 			'xls' => 'application/vnd.ms-excel',
 		];
 
-		if($mimeType === null)
+		if($mimeType===null)
 		{
-			$mimeType = 'text/plain';
+			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
-				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+				$mimeType=mime_content_type($fileName);
+			elseif(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext = substr($ext, 1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
-					$mimeType = $defaultMimeTypes[$ext];
+					$mimeType=$defaultMimeTypes[$ext];
 			}
 		}
 
-		if($clientFileName === null)
-			$clientFileName = basename($fileName);
+		if($clientFileName===null)
+			$clientFileName=basename($fileName);
 		else
-			$clientFileName = basename($clientFileName);
+			$clientFileName=basename($clientFileName);
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if($fileSize===null || $fileSize < 0)
+			$fileSize=($content===null ?filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -386,13 +386,13 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 
-		header('Content-Length: ' . $fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header('Content-Length: '.$fileSize);
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
+		if($content===null)
 			readfile($fileName);
 		else
 			echo $content;
@@ -430,25 +430,25 @@ 
 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
-		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		$isIIS=(stripos($this->getRequest()->getServerSoftware(), "microsoft-iis")!==false);
+		if($url[0]==='/')
+			$url=$this->getRequest()->getBaseUrl().$url;
+		if($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
 			if($isIIS)
 			{
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
 						? $this->_status
 						: 302
 					]);
 			}
-			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
 			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
-			header('Location: ' . str_replace('&amp;', '&', $url));
+				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
+			header('Location: '.str_replace('&amp;', '&', $url));
 		}
 
 		if(!$this->getApplication()->getRequestCompleted())
@@ -470,7 +470,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -492,18 +492,18 @@ 
 	 * This method is used internally. Please use {@link flush} instead.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
 		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length() > 0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -520,7 +520,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -529,13 +529,13 @@ 
 	 */
 	protected function sendHttpHeader()
 	{
-		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol = 'HTTP/1.1';
+		$protocol=$this->getRequest()->getHttpProtocolVersion();
+		if($this->getRequest()->getHttpProtocolVersion()===null)
+			$protocol='HTTP/1.1';
 
-		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -552,20 +552,20 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType = $this->_contentType === null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
-		$charset = $this->getCharset();
-		if($charset === false) {
-			$this->appendHeader('Content-Type: ' . $contentType);
+		$contentType=$this->_contentType===null ?self::DEFAULT_CONTENTTYPE : $this->_contentType;
+		$charset=$this->getCharset();
+		if($charset===false) {
+			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
-			$charset = $globalization->getCharset();
+		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
+			$charset=$globalization->getCharset();
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
-		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
+		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	public function getContents()
 	{
 		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ?ob_get_contents() : '';
 	}
 
 	/**
@@ -594,21 +594,21 @@ 
 	 * @param integer|null Either {@link CASE_UPPER} or {@link CASE_LOWER} or as is null (default)
 	 * @return array
 	 */
-	public function getHeaders($case = null)
+	public function getHeaders($case=null)
 	{
-		$result = [];
-		$headers = headers_list();
+		$result=[];
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -619,7 +619,7 @@ 
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
 	 */
-	public function appendHeader($value, $replace = true)
+	public function appendHeader($value, $replace=true)
 	{
 		Prado::trace("Sending header '$value'", 'Prado\Web\THttpResponse');
 		header($value, $replace);
@@ -634,7 +634,7 @@ 
 	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
 	 * @see http://us2.php.net/manual/en/function.error-log.php
 	 */
-	public function appendLog($message, $messageType = 0, $destination = '', $extraHeaders = '')
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
 	{
 		error_log($message, $messageType, $destination, $extraHeaders);
 	}
@@ -646,10 +646,10 @@ 
 	 */
 	public function addCookie($cookie)
 	{
-		$request = $this->getRequest();
+		$request=$this->getRequest();
 		if($request->getEnableCookieValidation())
 		{
-			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
+			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
 				$cookie->getName(),
 				$value,
@@ -704,7 +704,7 @@ 
 	 */
 	public function setHtmlWriterType($value)
 	{
-		$this->_htmlWriterType = $value;
+		$this->_htmlWriterType=$value;
 	}
 
 	/**
@@ -712,10 +712,10 @@ 
 	 * If the type of the HTML writer is not supplied, {@link getHtmlWriterType HtmlWriterType} will be assumed.
 	 * @param string type of the HTML writer to be created. If null, {@link getHtmlWriterType HtmlWriterType} will be assumed.
 	 */
-	public function createHtmlWriter($type = null)
+	public function createHtmlWriter($type=null)
 	{
-		if($type === null)
-			$type = $this->getHtmlWriterType();
+		if($type===null)
+			$type=$this->getHtmlWriterType();
 		if($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else

Braces +5 added lines, -9 removed lines

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