pradosoft / prado

framework/Web/Services/TJsonService.php

Doc Comments +1 added lines

@@ -140,6 +140,7 @@
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
+	 * @param TJsonResponse $service
 	 */
 	protected function createJsonResponse($service,$properties,$config)
 	{

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+					$this->_services[$id]=$json;
 			}
 		}
 		else
@@ -109,14 +109,14 @@ 
 					$service=Prado::createComponent($serviceConfig['class']);
 					if($service instanceof TJsonResponse)
 					{
-						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$properties=isset($serviceConfig['properties']) ? $serviceConfig['properties'] : array();
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					}
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
@@ -125,33 +125,33 @@ 
 				{
 					$service=Prado::createComponent($class);
 					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 		}
 		else
-			throw new THttpException(404,'jsonservice_provider_unknown',$id);
+			throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 	}
 
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
 	 */
-	protected function createJsonResponse($service,$properties,$config)
+	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
 		foreach($properties as $name=>$value)
-			$service->setSubproperty($name,$value);
+			$service->setSubproperty($name, $value);
 		$service->init($config);
 
 		//send content if not null
 		if(($content=$service->getJsonContent())!==null)
 		{
-			$response = $this->getResponse();
+			$response=$this->getResponse();
 			$response->setContentType('application/json');
 			$response->setCharset('UTF-8');
 			//send content

Braces +6 added lines, -12 removed lines

@@ -79,8 +79,7 @@ 
 				foreach($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -111,14 +110,11 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
 						$this->createJsonResponse($service,$properties,$serviceConfig);
-					}
-					else
+					} else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$serviceConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -128,12 +124,10 @@ 
 						$this->createJsonResponse($service,$properties,$serviceConfig);
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
-		}
-		else
+		} else
 			throw new THttpException(404,'jsonservice_provider_unknown',$id);
 	}
 

framework/Web/Services/TPageService.php

Doc Comments +7 added lines

@@ -369,6 +369,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)
@@ -528,6 +529,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)
@@ -670,6 +672,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $configPath
+	 */
 	public function loadFromPhp($config,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromPhp($config,$configPath);
@@ -683,6 +688,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)
 	{

Spacing +94 added lines, -94 removed lines

@@ -147,7 +147,7 @@ 
 	 */
 	public function init($config)
 	{
-		Prado::trace("Initializing TPageService",'System.Web.Services.TPageService');
+		Prado::trace("Initializing TPageService", 'System.Web.Services.TPageService');
 
 		$pageConfig=$this->loadPageConfig($config);
 
@@ -185,15 +185,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);
 			}
 		}
@@ -227,9 +227,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());
 		}
@@ -240,7 +240,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)
@@ -248,14 +248,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;
 						}
 					}
@@ -264,9 +264,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)
@@ -276,7 +276,7 @@ 
 					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
 				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
@@ -284,12 +284,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;
@@ -344,9 +344,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;
 	}
@@ -399,7 +399,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;
@@ -414,7 +414,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);
 	}
 
@@ -463,9 +463,9 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running page service",'System.Web.Services.TPageService');
+		Prado::trace("Running page service", 'System.Web.Services.TPageService');
 		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		$this->runPage($this->_page, $this->_properties);
 	}
 
 	/**
@@ -477,29 +477,29 @@ 
 	 */
 	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);
-			if(!class_exists($className,false))
+			if(!class_exists($className, false))
 				include_once($path.Prado::CLASS_FILE_EXT);
 		}
 		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(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage')))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		if(!class_exists($className, false) || ($className!=='TPage' && !is_subclass_of($className, 'TPage')))
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
@@ -515,10 +515,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());
 	}
 
@@ -530,9 +530,9 @@ 
 	 * @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);
 	}
 }
 
@@ -624,23 +624,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);
 	}
 
