pradosoft / prado

framework/Web/Services/TPageConfiguration.php

Doc Comments +8 added lines

@@ -56,6 +56,7 @@ 
 	/**
 	 * Constructor.
 	 * @param string the currently request page in the format of Path.To.PageName
+	 * @param string $pagePath
 	 */
 	public function __construct($pagePath)
 	{
@@ -103,6 +104,7 @@ 
 	/**
 	 * Loads configuration for a page specified in a path format.
 	 * @param string root path for pages
+	 * @param string $basePath
 	 */
 	public function loadFromFiles($basePath)
 	{
@@ -130,6 +132,7 @@ 
 	 * Loads a specific config file.
 	 * @param string config file name
 	 * @param string the page path that the config file is associated with. The page path doesn't include the page name.
+	 * @param string $fname
 	 */
 	public function loadFromFile($fname,$configPagePath)
 	{
@@ -152,6 +155,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $configPath
+	 */
 	public function loadFromPhp($config,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromPhp($config,$configPath);
@@ -165,6 +171,8 @@ 
 	 * @param TXmlElement config xml element
 	 * @param string the directory containing this configuration
 	 * @param string the page path that the config XML is associated with. The page path doesn't include the page name.
+	 * @param TXmlDocument $dom
+	 * @param string $configPath
 	 */
 	public function loadFromXml($dom,$configPath,$configPagePath)
 	{

Braces +1 added lines, -2 removed lines

@@ -141,8 +141,7 @@
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))

Spacing +60 added lines, -60 removed lines

@@ -106,23 +106,23 @@ 
 	 */
 	public function loadFromFiles($basePath)
 	{
-		$paths=explode('.',$this->_pagePath);
+		$paths=explode('.', $this->_pagePath);
 		$page=array_pop($paths);
 		$path=$basePath;
 		$configPagePath='';
-		$fileName = Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+		$fileName=Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
 		foreach($paths as $p)
 		{
-			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
+			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
 			$path.=DIRECTORY_SEPARATOR.$p;
 			if($configPagePath==='')
 				$configPagePath=$p;
 			else
 				$configPagePath.='.'.$p;
 		}
-		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
+		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
 		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
 	}
 
@@ -131,31 +131,31 @@ 
 	 * @param string config file name
 	 * @param string the page path that the config file is associated with. The page path doesn't include the page name.
 	 */
-	public function loadFromFile($fname,$configPagePath)
+	public function loadFromFile($fname, $configPagePath)
 	{
-		Prado::trace("Loading page configuration file $fname",'System.Web.Services.TPageService');
+		Prado::trace("Loading page configuration file $fname", 'System.Web.Services.TPageService');
 		if(empty($fname) || !is_file($fname))
 			return;
 
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
+			$fcontent=include $fname;
+			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
+				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
-				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+				throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
 		}
 	}
 
-	public function loadFromPhp($config,$configPath,$configPagePath)
+	public function loadFromPhp($config, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromPhp($config,$configPath);
-		$this->loadPageConfigurationFromPhp($config,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromPhp($config, $configPath);
+		$this->loadPageConfigurationFromPhp($config, $configPath, $configPagePath);
 	}
 
 	/**
@@ -166,16 +166,16 @@ 
 	 * @param string the directory containing this configuration
 	 * @param string the page path that the config XML is associated with. The page path doesn't include the page name.
 	 */
-	public function loadFromXml($dom,$configPath,$configPagePath)
+	public function loadFromXml($dom, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromXml($dom,$configPath);
-		$this->loadPageConfigurationFromXml($dom,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromXml($dom, $configPath);
+		$this->loadPageConfigurationFromXml($dom, $configPath, $configPagePath);
 	}
 
-	public function loadApplicationConfigurationFromPhp($config,$configPath)
+	public function loadApplicationConfigurationFromPhp($config, $configPath)
 	{
 		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromPhp($config,$configPath);
+		$appConfig->loadFromPhp($config, $configPath);
 		$this->_appConfigs[]=$appConfig;
 	}
 
@@ -184,10 +184,10 @@ 
 	 * @param TXmlElement config xml element
 	 * @param string base path corresponding to this xml element
 	 */
-	public function loadApplicationConfigurationFromXml($dom,$configPath)
+	public function loadApplicationConfigurationFromXml($dom, $configPath)
 	{
 		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromXml($dom,$configPath);
+		$appConfig->loadFromXml($dom, $configPath);
 		$this->_appConfigs[]=$appConfig;
 	}
 
@@ -196,30 +196,30 @@ 
 		// authorization
 		if(isset($config['authorization']) && is_array($config['authorization']))
 		{
-			$rules = array();
+			$rules=array();
 			foreach($config['authorization'] as $authorization)
 			{
-				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
+				$patterns=isset($authorization['pages']) ? $authorization['pages'] : '';
 				$ruleApplies=false;
 				if(empty($patterns) || trim($patterns)==='*') // null or empty string
 					$ruleApplies=true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach(explode(',', $patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
 							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
 								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
 								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1]==='*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
 									$ruleApplies=true;
 									break;
@@ -230,40 +230,40 @@ 
 				}
 				if($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
-					$rules[]=new TAuthorizationRule($action,$users,$roles,$verb,$ips);
+					$action=isset($authorization['action']) ? $authorization['action'] : '';
+					$users=isset($authorization['users']) ? $authorization['users'] : '';
+					$roles=isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb=isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips=isset($authorization['ips']) ? $authorization['ips'] : '';
+					$rules[]=new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 		// pages
 		if(isset($config['pages']) && is_array($config['pages']))
 		{
 			if(isset($config['pages']['properties']))
 			{
-				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
+				$this->_properties=array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
 			foreach($config['pages'] as $id => $page)
 			{
-				$properties = array();
+				$properties=array();
 				if(isset($page['properties']))
 				{
 					$properties=$page['properties'];
 					unset($page['properties']);
 				}
 				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
+				$id=($configPagePath==='') ? $id : $configPagePath.'.'.$id;
+				if(strcasecmp($id, $this->_pagePath)===0)
 					$matching=true;
-				else if($id[strlen($id)-1]==='*') // try wildcard matching
-					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
+				else if($id[strlen($id) - 1]==='*') // try wildcard matching
+					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties);
+					$this->_properties=array_merge($this->_properties, $properties);
 			}
 		}
 
@@ -272,14 +272,14 @@ 
 		{
 			foreach($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
+				$when=isset($include['when']) ?true:false;
 				if(!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
-				$filePath = $include['file'];
+				$filePath=$include['file'];
 				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+					$this->_includes[$filePath]=array($configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')');
 				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+					$this->_includes[$filePath]=array($configPagePath, $when);
 			}
 		}
 	}
@@ -290,7 +290,7 @@ 
 	 * @param string base path corresponding to this xml element
 	 * @param string the page path that the config XML is associated with. The page path doesn't include the page name.
 	 */
-	public function loadPageConfigurationFromXml($dom,$configPath,$configPagePath)
+	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
 		// authorization
 		if(($authorizationNode=$dom->getElementByTagName('authorization'))!==null)
@@ -304,21 +304,21 @@ 
 					$ruleApplies=true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach(explode(',', $patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
 							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
 								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
 								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1]==='*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
 									$ruleApplies=true;
 									break;
@@ -328,30 +328,30 @@ 
 					}
 				}
 				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+					$rules[]=new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 
 		// pages
 		if(($pagesNode=$dom->getElementByTagName('pages'))!==null)
 		{
-			$this->_properties=array_merge($this->_properties,$pagesNode->getAttributes()->toArray());
+			$this->_properties=array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
 			// at the page folder
 			foreach($pagesNode->getElementsByTagName('page') as $node)
 			{
 				$properties=$node->getAttributes();
 				$id=$properties->remove('id');
 				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
 				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
+				$id=($configPagePath==='') ? $id : $configPagePath.'.'.$id;
+				if(strcasecmp($id, $this->_pagePath)===0)
 					$matching=true;
-				else if($id[strlen($id)-1]==='*') // try wildcard matching
-					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
+				else if($id[strlen($id) - 1]==='*') // try wildcard matching
+					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties->toArray());
+					$this->_properties=array_merge($this->_properties, $properties->toArray());
 			}
 		}
 
@@ -363,9 +363,9 @@ 
 			if(($filePath=$node->getAttribute('file'))===null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
 			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+				$this->_includes[$filePath]=array($configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')');
 			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+				$this->_includes[$filePath]=array($configPagePath, $when);
 		}
 	}
 }
\ No newline at end of file

framework/Web/Services/TPageService.php

Doc Comments +6 added lines, -1 removed lines

@@ -169,6 +169,7 @@ 
 	 * parameter initialization, module loadings, page initial properties
 	 * and authorization rules.
 	 * @param TPageConfiguration
+	 * @param TPageConfiguration $pageConfig
 	 */
 	protected function initPageContext($pageConfig)
 	{
@@ -376,6 +377,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)
@@ -478,7 +480,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
 	 */
@@ -526,6 +529,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)
 	{
@@ -540,6 +544,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)

Indentation +2 added lines, -2 removed lines

@@ -496,8 +496,8 @@
 			$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);
+			if(!class_exists($className,false) && !class_exists($namespacedClassName, false))
+				include_once($path.Prado::CLASS_FILE_EXT);
 
 			if(!class_exists($className,false))
 				$className = $namespacedClassName;

Braces +4 added lines, -8 removed lines

@@ -239,8 +239,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -258,8 +257,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]))
@@ -267,8 +265,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -501,8 +498,7 @@ 
 
 			if(!class_exists($className,false))
 				$className = $namespacedClassName;
