pradosoft / prado

framework/Web/TAssetManager.php

Doc Comments +9 added lines

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

Braces +2 added lines, -4 removed lines

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

Spacing +26 added lines, -26 removed lines

@@ -82,9 +82,9 @@ 
 		if($this->_basePath===null)
 			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
 		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -111,7 +111,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 
@@ -132,7 +132,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -149,19 +149,19 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
 		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
 		else if(is_file($fullpath))
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
+				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
@@ -169,8 +169,8 @@ 
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				Prado::trace("Publishing directory $fullpath",'System.Web.UI.TAssetManager');
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				Prado::trace("Publishing directory $fullpath", 'System.Web.UI.TAssetManager');
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
@@ -191,7 +191,7 @@ 
 	 */
 	protected function setPublished($values=array())
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
 	 */
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -252,10 +252,10 @@ 
 			@chmod($dst, PRADO_CHMOD);
 		}
 		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		if(@filemtime($dstFile) < @filemtime($src))
 		{
-			Prado::trace("Publishing file $src to $dstFile",'System.Web.TAssetManager');
-			@copy($src,$dstFile);
+			Prado::trace("Publishing file $src to $dstFile", 'System.Web.TAssetManager');
+			@copy($src, $dstFile);
 		}
 	}
 
@@ -267,7 +267,7 @@ 
 	 * @param string the destination directory
 	 * @todo a generic solution to ignore certain directories and files
 	 */
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -282,14 +282,14 @@ 
 					continue;
 				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -313,7 +313,7 @@ 
 		if(isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
 		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir=$this->hash(dirname($fullpath));
@@ -321,10 +321,10 @@ 
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
@@ -338,14 +338,14 @@ 
 	 * @param string path where the contents of tar file are to be extracted
 	 * @return boolean true if extract successful, false otherwise.
 	 */
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}

framework/Web/THttpRequest.php

Doc Comments +6 added lines, -1 removed lines

@@ -258,6 +258,7 @@ 
 
 	/**
 	 * Saves the current UrlManager instance to cache.
+	 * @param TUrlManager $manager
 	 * @return boolean true if UrlManager instance was cached, false otherwise.
 	 */
 	protected function cacheUrlManager($manager)
@@ -349,7 +350,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{
@@ -710,6 +711,7 @@ 
 	 * @param array GET parameters, null if not needed
 	 * @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 false.
+	 * @param string $serviceID
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
@@ -980,6 +982,7 @@ 
 	/**
 	 * Constructor.
 	 * @param mixed owner of this collection.
+	 * @param THttpResponse $owner
 	 */
 	public function __construct($owner=null)
 	{
@@ -1125,6 +1128,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)
 	{
@@ -1287,6 +1291,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)

Braces +8 added lines, -16 removed lines

@@ -224,8 +224,7 @@ 
 				$port=$_SERVER['SERVER_PORT'];
 				if(($port!=80 && !$secure) || ($port!=443 && $secure))
 					$url.=':'.$port;
-			}
-			else
+			} else
 				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
@@ -333,8 +332,7 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
@@ -454,8 +452,7 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -558,8 +555,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -662,8 +658,7 @@ 
 					if(($value=$sm->validateData($value))!==false)
 						$this->_cookies->add(new THttpCookie($key,$value));
 				}
-			}
-			else
+			} else
 			{
 				foreach($_COOKIE as $key=>$value)
 					$this->_cookies->add(new THttpCookie($key,$value));
@@ -880,8 +875,7 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1001,8 +995,7 @@ 
 			parent::insertAt($index,$item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 
@@ -1303,8 +1296,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);
 		}

Spacing +80 added lines, -80 removed lines

@@ -66,10 +66,10 @@ 
  * @package System.Web
  * @since 3.0
  */
-class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpRequest extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
+	const CGIFIX__PATH_INFO=1;
+	const CGIFIX__SCRIPT_NAME=2;
 	/**
 	 * @var TUrlManager the URL manager module
 	 */
@@ -172,14 +172,14 @@ 
 		if(isset($_SERVER['REQUEST_URI']))
 			$this->_requestUri=$_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