@@ -649,31 +649,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);
 	}
 
 	/**
@@ -684,16 +684,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;
 	}
 
@@ -702,10 +702,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;
 	}
 
@@ -714,30 +714,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;
@@ -748,40 +748,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);
 			}
 		}
 
@@ -790,14 +790,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);
 			}
 		}
 	}
@@ -808,7 +808,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)
@@ -822,21 +822,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;
@@ -846,30 +846,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());
 			}
 		}
 
@@ -881,9 +881,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);
 		}
 	}
 }

Braces +5 added lines, -10 removed lines

@@ -232,8 +232,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -251,8 +250,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]))
@@ -260,8 +258,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -489,8 +486,7 @@ 
 			$className=basename($path);
 			if(!class_exists($className,false))
 				include_once($path.Prado::CLASS_FILE_EXT);
-		}
-		else
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
@@ -659,8 +655,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))

framework/Web/Services/TRpcService.php

Doc Comments +5 added lines, -2 removed lines

@@ -258,6 +258,9 @@ 
  */
 class TRpcException extends TException
 {
+	/**
+	 * @param string $message
+	 */
 	public function __construct($message, $errorCode = -1)
 	{
 		$this->setErrorCode($errorCode);
@@ -334,7 +337,7 @@ 
 	}
 
 	/**
-	 * @return rpc server instance
+	 * @return TRpcServer server instance
 	 */
 	public function getRpcServer()
 	{
@@ -366,6 +369,7 @@ 
 	/**
 	 * @param string request payload
 	 * Processed the request ans returns the response, if any
+	 * @param string $requestPayload
 	 * @return processed response
 	 * @abstract
 	 */
@@ -641,7 +645,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 +40 added lines, -40 removed lines

@@ -59,17 +59,17 @@ 
 	/**
 	 * const string base api provider class which every API must extend
 	 */
-	const BASE_API_PROVIDER = 'TRpcApiProvider';
+	const BASE_API_PROVIDER='TRpcApiProvider';
 
 	/**
 	 * const string base RPC server implementation
 	 */
-	const BASE_RPC_SERVER = 'TRpcServer';
+	const BASE_RPC_SERVER='TRpcServer';
 
 	/**
 	 * @var array containing mimetype to protocol handler mappings
 	 */
-	protected $protocolHandlers = array(
+	protected $protocolHandlers=array(
 		'application/json' => 'TJsonRpcProtocol',
 		'text/xml' => 'TXmlRpcProtocol'
 	);
@@ -77,7 +77,7 @@ 
 	/**
 	 * @var array containing API provider and their configured properties
 	 */
-	protected $apiProviders = array();
+	protected $apiProviders=array();
 
 	// methods
 
@@ -88,27 +88,27 @@ 
 	 */
 	public function createApiProvider(TRpcProtocol $protocolHandler, $providerId)
 	{
-		$_properties = $this->apiProviders[$providerId];
+		$_properties=$this->apiProviders[$providerId];
 
-		if(($_providerClass = $_properties->remove('class')) === null)
+		if(($_providerClass=$_properties->remove('class'))===null)
 			throw new TConfigurationException('rpcservice_apiprovider_required');
 
 		Prado::using($_providerClass);
 
-		$_providerClassName = ($_pos = strrpos($_providerClass, '.')) !== false ? substr($_providerClass, $_pos + 1) : $_providerClass;
+		$_providerClassName=($_pos=strrpos($_providerClass, '.'))!==false ? substr($_providerClass, $_pos + 1) : $_providerClass;
 		if(!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER))
 			throw new TConfigurationException('rpcservice_apiprovider_invalid');
 
-		if(($_rpcServerClass = $_properties->remove('server')) === null)
-			$_rpcServerClass = self::BASE_RPC_SERVER;
+		if(($_rpcServerClass=$_properties->remove('server'))===null)
+			$_rpcServerClass=self::BASE_RPC_SERVER;
 
 		Prado::using($_rpcServerClass);
 
-		$_rpcServerClassName = ($_pos = strrpos($_rpcServerClass, '.')) !== false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
+		$_rpcServerClassName=($_pos=strrpos($_rpcServerClass, '.'))!==false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
 		if($_rpcServerClassName!==self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
 			throw new TConfigurationException('rpcservice_rpcserver_invalid');
 
-		$_apiProvider = new $_providerClassName(new $_rpcServerClassName($protocolHandler));
+		$_apiProvider=new $_providerClassName(new $_rpcServerClassName($protocolHandler));
 		$_apiProvider->setId($providerId);
 
 		foreach($_properties as $_key => $_value)
@@ -134,15 +134,15 @@ 
 	{
 		foreach($xml->getElementsByTagName('rpcapi') as $_apiProviderXml)
 		{
-			$_properties = $_apiProviderXml->getAttributes();
+			$_properties=$_apiProviderXml->getAttributes();
 
-			if(($_id = $_properties->remove('id')) === null || $_id == "")
+			if(($_id=$_properties->remove('id'))===null || $_id=="")
 				throw new TConfigurationException('rpcservice_apiproviderid_required');
 
 			if(isset($this->apiProviders[$_id]))
 				throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
 
-			$this->apiProviders[$_id] = $_properties;
+			$this->apiProviders[$_id]=$_properties;
 		}
 	}
 
@@ -151,26 +151,26 @@ 
 	 */
 	public function run()
 	{
-		$_request = $this->getRequest();
+		$_request=$this->getRequest();
 
-		if(($_providerId = $_request->getServiceParameter()) == "")
+		if(($_providerId=$_request->getServiceParameter())=="")
 			throw new THttpException(400, 'RPC API-Provider id required');
 		
-		if(($_method = $_request->getRequestType()) != 'POST')
+		if(($_method=$_request->getRequestType())!='POST')
 			throw new THttpException(405, 'Invalid request method "'.$_method.'"!'); // TODO Exception muss "Allow POST" Header setzen
 
-		if(($_mimeType = $_request->getContentType()) === null)
+		if(($_mimeType=$_request->getContentType())===null)
 			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
 
 		if(!in_array($_mimeType, array_keys($this->protocolHandlers)))
 			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
 
-		$_protocolHandlerClass = $this->protocolHandlers[$_mimeType];
-		$_protocolHandler = new $_protocolHandlerClass;
+		$_protocolHandlerClass=$this->protocolHandlers[$_mimeType];
+		$_protocolHandler=new $_protocolHandlerClass;
 
-		if(($_result = $this->createApiProvider($_protocolHandler, $_providerId)->processRequest()) !== null)
+		if(($_result=$this->createApiProvider($_protocolHandler, $_providerId)->processRequest())!==null)
 		{
-			$_response = $this->getResponse();
+			$_response=$this->getResponse();
 			$_protocolHandler->createResponseHeaders($_response);
 			$_response->write($_result);
 		}
@@ -206,7 +206,7 @@ 
 	 */
 	public function __construct(TRpcProtocol $protocolHandler)
 	{
-		$this->handler = $protocolHandler;
+		$this->handler=$protocolHandler;
 	}
 	
 	/**
@@ -258,7 +258,7 @@ 
  */
 class TRpcException extends TException
 {
-	public function __construct($message, $errorCode = -1)
+	public function __construct($message, $errorCode=-1)
 	{
 		$this->setErrorCode($errorCode);
 
@@ -318,7 +318,7 @@ 
 	 */
 	public function __construct(TRpcServer $rpcServer)
 	{
-		$this->rpcServer = $rpcServer;
+		$this->rpcServer=$rpcServer;
 
 		foreach($this->registerMethods() as $_methodName => $_methodDetails)
 			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
@@ -359,7 +359,7 @@ 
 	/**
 	 * @var array containing the mapping from RPC method names to the actual handlers
 	 */
-	protected $rpcMethods = array();
+	protected $rpcMethods=array();
 
 	// abstracts
 
@@ -407,7 +407,7 @@ 
 	 */
 	public function addMethod($methodName, $handlerDetails)
 	{
-		$this->rpcMethods[$methodName] = $handlerDetails;
+		$this->rpcMethods[$methodName]=$handlerDetails;
 	}
 
 	/**
@@ -421,11 +421,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);
 	}
 }
@@ -457,7 +457,7 @@ 
 	{
 		try
 		{
-			$_request = $this->decode($requestPayload);
+			$_request=$this->decode($requestPayload);
 
 			if(isset($_request['jsonrpc']))
 			{
@@ -473,15 +473,15 @@ 
 					throw new TRpcException('Missing request method', '-32600');
 
 			if(!isset($_request['params']))
-				$parameters = array();
+				$parameters=array();
 			else
-				$parameters = $_request['params'];
+				$parameters=$_request['params'];
 
 			if(!is_array($parameters))
-				$parameters = array($parameters);
+				$parameters=array($parameters);
 
 			// a request without an id is a notification that doesn't need a response
-			if($this->_id !== null)
+			if($this->_id!==null)
 			{
 				if($this->_specificationVersion==2.0)
 				{
@@ -560,7 +560,7 @@ 
 	 */
 	public function decode($data)
 	{
-		$s = json_decode($data, true);
+		$s=json_decode($data, true);
 		self::checkJsonError();
 		return $s;
 	}
@@ -572,15 +572,15 @@ 
 	 */
 	public function encode($data)
 	{
-		$s = json_encode($data);
+		$s=json_encode($data);
 		self::checkJsonError();
 		return $s;		
 	}
 
 	private static function checkJsonError()
 	{
-		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
+		$errnum=json_last_error();
+		if($errnum!=JSON_ERROR_NONE)
 			throw new Exception("JSON error: $msg", $err);
 	}
 
@@ -625,7 +625,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_xmlrpcServer = xmlrpc_server_create();
+		$this->_xmlrpcServer=xmlrpc_server_create();
 	}
 
 	/**

Braces +7 added lines, -14 removed lines

@@ -237,8 +237,7 @@ 
 		try
 		{
 			return $this->handler->callMethod($this->getPayload());
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->handler->createErrorResponse($e);
 		}
@@ -498,16 +497,13 @@ 
 					));
 				}
 			}
-		}
-		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', '-32603'));
 		}
@@ -662,16 +658,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/THttpResponseAdapter.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Constructor. Attach a response to be adapted.
 	 * @param THttpResponse the response object the adapter is to attach to.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response)
 	{

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 

framework/Web/THttpSession.php

Doc Comments +3 added lines

@@ -265,6 +265,7 @@ 
 	 * If true, make sure the methods {@link _open}, {@link _close}, {@link _read},
 	 * {@link _write}, {@link _destroy}, and {@link _gc} are overridden in child
 	 * class, because they will be used as the callback handlers.
+	 * @param boolean $value
 	 */
 	public function setUseCustomStorage($value)
 	{
@@ -527,6 +528,7 @@ 
 	 * Returns the session variable value with the session variable name.
 	 * This method is exactly the same as {@link offsetGet}.
 	 * @param mixed the session variable name
+	 * @param string $key
 	 * @return mixed the session variable value, null if no such variable exists
 	 */
 	public function itemAt($key)
@@ -539,6 +541,7 @@ 
 	 * Note, if the specified name already exists, the old value will be removed first.
 	 * @param mixed session variable name
 	 * @param mixed session variable value
+	 * @param string $key
 	 */
 	public function add($key,$value)
 	{

Indentation +2 added lines, -2 removed lines

@@ -306,10 +306,10 @@
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
-      {
+	  {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
+	  }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');

Spacing +26 added lines, -26 removed lines

@@ -67,7 +67,7 @@ 
  * @package System.Web
  * @since 3.0
  */
-class THttpSession extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpSession extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
 	/**
 	 * @var boolean whether this module has been initialized
@@ -133,9 +133,9 @@ 
 		if(!$this->_started)
 		{
 			if($this->_customStorage)
-				session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
+				session_set_save_handler(array($this, '_open'), array($this, '_close'), array($this, '_read'), array($this, '_write'), array($this, '_destroy'), array($this, '_gc'));
 			if($this->_cookie!==null)
-				session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
+				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
 			if(ini_get('session.auto_start')!=='1')
 				session_start();
 			$this->_started=true;
@@ -175,7 +175,7 @@ 
 	 */
 	public function regenerate($deleteOld=false)
 	{
-		$old = $this->getSessionID();
+		$old=$this->getSessionID();
 		session_regenerate_id($deleteOld);
 		return $old;
 	}
@@ -227,7 +227,7 @@ 
 		else if(ctype_alnum($value))
 			session_name($value);
 		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 		else if(is_dir($value))
 			session_save_path($value);
 		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
 	}
 
 	/**
@@ -277,7 +277,7 @@ 
 	public function getCookie()
 	{
 		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+			$this->_cookie=new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
 
@@ -304,21 +304,21 @@ 
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
+			$value=TPropertyValue::ensureEnum($value, 'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
       {
-				ini_set('session.use_cookies','0');
-			  ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '0');
+			  ini_set('session.use_only_cookies', '0');
       }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '0');
 			}
 			else
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','1');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '1');
 				ini_set('session.use_trans_sid', 0);
 			}
 		}
@@ -364,13 +364,13 @@ 
 		else
 		{
 			$value=TPropertyValue::ensureInteger($value);
-			if($value>=0 && $value<=100)
+			if($value >= 0 && $value <= 100)
 			{
-				ini_set('session.gc_probability',$value);
-				ini_set('session.gc_divisor','100');
+				ini_set('session.gc_probability', $value);
+				ini_set('session.gc_divisor', '100');
 			}
 			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
+				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 
@@ -392,9 +392,9 @@ 
 		else
 		{
 			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
+			if($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid',$value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 
@@ -415,7 +415,7 @@ 
 		if($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
-			ini_set('session.gc_maxlifetime',$value);
+			ini_set('session.gc_maxlifetime', $value);
 	}
 
 	/**
@@ -425,7 +425,7 @@ 
 	 * @param string session name
 	 * @return boolean whether session is opened successfully
 	 */
-	public function _open($savePath,$sessionName)
+	public function _open($savePath, $sessionName)
 	{
 		return true;
 	}
@@ -458,7 +458,7 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
 		return true;
 	}
@@ -540,7 +540,7 @@ 
 	 * @param mixed session variable name
 	 * @param mixed session variable value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$_SESSION[$key]=$value;
 	}
@@ -613,7 +613,7 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		$_SESSION[$offset]=$item;
 	}
@@ -686,7 +686,7 @@ 
 	 */
 	public function current()
 	{
-		return isset($_SESSION[$this->_key])?$_SESSION[$this->_key]:null;
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
 	}
 
 	/**

Braces +4 added lines, -8 removed lines

@@ -309,13 +309,11 @@ 
       {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
-			else if($value===THttpSessionCookieMode::Allow)
+      } else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','1');
@@ -368,8 +366,7 @@ 
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
@@ -557,8 +554,7 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 

framework/Web/UI/ActiveControls/TActiveControlAdapter.php

Doc Comments +1 added lines

@@ -175,6 +175,7 @@
 
 	/**
 	 * @param string state tracker class.
+	 * @param string $value
 	 */
 	public function setStateTracker($value)
 	{

Indentation +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
 	}
 
  	/**
-	 * Publish the ajax script
-	 */
+ 	 * Publish the ajax script
+ 	 */
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);

Spacing +53 added lines, -53 removed lines

@@ -69,12 +69,12 @@ 
 		if($type===null)
 		{
 			if($this->getControl() instanceof ICallbackEventHandler)
-				$this->_activeControlType = 'TBaseActiveCallbackControl';
+				$this->_activeControlType='TBaseActiveCallbackControl';
 			else
-				$this->_activeControlType = 'TBaseActiveControl';
+				$this->_activeControlType='TBaseActiveControl';
 		}
 		else
-			$this->_activeControlType = $type;
+			$this->_activeControlType=$type;
 	}
 
  	/**
@@ -114,8 +114,8 @@ 
 	{
 		if($this->_baseActiveControl===null)
 		{
-			$type = $this->_activeControlType;
-			$this->_baseActiveControl = new $type($this->getControl());
+			$type=$this->_activeControlType;
+			$this->_baseActiveControl=new $type($this->getControl());
 		}
 		return $this->_baseActiveControl;
 	}
@@ -127,10 +127,10 @@ 
 	{
 		if($this->getPage()->getIsCallback())
 		{
-			$target = $this->getPage()->getCallbackEventTarget();
+			$target=$this->getPage()->getCallbackEventTarget();
 			if($target instanceof ICallbackEventHandler)
 			{
-				$client = $target->getActiveControl()->getClientSide();
+				$client=$target->getActiveControl()->getClientSide();
 				return $client->getEnablePageStateUpdate();
 			}
 		}
@@ -144,8 +144,8 @@ 
 	{
 		if($this->getIsTrackingPageState())
 		{
-		  $stateTrackerClass = $this->_stateTrackerClass;
-			$this->_stateTracker = new $stateTrackerClass($this->getControl());
+		  $stateTrackerClass=$this->_stateTrackerClass;
+			$this->_stateTracker=new $stateTrackerClass($this->getControl());
 			$this->_stateTracker->trackChanges();
 		}
 		parent::onLoad($param);
@@ -178,7 +178,7 @@ 
 	 */
 	public function setStateTracker($value)
 	{
-		$this->_stateTrackerClass = TPropertyValue::ensureString($value);
+		$this->_stateTrackerClass=TPropertyValue::ensureString($value);
 	}
 }
 
@@ -216,10 +216,10 @@ 
 	 */
 	public function __construct($control)
 	{
-		$this->_control = $control;
-		$this->_existingState = new TMap;
-		$this->_nullObject = new stdClass;
-		$this->_states = new TMap;
+		$this->_control=$control;
+		$this->_existingState=new TMap;
+		$this->_nullObject=new stdClass;
+		$this->_states=new TMap;
 		$this->addStatesToTrack();
 	}
 
@@ -233,14 +233,14 @@ 
 	 */
 	protected function addStatesToTrack()
 	{
-		$states = $this->getStatesToTrack();
-		$states['Visible'] = array('TScalarDiff', array($this, 'updateVisible'));
-		$states['Enabled'] = array('TScalarDiff', array($this, 'updateEnabled'));
-		$states['Attributes'] = array('TMapCollectionDiff', array($this, 'updateAttributes'));
-		$states['Style'] = array('TStyleDiff', array($this, 'updateStyle'));
-		$states['TabIndex'] = array('TScalarDiff', array($this, 'updateTabIndex'));
-		$states['ToolTip'] = array('TScalarDiff', array($this, 'updateToolTip'));
-		$states['AccessKey'] = array('TScalarDiff', array($this, 'updateAccessKey'));
+		$states=$this->getStatesToTrack();
+		$states['Visible']=array('TScalarDiff', array($this, 'updateVisible'));
+		$states['Enabled']=array('TScalarDiff', array($this, 'updateEnabled'));
+		$states['Attributes']=array('TMapCollectionDiff', array($this, 'updateAttributes'));
+		$states['Style']=array('TStyleDiff', array($this, 'updateStyle'));
+		$states['TabIndex']=array('TScalarDiff', array($this, 'updateTabIndex'));
+		$states['ToolTip']=array('TScalarDiff', array($this, 'updateToolTip'));
+		$states['AccessKey']=array('TScalarDiff', array($this, 'updateAccessKey'));
 	}
 
 	/**
@@ -259,8 +259,8 @@ 
 	{
 		foreach($this->_states as $name => $value)
 		{
-			$obj = $this->_control->getViewState($name);
-			$this->_existingState[$name] = is_object($obj) ? clone($obj) : $obj;
+			$obj=$this->_control->getViewState($name);
+			$this->_existingState[$name]=is_object($obj) ? clone($obj) : $obj;
 		}
 	}
 
@@ -269,16 +269,16 @@ 
 	 */
 	protected function getChanges()
 	{
-		$changes = array();
+		$changes=array();
 		foreach($this->_states as $name => $details)
 		{
-			$new = $this->_control->getViewState($name);
-			$old = $this->_existingState[$name];
-			if($new !== $old)
+			$new=$this->_control->getViewState($name);
+			$old=$this->_existingState[$name];
+			if($new!==$old)
 			{
-				$diff = new $details[0]($new, $old, $this->_nullObject);
-				if(($change = $diff->getDifference()) !== $this->_nullObject)
-					$changes[] = array($details[1],array($change));
+				$diff=new $details[0]($new, $old, $this->_nullObject);
+				if(($change=$diff->getDifference())!==$this->_nullObject)
+					$changes[]=array($details[1], array($change));
 			}
 		}
 		return $changes;
@@ -335,10 +335,10 @@ 
 	 */
 	protected function updateVisible($visible)
 	{
-		if($visible === false)
-			$this->client()->replaceContent($this->_control,"<span id=\"".$this->_control->getClientID()."\" style=\"display:none\" ></span>");
+		if($visible===false)
+			$this->client()->replaceContent($this->_control, "<span id=\"".$this->_control->getClientID()."\" style=\"display:none\" ></span>");
 		else
-			$this->client()->replaceContent($this->_control,$this->_control);
+			$this->client()->replaceContent($this->_control, $this->_control);
 	}
 
 	/**
@@ -403,9 +403,9 @@ 
 	 */
 	public function __construct($new, $old, $null)
 	{
-		$this->_new = $new;
-		$this->_old = $old;
-		$this->_null = $null;
+		$this->_new=$new;
+		$this->_old=$old;
+		$this->_null=$null;
 	}
 
 	/**
@@ -430,8 +430,8 @@ 
 	 */
 	public function getDifference()
 	{
-		if(gettype($this->_new) === gettype($this->_old)
-			&& $this->_new === $this->_old)
+		if(gettype($this->_new)===gettype($this->_old)
+			&& $this->_new===$this->_old)
 			return $this->_null;
 		else
 			return $this->_new;
@@ -457,10 +457,10 @@ 
 	{
 		if(!($obj instanceof TStyle))
 			return array();
-		$style = $obj->getStyleFields();
-		$style = array_merge($style,$this->getStyleFromString($obj->getCustomStyle()));
+		$style=$obj->getStyleFields();
+		$style=array_merge($style, $this->getStyleFromString($obj->getCustomStyle()));
 		if($obj->hasFont())
-			$style = array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
+			$style=array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
 		return $style;
 	}
 
@@ -470,14 +470,14 @@ 
 	 */
 	protected function getStyleFromString($string)
 	{
-		$style = array();
+		$style=array();
 		if(!is_string($string)) return $style;
 
-		foreach(explode(';',$string) as $sub)
+		foreach(explode(';', $string) as $sub)
 		{
-			$arr=explode(':',$sub);
+			$arr=explode(':', $sub);
 			if(isset($arr[1]) && trim($arr[0])!=='')
-				$style[trim($arr[0])] = trim($arr[1]);
+				$style[trim($arr[0])]=trim($arr[1]);
 		}
 		return $style;
 	}
@@ -494,7 +494,7 @@ 
 		}
 		else
 		{
-			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
+			return $this->_old->getCssClass()!==$this->_new->getCssClass() ?
 				$this->_new->getCssClass() : null;
 		}
 	}
@@ -504,7 +504,7 @@ 
 	 */
 	protected function getStyleDiff()
 	{
-		$diff = array_diff_assoc(
+		$diff=array_diff_assoc(
 					$this->getCombinedStyle($this->_new),
 					$this->getCombinedStyle($this->_old));
 		return count($diff) > 0 ? $diff : null;
@@ -519,8 +519,8 @@ 
 			return $this->_null;
 		else
 		{
-			$css = $this->getCssClassDiff();
-			$style = $this->getStyleDiff();
+			$css=$this->getCssClassDiff();
+			$style=$this->getStyleDiff();
 			if(($css!==null) || ($style!==null))
 				return array('CssClass' => $css, 'Style' => $style);
 			else
@@ -551,9 +551,9 @@ 
 		}
 		else
 		{
-			$new = $this->_new->toArray();
-			$old = $this->_old->toArray();
-			$diff = array_diff_assoc($new, $old);
+			$new=$this->_new->toArray();
+			$old=$this->_old->toArray();
+			$diff=array_diff_assoc($new, $old);
 			return count($diff) > 0 ? $diff : $this->_null;
 		}
 	}

Braces +3 added lines, -6 removed lines

@@ -72,8 +72,7 @@ 
 				$this->_activeControlType = 'TBaseActiveCallbackControl';
 			else
 				$this->_activeControlType = 'TBaseActiveControl';
-		}
-		else
+		} else
 			$this->_activeControlType = $type;
 	}
 
@@ -491,8 +490,7 @@ 
 		{
 			return ($this->_new!==null) && $this->_new->hasCssClass()
 						? $this->_new->getCssClass() : null;
-		}
-		else
+		} else
 		{
 			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
 				$this->_new->getCssClass() : null;
@@ -548,8 +546,7 @@ 
 		if($this->_old===null)
 		{
 			return ($this->_new!==null) ? $this->_new->toArray() : $this->_null;
-		}
-		else
+		} else
 		{
 			$new = $this->_new->toArray();
 			$old = $this->_old->toArray();

framework/Web/UI/ActiveControls/TActiveCustomValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var boolean true if validation is made during a callback request.
 	 */
-	private $_isCallback = false;
+	private $_isCallback=false;
 
 	/**
 	 * @return boolean true if validation is made during a callback request.
@@ -93,8 +93,8 @@ 
 	 */
  	public function raiseCallbackEvent($param)
 	{
-		$this->_isCallback = true;
-		$result = $this->onServerValidate($param->getCallbackParameter());
+		$this->_isCallback=true;
+		$result=$this->onServerValidate($param->getCallbackParameter());
 		$param->setResponseData($result);
 		$this->onCallback($param);
 	}
@@ -110,8 +110,8 @@ 
 		parent::setIsValid($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
-			$client = $this->getPage()->getCallbackClient();
-			$func = 'Prado.Validation.updateActiveCustomValidator';
+			$client=$this->getPage()->getCallbackClient();
+			$func='Prado.Validation.updateActiveCustomValidator';
 			$client->callClientFunction($func, array($this, $value));
 		}
 	}