-		}
-		else
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);

Spacing +38 added lines, -38 removed lines

@@ -104,7 +104,7 @@ 
 	/**
 	 * 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
 	 */
@@ -154,7 +154,7 @@ 
 	 */
 	public function init($config)
 	{
-		Prado::trace("Initializing TPageService",'\Prado\Web\Services\TPageService');
+		Prado::trace("Initializing TPageService", '\Prado\Web\Services\TPageService');
 
 		$pageConfig=$this->loadPageConfig($config);
 
@@ -192,15 +192,15 @@ 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath=>$params)
 		{
-			list($configPagePath,$condition)=$params;
+			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))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
+					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
 				$c=new TPageConfiguration($pagePath);
-				$c->loadFromFile($path,$configPagePath);
+				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
 		}
@@ -234,9 +234,9 @@ 
 			if($config!==null)
 			{
 				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
 		}
@@ -247,7 +247,7 @@ 
 			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig,$timestamps)=$arr;
+				list($pageConfig, $timestamps)=$arr;
 				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName=>$timestamp)
@@ -255,14 +255,14 @@ 
 						if($fileName===0) // application config file
 						{
 							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
+							$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
+							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
 								$configCached=false;
 						}
 						else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
+							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
 								$configCached=false;
 						}
 					}