+			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']);
 
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
 			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
 		elseif(isset($_SERVER['PATH_INFO']))
 			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+		else if(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo=substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
 			$this->_pathInfo='';
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 		if($this->_url===null)
 		{
 			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
+			$url=$secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
 				$url.=$_SERVER['SERVER_NAME'];
@@ -240,7 +240,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -264,15 +264,15 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					if($manager instanceof TUrlMapping && $fn=$manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
-						$dependencies = new TFileCacheDependency($fn);
+						$fn=Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
+						$dependencies=new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -288,10 +288,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TUrlManager)
 					return $manager;
 			}
@@ -327,7 +327,7 @@ 
 	{
 		if($this->_urlManager===null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if(($this->_urlManager=$this->loadCachedUrlManager())===null)
 			{
 				if(empty($this->_urlManagerID))
 				{
@@ -338,9 +338,9 @@ 
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
 					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -366,7 +366,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -394,19 +394,19 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
 	 * @param boolean $mimetypeOnly whether to return only the mimetype (default: true)
 	 * @return string content type (e.g. 'application/json' or 'text/html; encoding=gzip') or null if not specified
 	 */
-	public function getContentType($mimetypeOnly = true)
+	public function getContentType($mimetypeOnly=true)
 	{
 		if(!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if($mimetypeOnly===true && ($_pos=strpos(';', $_SERVER['CONTENT_TYPE']))!==false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -417,7 +417,7 @@ 
 	 */
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
@@ -452,19 +452,19 @@ 
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
-			$result = apache_request_headers();
+		if($result===null && function_exists('apache_request_headers')) {
+			$result=apache_request_headers();
 		}
-		elseif($result === null) {
-			$result = array();
+		elseif($result===null) {
+			$result=array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
-					$result[$key] = $value;
+				if(strncasecmp($key, 'HTTP_', 5)!==0) continue;
+					$key=str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
+					$result[$key]=$value;
 			}
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -488,9 +488,9 @@ 
 	public function getBaseUrl($forceSecureConnection=null)
 	{
 		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
+		$scheme=($forceSecureConnection) ? "https" : (($forceSecureConnection===null) ? $url->getScheme() : 'http');
 		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
+		if(($port=$url->getPort())) $host.=':'.$port;
 		return $scheme.'://'.$host;
 	}
 
@@ -499,10 +499,10 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -514,7 +514,7 @@ 
 	 */
 	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
 	{
-		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
+		return $this->getBaseUrl($forceSecureConnection).$this->getApplicationUrl();
 	}
 
 	/**
@@ -522,7 +522,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -539,7 +539,7 @@ 
 	 */
 	public function getServerSoftware()
 	{
-		return isset($_SERVER['SERVER_SOFTWARE'])?$_SERVER['SERVER_SOFTWARE']:null;
+		return isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null;
 	}
 
 	/**
@@ -547,7 +547,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -555,7 +555,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -579,7 +579,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -587,7 +587,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -604,7 +604,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -669,13 +669,13 @@ 
 				foreach($_COOKIE as $key=>$value)
 				{
 					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
 				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -722,13 +722,13 @@ 
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if($this->_cookieOnly===null)
+				$this->_cookieOnly=(int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url=$this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if(defined('SID') && SID!='' && !$this->_cookieOnly)
+			return $url.(strpos($url, '?')===false ? '?' : ($encodeAmpersand ? '&' : '&')).SID;
 		else
 			return $url;
 	}
@@ -756,11 +756,11 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'System.Web.THttpRequest');
+		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'], 'System.Web.THttpRequest');
 		$getParams=$this->parseUrl();
 		foreach($getParams as $name=>$value)
 			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
+		$this->_items=array_merge($_GET, $_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
 		{
@@ -871,7 +871,7 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$this->_items[$key]=$value;
 	}
@@ -884,7 +884,7 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if(isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
@@ -909,7 +909,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 
 	/**
@@ -948,9 +948,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**
@@ -1003,11 +1003,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);
 		}
@@ -1102,7 +1102,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;
@@ -1153,7 +1153,7 @@ 
 	 */
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1303,19 +1303,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);
 		}
 	}
 

framework/Web/TUrlMapping.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()
 	{

Spacing +68 added lines, -68 removed lines

@@ -116,7 +116,7 @@ 
 				$this->_urlPrefix=$request->getApplicationUrl();
 			}
 		}
-		$this->_urlPrefix=rtrim($this->_urlPrefix,'/');
+		$this->_urlPrefix=rtrim($this->_urlPrefix, '/');
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$config = include $this->_configFile;
+				$config=include $this->_configFile;
 				$this->loadUrlMappings($dom);
 			}
 			else
@@ -140,7 +140,7 @@ 
 			}
 		}
 		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
+			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	protected function loadUrlMappings($config)
 	{
-		$defaultClass = $this->getDefaultMappingClass();
+		$defaultClass=$this->getDefaultMappingClass();
 
 		if(is_array($config))
 		{
@@ -241,9 +241,9 @@ 
 			{
 				foreach($config['urls'] as $url)
 				{
-					$class=isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:array();
-					$this->buildUrlMapping($class,$properties,$url);
+					$class=isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties=isset($url['properties']) ? $url['properties'] : array();
+					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
 		}
@@ -254,24 +254,24 @@ 
 				$properties=$url->getAttributes();
 				if(($class=$properties->remove('class'))===null)
 					$class=$defaultClass;
-				$this->buildUrlMapping($class,$properties,$url);
+				$this->buildUrlMapping($class, $properties, $url);
 			}
 		}
 	}
 
 	private function buildUrlMapping($class, $properties, $url)
 	{
-		$pattern=Prado::createComponent($class,$this);
+		$pattern=Prado::createComponent($class, $this);
 		if(!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
 		foreach($properties as $name=>$value)
-			$pattern->setSubproperty($name,$value);
+			$pattern->setSubproperty($name, $value);
 
 		if($url instanceof TXmlElement) {
-			$text = $url -> getValue();
+			$text=$url -> getValue();
 			if($text) {
-				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
+				$text=preg_replace('/(\s+)/S', '', $text);
+				if(($regExp=$pattern->getRegularExpression())!=='')
 				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
@@ -304,7 +304,7 @@ 
 		foreach($this->_patterns as $pattern)
 		{
 			$matches=$pattern->getPatternMatches($request);
-			if(count($matches)>0)
+			if(count($matches) > 0)
 			{
 				$this->_matched=$pattern;
 				$params=array();
@@ -313,7 +313,7 @@ 
 					if(is_string($key))
 						$params[$key]=$value;
 				}
-				if (!$pattern->getIsWildCardPattern())
+				if(!$pattern->getIsWildCardPattern())
 					$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
 				return $params;
 			}
@@ -345,21 +345,21 @@ 
 	 * @see parseUrl
 	 * @since 3.1.1
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		if($this->_customUrl)
 		{
 			if(!(is_array($getItems) || ($getItems instanceof Traversable)))
 				$getItems=array();
 			$key=$serviceID.':'.$serviceParam;
-			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
-				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
+			$wildCardKey=($pos=strrpos($serviceParam, '.'))!==false ?
+				$serviceID.':'.substr($serviceParam, 0, $pos).'.*' : $serviceID.':*';
 			if(isset($this->_constructRules[$key]))
 			{
 				foreach($this->_constructRules[$key] as $rule)
 				{
 					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 				}
 			}
 			elseif(isset($this->_constructRules[$wildCardKey]))
@@ -368,13 +368,13 @@ 
 				{
 					if($rule->supportCustomUrl($getItems))
 					{
-						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						$getItems['*']=$pos ? substr($serviceParam, $pos + 1) : $serviceParam;
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 					}
 				}
 			}
 		}
-		return parent::constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
+		return parent::constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -528,7 +528,7 @@ 
 	 * @var TUrlMappingPatternSecureConnection
 	 * @since 3.2
 	 */
-	private $_secureConnection = TUrlMappingPatternSecureConnection::Automatic;
+	private $_secureConnection=TUrlMappingPatternSecureConnection::Automatic;
 
 	/**
 	 * Constructor.
@@ -556,7 +556,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;
 	}
 
@@ -569,7 +569,7 @@ 
 	{
 		$params=array();
 		$values=array();
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -577,7 +577,7 @@ 
 				$values[]='(?P<'.$key.'>'.$value.')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
 				$params[]='{*}';
 				// service parameter must not contain '=' and '/'
@@ -585,8 +585,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';
@@ -673,7 +673,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->_pattern = $value;
+		$this->_pattern=$value;
 	}
 
 	/**
@@ -681,7 +681,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
 			$this->_parameters=new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
@@ -703,9 +703,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;
@@ -721,17 +721,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 : '';
@@ -741,7 +741,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;
 				}
 			}
@@ -751,7 +751,7 @@ 
 		if(count($matches) > 0 && $this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
-				$matches[$key] = $value;
+				$matches[$key]=$value;
 		}
 
 		return $matches;
@@ -805,7 +805,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -843,7 +843,7 @@ 
 	 */
 	public function setSecureConnection($value)
 	{
-		$this->_secureConnection = TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
+		$this->_secureConnection=TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 	{
 		if(!$this->_customUrl || $this->getPattern()===null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -864,13 +864,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;
 			}
 		}
@@ -885,9 +885,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)
 			{
@@ -906,19 +906,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)
@@ -946,7 +946,7 @@ 
 						$url2.=$amp.$name.'='.$value;
 				}
 			}
-			$url=$url.'?'.substr($url2,strlen($amp));
+			$url=$url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -962,26 +962,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:
@@ -1007,29 +1007,29 @@ 
 	 * Keep current SecureConnection status
 	 * means no prefixing
 	 */
-	const Automatic = 'Automatic';
+	const Automatic='Automatic';
 
 	/**
 	 * Force use secured connection
 	 * always prefixing with https://example.com/path/to/app
 	 */
-	const Enable = 'Enable';
+	const Enable='Enable';
 
 	/**
 	 * Force use unsecured connection
 	 * always prefixing with http://example.com/path/to/app
 	 */
-	const Disable = 'Disable';
+	const Disable='Disable';
 
 	/**
 	 * Force use secured connection, if in unsecured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const EnableIfNotSecure = 'EnableIfNotSecure';
+	const EnableIfNotSecure='EnableIfNotSecure';
 
 	/**
 	 * Force use unsecured connection, if in secured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const DisableIfSecure = 'DisableIfSecure';
+	const DisableIfSecure='DisableIfSecure';
 }

Braces +11 added lines, -18 removed lines

@@ -131,15 +131,13 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 	}
 
@@ -246,8 +244,7 @@ 
 					$this->buildUrlMapping($class,$properties,$url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
@@ -361,8 +358,7 @@ 
 					if($rule->supportCustomUrl($getItems))
 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{
@@ -733,10 +729,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)
@@ -928,12 +924,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)
 				{
@@ -941,8 +935,7 @@ 
 					{
 						foreach($value as $v)
 							$url2.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url2.=$amp.$name.'='.$value;
 				}
 			}

framework/Web/UI/WebControls/TImageButton.php

Doc Comments +5 added lines

@@ -220,6 +220,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageClickEventParameter event parameter to be passed to the event handlers
+	 * @param TImageClickEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -232,6 +233,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{
@@ -324,6 +326,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -396,6 +399,8 @@ 
 	 * Constructor.
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
+	 * @param integer $x
+	 * @param integer $y
 	 */
 	public function __construct($x,$y)
 	{

Braces +2 added lines, -4 removed lines

@@ -106,8 +106,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -141,8 +140,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +29 added lines, -29 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -99,16 +99,16 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
+		$writer->addAttribute('type', 'image');
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getEnabled(true))
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -117,9 +117,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -151,7 +151,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -177,10 +177,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 
 		return $options;
 	}
@@ -192,7 +192,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uid=$this->getUniqueID();
 		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
@@ -223,7 +223,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
 	 */
-	public function __construct($x,$y)
+	public function __construct($x, $y)
 	{
 		$this->_x=$x;
 		$this->_y=$y;

framework/Web/UI/WebControls/TListItem.php

Doc Comments +3 added lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * @param boolean whether the item is enabled
+	 * @param boolean $value
 	 */
 	public function setEnabled($value)
 	{
@@ -108,6 +109,7 @@ 
 
 	/**
 	 * @param boolean whether the item is selected
+	 * @param boolean $value
 	 */
 	public function setSelected($value)
 	{
@@ -184,6 +186,7 @@ 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{

Spacing +17 added lines, -17 removed lines

@@ -53,7 +53,7 @@ 
 	 * @param boolean whether the item is enabled
 	 * @param boolean whether the item is selected
 	 */
-	public function __construct($text='',$value='',$enabled=true,$selected=false)
+	public function __construct($text='', $value='', $enabled=true, $selected=false)
 	{
 		$this->setText($text);
 		$this->setValue($value);
@@ -70,16 +70,16 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_attributes===null)
-			$exprops[] = "\0TListItem\0_attributes";
+		if($this->_attributes===null)
+			$exprops[]="\0TListItem\0_attributes";
 		if($this->_text==='')
-			$exprops[] = "\0TListItem\0_text";
+			$exprops[]="\0TListItem\0_text";
 		if($this->_value==='')
-			$exprops[] = "\0TListItem\0_value";
-		if ($this->_enabled===true)
-			$exprops[] = "\0TListItem\0_enabled";
-		if ($this->_selected===false)
-			$exprops[] = "\0TListItem\0_selected";
+			$exprops[]="\0TListItem\0_value";
+		if($this->_enabled===true)
+			$exprops[]="\0TListItem\0_enabled";
+		if($this->_selected===false)
+			$exprops[]="\0TListItem\0_selected";
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text===''?$this->_value:$this->_text;
+		return $this->_text==='' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value===''?$this->_text:$this->_value;
+		return $this->_value==='' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		return $this->_attributes && $this->_attributes->getCount()>0;
+		return $this->_attributes && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -178,16 +178,16 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }
 

framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 			case 'datetime': case 'timestamp':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -50,16 +50,16 @@ 
 			case 'time':
 				return $this->getTimeValue($container, $column, $record);
 			case 'datetime': case 'timestamp':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$control = parent::createDateControl($container, $column, $record);
-		$value = $this->getRecordPropertyValue($column, $record);
+		$control=parent::createDateControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 			$control->setTimestamp(intval($value));
 		return $control;
@@ -67,12 +67,12 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$time = parent::createDateTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$time=parent::createDateTimeControl($container, $column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate(intval($value));
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate(intval($value));
 			$time[1]->setSelectedValue($date['hours']);
 			$time[2]->setSelectedValue($date['minutes']);
 			$time[3]->setSelectedValue($date['seconds']);
@@ -84,13 +84,13 @@ 
 	{
 		if(preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$time = $container->findControl(self::DEFAULT_ID)->getTimestamp();
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate($time);
-			$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-			$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-			$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
-			return $s->getTimeStamp($hour,$mins,$secs,$date['mon'],$date['mday'],$date['year']);
+			$time=$container->findControl(self::DEFAULT_ID)->getTimestamp();
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate($time);
+			$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+			$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+			$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
+			return $s->getTimeStamp($hour, $mins, $secs, $date['mon'], $date['mday'], $date['year']);
 		}
 		else
 			return parent::getDateTimeValue($container, $column, $record);

framework/Data/SqlMap/DataMapper/TPropertyAccess.php

Braces +6 added lines, -12 removed lines

@@ -61,8 +61,7 @@ 
 					$object = $object[$prop];
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -73,8 +72,7 @@ 
 					$object = $object->{$prop};
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else
+			} else
 				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
 		}
 		return $object;
@@ -98,8 +96,7 @@ 
 					$object = $object[$prop];
 				else
 					return false;
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -110,8 +107,7 @@ 
 					$object = $object->{$prop};
 				else
 					return false;
-			}
-			else
+			} else
 				return false;
 		}
 		return true;
@@ -136,16 +132,14 @@ 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
 			$object[$prop] = $value;
-		}
-		else if(is_object($object))
+		} else if(is_object($object))
 		{
 			$setter = 'set'.$prop;
 			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
 				$object->{$prop} = $value;
-		}
-		else
+		} else
 			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
 	}
 