@@ -135,7 +135,7 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options=TBaseValidator::getClientScriptOptions();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 
@@ -145,15 +145,15 @@ 
 	 */
 	public function setErrorMessage($value)
 	{
-		if(parent::getErrorMessage() === $value)
+		if(parent::getErrorMessage()===$value)
 			return;
 
 
 		parent::setErrorMessage($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
-			$client = $this->getPage()->getCallbackClient();
-			$func = 'Prado.Validation.setErrorMessage';
+			$client=$this->getPage()->getCallbackClient();
+			$func='Prado.Validation.setErrorMessage';
 			$client->callClientFunction($func, array($this, $value));
 		}
 	}
@@ -263,7 +263,7 @@ 
 	 */
 	public function getObserveChanges()
 	{
-		$changes = $this->getOption('ObserveChanges');
+		$changes=$this->getOption('ObserveChanges');
 		return ($changes===null) ? true : $changes;
 	}
 }

framework/Web/UI/ActiveControls/TActiveDropDownList.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	/**
 	 * No client class for this control.
 	 * This method overrides the parent implementation.
-	 * @return null no javascript class name.
+	 * @return string no javascript class name.
 	 */
 	protected function getClientClassName()
 	{

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 	 */
 	protected function createListItemCollection()
 	{
-		$collection  = new TActiveListItemCollection;
+		$collection=new TActiveListItemCollection;
 		$collection->setControl($this);
 		return $collection;
 	}
@@ -102,8 +102,8 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
-		if ($this->getAutoPostBack())
+		$writer->addAttribute('id', $this->getClientID());
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TActiveImageButton.php

Doc Comments +1 added lines

@@ -79,6 +79,7 @@
 
 	/**
 	 * @param string the URL of the image file
+	 * @param string $value
 	 */
 	public function setImageUrl($value)
 	{

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -75,7 +75,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -88,7 +88,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -101,7 +101,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);
@@ -151,7 +151,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}