@@ -271,9 +271,9 @@ 
 			else
 			{
 				$configCached=false;
-				$paths=explode('.',$pagePath);
+				$paths=explode('.', $pagePath);
 				$configPath=$this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
@@ -283,7 +283,7 @@ 
 					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
 				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
@@ -291,12 +291,12 @@ 
 				if($config!==null)
 				{
 					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, array($pageConfig, $currentTimestamp));
 			}
 		}
 		return $pageConfig;
@@ -351,9 +351,9 @@ 
 	{
 		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');
+				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
 	}
@@ -406,7 +406,7 @@ 
 			{
 				$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);
+					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
 		return $this->_basePath;
@@ -421,7 +421,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
 		else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid',$value);
+			throw new TConfigurationException('pageservice_basepath_invalid', $value);
 		$this->_basePath=realpath($path);
 	}
 
@@ -470,9 +470,9 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running page service",'Prado\Web\Services\TPageService');
+		Prado::trace("Running page service", 'Prado\Web\Services\TPageService');
 		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		$this->runPage($this->_page, $this->_properties);
 	}
 
 	/**
@@ -484,34 +484,34 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
+		$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);
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		if($hasClassFile)
 		{
 			$className=basename($path);
-			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX .str_replace('.', '\\', $pagePath);
+			$namespacedClassName=static::PAGE_NAMESPACE_PREFIX.str_replace('.', '\\', $pagePath);
 
-            if(!class_exists($className,false) && !class_exists($namespacedClassName, false))
+            if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
                 include_once($path.Prado::CLASS_FILE_EXT);
 
-			if(!class_exists($className,false))
-				$className = $namespacedClassName;
+			if(!class_exists($className, false))
+				$className=$namespacedClassName;
 		}
 		else
 		{
 			$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'))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		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->setPagePath($pagePath);
@@ -527,10 +527,10 @@ 
 	 * @param TPage the page instance to be run
 	 * @param array list of initial page properties
 	 */