Spacing +25 added lines, -25 removed lines

@@ -48,34 +48,34 @@ 
 	 * @return mixed property value.
 	 * @throws TInvalidDataValueException if property path is invalid.
 	 */
-	public static function get($object,$path)
+	public static function get($object, $path)
 	{
 		if(!is_array($object) && !is_object($object))
 			return $object;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else
-				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+				throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 		}
 		return $object;
 	}
@@ -89,25 +89,25 @@ 
 	{
 		if(!is_array($object) && !is_object($object))
 			return false;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
 					return false;
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
 					return false;
 			}
@@ -126,27 +126,27 @@ 
 	 */
 	public static function set(&$originalObject, $path, $value)
 	{
-		$properties = explode('.', $path);
-		$prop = array_pop($properties);
+		$properties=explode('.', $path);
+		$prop=array_pop($properties);
 		if(count($properties) > 0)
-			$object = self::get($originalObject, implode('.',$properties));
+			$object=self::get($originalObject, implode('.', $properties));
 		else
-			$object = &$originalObject;
+			$object=&$originalObject;
 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
-			$object[$prop] = $value;
+			$object[$prop]=$value;
 		}
 		else if(is_object($object))
 		{
-			$setter = 'set'.$prop;
-			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
+			$setter='set'.$prop;
+			if(method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
-				$object->{$prop} = $value;
+				$object->{$prop}=$value;
 		}
 		else
-			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
+			throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 	}
 
 }

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
 			if($handler!==null)
@@ -165,7 +165,7 @@ 
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -179,18 +179,18 @@ 
 	 * @param array row data.
 	 * @return TResultMap result sub-map.
 	 */
-	public function resolveSubMap($registry,$row)
+	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator())!==null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry,$row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
 			if($subMap===null)
-				$subMap = $this;
-			else if($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry,$row);
+				$subMap=$this;
+			else if($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$offset = $offset!==null ? intval($offset) : -1;
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
 		if($limit > 0 || $offset > 0)
 		{
-			$limitStr = ' LIMIT '.$limit;
-			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+			$limitStr=' LIMIT '.$limit;
+			$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
 			return $sql.$limitStr.$offsetStr;
 		}
 		else