-	protected function runPage($page,$properties)
+	protected function runPage($page, $properties)
 	{
 		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+			$page->setSubProperty($name, $value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 
@@ -542,8 +542,8 @@ 
 	 * @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);
+		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 }
\ No newline at end of file

framework/Web/Services/TRpcApiProvider.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

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

framework/Web/Services/TRpcProtocol.php

Doc Comments +1 added lines

@@ -33,6 +33,7 @@
 	/**
 	 * @param string request payload
 	 * Processed the request ans returns the response, if any
+	 * @param string $requestPayload
 	 * @return processed response
 	 * @abstract
 	 */

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @var array containing the mapping from RPC method names to the actual handlers
 	 */
-	protected $rpcMethods = array();
+	protected $rpcMethods=array();
 
 	// abstracts
 
@@ -74,7 +74,7 @@ 
 	 */
 	public function addMethod($methodName, $handlerDetails)
 	{
-		$this->rpcMethods[$methodName] = $handlerDetails;
+		$this->rpcMethods[$methodName]=$handlerDetails;
 	}
 
 	/**
@@ -88,11 +88,11 @@ 
 		if(!isset($this->rpcMethods[$methodName]))
 			throw new TRpcException('Method "'.$methodName.'" not found');
 
-		if($parameters === null)
-			$parameters = array();
+		if($parameters===null)
+			$parameters=array();
 
 		if(!is_array($parameters))
-			$parameters = array($parameters);
+			$parameters=array($parameters);
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
 }
\ No newline at end of file

framework/Web/Services/TXmlRpcProtocol.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * Registers a new RPC method and handler details
 	 * @param string $methodName
-	 * @param array $handlerDetails containing the callback handler
 	 */
 	public function addMethod($methodName, $methodDetails)
 	{

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function __construct()
 	{
-		$this->_xmlrpcServer = xmlrpc_server_create();
+		$this->_xmlrpcServer=xmlrpc_server_create();
 	}
 
 	/**

Braces +3 added lines, -6 removed lines

@@ -72,16 +72,13 @@
 		try
 		{
 			return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null);
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured'));
 		}

framework/Web/THttpCookie.php

Doc Comments +1 added lines

@@ -90,6 +90,7 @@
 
 	/**
 	 * @param integer the time the cookie expires. This is a Unix timestamp so is in number of seconds since the epoch.
+	 * @param integer $value
 	 */
 	public function setExpire($value)
 	{

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 	 * @param string name of this cookie
 	 * @param string value of this cookie
 	 */
-	public function __construct($name,$value)
+	public function __construct($name, $value)
 	{
 		$this->_name=$name;
 		$this->_value=$value;
@@ -109,7 +109,7 @@ 
 	 */
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

framework/Web/THttpCookieCollection.php

Doc Comments +2 added lines

@@ -37,6 +37,7 @@ 
 	/**
 	 * Constructor.
 	 * @param mixed owner of this collection.
+	 * @param THttpResponse $owner
 	 */
 	public function __construct($owner=null)
 	{
@@ -80,6 +81,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 +2 added lines, -2 removed lines

@@ -51,11 +51,11 @@
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof THttpCookie)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 			parent::insertAt($index,$item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 

framework/Web/TUri.php

Doc Comments +1 added lines

@@ -87,6 +87,7 @@
 	 * Constructor.
 	 * Decomposes the specified URI into parts.
 	 * @param string URI to be represented
+	 * @param string $uri
 	 * @throws TInvalidDataValueException if URI is of bad format
 	 */
 	public function __construct($uri)

Spacing +9 added lines, -9 removed lines

@@ -94,19 +94,19 @@
 		if(($ret=@parse_url($uri))!==false)
 		{
 			// decoding???
-			$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host=isset($ret['host'])?$ret['host']:'';
-			$this->_port=isset($ret['port'])?$ret['port']:'';
-			$this->_user=isset($ret['user'])?$ret['user']:'';
-			$this->_pass=isset($ret['pass'])?$ret['pass']:'';
-			$this->_path=isset($ret['path'])?$ret['path']:'';
-			$this->_query=isset($ret['query'])?$ret['query']:'';
-			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
+			$this->_scheme=isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host=isset($ret['host']) ? $ret['host'] : '';
+			$this->_port=isset($ret['port']) ? $ret['port'] : '';
+			$this->_user=isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass=isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path=isset($ret['path']) ? $ret['path'] : '';
+			$this->_query=isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment=isset($ret['fragment']) ? $ret['fragment'] : '';
 			$this->_uri=$uri;
 		}
 		else
 		{
-			throw new TInvalidDataValueException('uri_format_invalid',$uri);
+			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}
 	}
 

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 			$this->_query=isset($ret['query'])?$ret['query']:'';
 			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri=$uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid',$uri);
 		}

framework/Web/TUrlMappingPattern.php

Doc Comments +3 added lines, -1 removed lines

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

Braces +7 added lines, -10 removed lines

@@ -363,10 +363,10 @@ 
 			$params=explode('/',$matches['urlparams']);
 			if ($this->_separator==='/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
-			}
-			else
+				while($key=array_shift($params)) {
+									$matches[$key]=($value=array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -558,12 +558,10 @@ 
 						$name=rawurlencode($name.'[]');
 						foreach($value as $v)
 							$url2.=$amp.$name.'='.rawurlencode($v);
-					}
-					else
+					} else
 						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name=>$value)
 				{
@@ -571,8 +569,7 @@ 
 					{
 						foreach($value as $v)
 							$url2.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url2.=$amp.$name.'='.$value;
 				}
 			}

Spacing +39 added lines, -39 removed lines

@@ -158,7 +158,7 @@ 
 	 * @var TUrlMappingPatternSecureConnection
 	 * @since 3.2
 	 */
-	private $_secureConnection = TUrlMappingPatternSecureConnection::Automatic;
+	private $_secureConnection=TUrlMappingPatternSecureConnection::Automatic;
 
 	/**
 	 * Constructor.
@@ -186,7 +186,7 @@ 
 	{
 		if($this->_serviceParameter===null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter,'*')!==false)
+		if(strpos($this->_serviceParameter, '*')!==false)
 				$this->_isWildCardPattern=true;
 	}
 
@@ -199,7 +199,7 @@ 
 	{
 		$params=array();
 		$values=array();
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -207,7 +207,7 @@ 
 				$values[]='(?P<'.$key.'>'.$value.')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
 				$params[]='{*}';
 				// service parameter must not contain '=' and '/'
@@ -215,8 +215,8 @@ 
 		}
 		$params[]='/';
 		$values[]='\\/';
-		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');
-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
+		$regexp=str_replace($params, $values, trim($this->getPattern(), '/').'/');
+		if($this->_urlFormat===THttpRequestUrlFormat::Get)
 				$regexp='/^'.$regexp.'$/u';
 		else
 				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
@@ -303,7 +303,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->_pattern = $value;
+		$this->_pattern=$value;
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
 			$this->_parameters=new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
@@ -333,9 +333,9 @@ 
 	 */
 	public function getConstants()
 	{
-		if (!$this->_constants)
+		if(!$this->_constants)
 		{
-			$this->_constants = new TAttributeCollection;
+			$this->_constants=new TAttributeCollection;
 			$this->_constants->setCaseSensitive(true);
 		}
 		return $this->_constants;
@@ -351,17 +351,17 @@ 
 	{
 		$matches=array();
 		if(($pattern=$this->getRegularExpression())!=='')
-			preg_match($pattern,$request->getPathInfo(),$matches);
+			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/').'/', $matches);
 
 		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+			$matches[$this->_serviceID]=str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
-		if (isset($matches['urlparams']))
+		if(isset($matches['urlparams']))
 		{
-			$params=explode('/',$matches['urlparams']);
-			if ($this->_separator==='/')
+			$params=explode('/', $matches['urlparams']);
+			if($this->_separator==='/')
 			{
 				while($key=array_shift($params))
 					$matches[$key]=($value=array_shift($params)) ? $value : '';
@@ -371,7 +371,7 @@ 
 				array_pop($params);
 				foreach($params as $param)
 				{
-					list($key,$value)=explode($this->_separator,$param,2);
+					list($key, $value)=explode($this->_separator, $param, 2);
 					$matches[$key]=$value;
 				}
 			}
@@ -381,7 +381,7 @@ 
 		if(count($matches) > 0 && $this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
-				$matches[$key] = $value;
+				$matches[$key]=$value;
 		}
 
 		return $matches;
@@ -435,7 +435,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'Prado\\Web\\THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpRequestUrlFormat');
 	}
 
 	/**
@@ -473,7 +473,7 @@ 
 	 */
 	public function setSecureConnection($value)
 	{
-		$this->_secureConnection = TPropertyValue::ensureEnum($value, 'Prado\\Web\\TUrlMappingPatternSecureConnection');
+		$this->_secureConnection=TPropertyValue::ensureEnum($value, 'Prado\\Web\\TUrlMappingPatternSecureConnection');
 	}
 
 	/**
@@ -485,7 +485,7 @@ 
 	{
 		if(!$this->_customUrl || $this->getPattern()===null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -494,13 +494,13 @@ 
 			}
 		}
 
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
-				if (!isset($getItems[$key]))
+				if(!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key]!=$value)
+				if($getItems[$key]!=$value)
 					return false;
 			}
 		}
@@ -515,9 +515,9 @@ 
 	 * @return string the constructed URL
 	 * @since 3.1.1
 	 */
-	public function constructUrl($getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
@@ -536,19 +536,19 @@ 
 				$extra[$key]=$value;
 		}
 
-		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(),$replace),'/');
+		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
-		if(count($extra)>0)
+		if(count($extra) > 0)
 		{
-			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name=>$value)
-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+			if($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach($extra as $name=>$value)
+					$url.='/'.$name.$this->_separator.($encodeGetItems ?rawurlencode($value) : $value);
 				return $url;
 			}
 
 			$url2='';
-			$amp=$encodeAmpersand?'&amp;':'&';
+			$amp=$encodeAmpersand ? '&amp;' : '&';
 			if($encodeGetItems)
 			{
 				foreach($extra as $name=>$value)
@@ -576,7 +576,7 @@ 
 						$url2.=$amp.$name.'='.$value;
 				}
 			}
-			$url=$url.'?'.substr($url2,strlen($amp));
+			$url=$url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -592,26 +592,26 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request===null) $request=Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection===null) $isSecureConnection=$request -> getIsSecureConnection();
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
 				if($isSecureConnection) return $url;
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
 				if(!$isSecureConnection) return $url;
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Disable:
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Automatic:
 			default: