pradosoft / prado

framework/Exceptions/TErrorHandler.php

Doc Comments +11 added lines

@@ -117,6 +117,7 @@ 
 	 * It terminates the application immediately after the error is displayed.
 	 * @param mixed sender of the event
 	 * @param mixed event parameter (if the event is raised by TApplication, it refers to the exception instance)
+	 * @param null|\Prado\TApplication $sender
 	 */
 	public function handleError($sender,$param)
 	{
@@ -186,6 +187,7 @@ 
 	 * mode will be displayed to the client user.
 	 * @param integer response status code
 	 * @param Exception exception instance
+	 * @param integer $statusCode
 	 */
 	protected function handleExternalError($statusCode,$exception)
 	{
@@ -382,6 +384,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getExactTraceAsString($exception)
 	{
 		if($exception instanceof TPhpFatalErrorException && 
@@ -409,6 +414,9 @@ 
 		return $exception->getTraceAsString();
 	}
 
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace,$pattern)
 	{
 		$result=null;
@@ -441,6 +449,9 @@ 
 		return $source;
 	}
 
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';

Spacing +46 added lines, -46 removed lines

@@ -106,7 +106,7 @@ 
 		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
 			$this->_templatePath=$templatePath;
 		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter (if the event is raised by TApplication, it refers to the exception instance)
 	 */
-	public function handleError($sender,$param)
+	public function handleError($sender, $param)
 	{
 		static $handling=false;
 		// We need to restore error and exception handlers,
@@ -137,11 +137,11 @@ 
 			if(!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
 			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
+				$this->handleExternalError($param->getStatusCode(), $param);
 			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
 
@@ -154,28 +154,28 @@ 
 	 */
 	protected static function hideSecurityRelated($value, $exception=null)
 	{
-		$aRpl = array();
-		if($exception !== null && $exception instanceof \Exception)
+		$aRpl=array();
+		if($exception!==null && $exception instanceof \Exception)
 		{
 			if($exception instanceof TPhpFatalErrorException && 
 				function_exists('xdebug_get_function_stack'))
 			{
-				$aTrace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
+				$aTrace=array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
 			} else {
-				$aTrace = $exception->getTrace();
+				$aTrace=$exception->getTrace();
 			}
 
 			foreach($aTrace as $item)
 			{
 				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+					$aRpl[dirname($item['file']).DIRECTORY_SEPARATOR]='<hidden>'.DIRECTORY_SEPARATOR;
 			}
 		}
-		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
-		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
-		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
+		$aRpl[$_SERVER['DOCUMENT_ROOT']]='${DocumentRoot}';
+		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])]='${DocumentRoot}';
+		$aRpl[PRADO_DIR.DIRECTORY_SEPARATOR]='${PradoFramework}'.DIRECTORY_SEPARATOR;
 		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
-		$aRpl = array_reverse($aRpl, true);
+		$aRpl=array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
@@ -187,36 +187,36 @@ 
 	 * @param integer response status code
 	 * @param Exception exception instance
 	 */
-	protected function handleExternalError($statusCode,$exception)
+	protected function handleExternalError($statusCode, $exception)
 	{
 		if(!($exception instanceof THttpException))
 			error_log($exception->__toString());
 
-		$content=$this->getErrorTemplate($statusCode,$exception);
+		$content=$this->getErrorTemplate($statusCode, $exception);
 
-		$serverAdmin=isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
+		$serverAdmin=isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
 
-		$isDebug = $this->getApplication()->getMode()===TApplicationMode::Debug;
+		$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
 
-		$errorMessage = $exception->getMessage();
+		$errorMessage=$exception->getMessage();
 		if($isDebug)
 			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 		{
 			$version='';
-			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
+			$errorMessage=self::hideSecurityRelated($errorMessage, $exception);
 		}
 		$tokens=array(
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
 		$this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -261,8 +261,8 @@ 
 		if($exception instanceof TTemplateException)
 		{
 			$fileName=$exception->getTemplateFile();
-			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
-			$source=$this->getSourceCode($lines,$exception->getLineNumber());
+			$lines=empty($fileName) ? explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source=$this->getSourceCode($lines, $exception->getLineNumber());
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
@@ -279,7 +279,7 @@ 
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
 			}
-			$source=$this->getSourceCode(@file($fileName),$errorLine);
+			$source=$this->getSourceCode(@file($fileName), $errorLine);
 		}
 
 		if($this->getApplication()->getMode()===TApplicationMode::Debug)
@@ -294,12 +294,12 @@ 
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($this->getExactTraceAsString($exception)),
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
 		$content=$this->getExceptionTemplate($exception);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -336,7 +336,7 @@ 
 	 * @param Exception the exception to be displayed
 	 * @return string the template content
 	 */
-	protected function getErrorTemplate($statusCode,$exception)
+	protected function getErrorTemplate($statusCode, $exception)
 	{
 		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
 		$lang=Prado::getPreferredLanguage();
@@ -359,7 +359,7 @@ 
 		if($exception instanceof TPhpFatalErrorException && 
 			function_exists('xdebug_get_function_stack'))
 		{
-			$trace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
+			$trace=array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
 		} else {
 			$trace=$exception->getTrace();
 		}
@@ -373,10 +373,10 @@ 
 				$result=$trace[1];
 		} elseif($exception instanceof TInvalidOperationException) {
 			// in case of getter or setter error, find out the exact file and row
-			if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
-				$result=$this->getPropertyAccessTrace($trace,'__set');
+			if(($result=$this->getPropertyAccessTrace($trace, '__get'))===null)
+				$result=$this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
+		if($result!==null && strpos($result['file'], ': eval()\'d code')!==false)
 			return null;
 
 		return $result;
@@ -387,19 +387,19 @@ 
 		if($exception instanceof TPhpFatalErrorException && 
 			function_exists('xdebug_get_function_stack'))
 		{
-			$trace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
-			$txt = '';
-			$row = 0;
+			$trace=array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
+			$txt='';
+			$row=0;
 
 			// try to mimic Exception::getTraceAsString()
 			foreach($trace as $line)
 			{
 				if(array_key_exists('function', $line))
-					$func = $line['function'] . '(' . implode(',', $line['params']) . ')';
+					$func=$line['function'].'('.implode(',', $line['params']).')';
 				else
-					$func = 'unknown';
+					$func='unknown';
 
-				$txt .= '#' . $row . ' ' . $line['file'] . '(' . $line['line'] . '): ' . $func . "\n";
+				$txt.='#'.$row.' '.$line['file'].'('.$line['line'].'): '.$func."\n";
 				$row++;
 			}
 
@@ -409,7 +409,7 @@ 
 		return $exception->getTraceAsString();
 	}
 
-	private function getPropertyAccessTrace($trace,$pattern)
+	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result=null;
 		foreach($trace as $t)
@@ -422,21 +422,21 @@ 
 		return $result;
 	}
 
-	private function getSourceCode($lines,$errorLine)
+	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine=$errorLine-self::SOURCE_LINES>=0?$errorLine-self::SOURCE_LINES:0;
-		$endLine=$errorLine+self::SOURCE_LINES<=count($lines)?$errorLine+self::SOURCE_LINES:count($lines);
+		$beginLine=$errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine=$errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 
 		$source='';
-		for($i=$beginLine;$i<$endLine;++$i)
+		for($i=$beginLine; $i < $endLine; ++$i)
 		{
-			if($i===$errorLine-1)
+			if($i===$errorLine - 1)
 			{
-				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$line=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
 			}
 			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$source.=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
@@ -444,7 +444,7 @@ 
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
-		return preg_replace('/\b(T[A-Z]\w+)\b/',"<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>",$message);
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
 

Braces +4 added lines, -8 removed lines

@@ -234,8 +234,7 @@ 
 			echo "<body><h1>Recursive Error</h1>\n";
 			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
@@ -266,15 +265,13 @@ 
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
-		}
-		else
+		} else
 		{
 			if(($trace=$this->getExactTrace($exception))!==null)
 			{
 				$fileName=$trace['file'];
 				$errorLine=$trace['line'];
-			}
-			else
+			} else
 			{
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
@@ -434,8 +431,7 @@ 
 			{
 				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
-			}
-			else
+			} else
 				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;

framework/PradoBase.php

Doc Comments +2 added lines, -1 removed lines

@@ -205,7 +205,7 @@ 
 	 * module of the Prado application to handle the exception.
 	 * If the application or the module does not exist, it simply echoes the
 	 * exception.
-	 * @param Exception exception that is not caught
+	 * @param Exception TPhpFatalErrorException that is not caught
 	 */
 	public static function exceptionHandler($exception)
 	{
@@ -227,6 +227,7 @@ 
 	 * will cause the throw of an exception.
 	 * This method should only be used by framework developers.
 	 * @param TApplication the application instance
+	 * @param TApplication $application
 	 * @throws TInvalidOperationException if this method is invoked twice or more.
 	 */
 	public static function setApplication($application)

Spacing +87 added lines, -87 removed lines

@@ -30,14 +30,14 @@ 
  * Defines the default permission for writable directories and files
  */
 if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+	define('PRADO_CHMOD', 0777);
 /**
  * Defines the Composer's vendor/ path.
  */
 if(!defined('PRADO_VENDORDIR'))
 {
-	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');
-	define('PRADO_VENDORDIR',dirname(dirname($reflector->getFileName())));
+	$reflector=new \ReflectionClass('\Composer\Autoload\ClassLoader');
+	define('PRADO_VENDORDIR', dirname(dirname($reflector->getFileName())));
 }
 
 
@@ -88,7 +88,7 @@ 
 	/**
 	 * @var array list of class exists checks
 	 */
-	protected static $classExists = array();
+	protected static $classExists=array();
 	/**
 	 * @return string the version of Prado framework
 	 */
@@ -108,7 +108,7 @@ 
 	 */
 	public static function initAutoloader()
 	{
-		self::$classMap = require(__DIR__ . '/classes.php');
+		self::$classMap=require(__DIR__.'/classes.php');
 
 		spl_autoload_register(array(get_called_class(), 'autoload'));
 	}
@@ -123,15 +123,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(array('\Prado\PradoBase','phpErrorHandler'));
+		set_error_handler(array('\Prado\PradoBase', 'phpErrorHandler'));
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(array('\Prado\PradoBase','exceptionHandler'));
+		set_exception_handler(array('\Prado\PradoBase', 'exceptionHandler'));
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -154,11 +154,11 @@ 
 	 */
 	public static function poweredByPrado($logoType=0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
+		$logoName=$logoType==1 ? 'powered2' : 'powered';
 		if(self::$_application!==null)
 		{
 			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName,'.gif'));
+			$url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName, '.gif'));
 		}
 		else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
@@ -175,10 +175,10 @@ 
 	 * @param string the filename that the error was raised in
 	 * @param integer the line number the error was raised at
 	 */
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
 		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
 	/**
@@ -189,12 +189,12 @@ 
 	 */
 	public static function phpFatalErrorHandler()
 	{
-		$error = error_get_last();
+		$error=error_get_last();
 		if($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpFatalErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpFatalErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 
@@ -211,7 +211,7 @@ 
 	{
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -260,10 +260,10 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
+		if(substr($type, 0, 6)==='System')
 			$type='Prado'.substr($type, 6);
 
-		if(false === strpos($type, '\\'))
+		if(false===strpos($type, '\\'))
 			return str_replace('.', '\\', $type);
 		else
 			return $type;
@@ -284,13 +284,13 @@ 
 	 */
 	public static function createComponent($requestedType)
 	{
-		$type = static::prado3NamespaceToPhpNamespace($requestedType);
+		$type=static::prado3NamespaceToPhpNamespace($requestedType);
 		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 		}
 
 		/*
@@ -300,12 +300,12 @@ 
 		 * \Application\Common\MyDataModule)
 		 * Skip this if the class is inside the Prado\* namespace, since all Prado classes are now namespaced
 		 */
-		if( ($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
-			$type = substr($type,$pos+1);
+		if(($pos=strrpos($type, '\\'))!==false && ($requestedType!=$type) && strpos($type, 'Prado\\')!==0)
+			$type=substr($type, $pos + 1);
 
-		if(($n=func_num_args())>1)
+		if(($n=func_num_args()) > 1)
 		{
-			$args = func_get_args();
+			$args=func_get_args();
 			switch($n) {
 				case 2:
 					return new $type($args[1]);
@@ -321,7 +321,7 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
+					for($i=2; $i < $n; ++$i)
 						$s.=",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -341,31 +341,31 @@ 
 	 * @param boolean whether to check the existence of the class after the class file is included
 	 * @throws TInvalidDataValueException if the namespace is invalid
 	 */
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence=true)
 	{
-		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
+		$namespace=static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
 
 		if(array_key_exists($namespace, self::$classMap))
 		{
 			// fast autoload a Prado3 class name
-			$phpNamespace = self::$classMap[$namespace];
+			$phpNamespace=self::$classMap[$namespace];
 			if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 			{
 				if(!class_exists($namespace) && !interface_exists($namespace))
 					class_alias($phpNamespace, $namespace);
 				return;
 			}			
-		} elseif(($pos=strrpos($namespace,'\\'))===false) {
+		} elseif(($pos=strrpos($namespace, '\\'))===false) {
 			// trying to autoload an old class name
 			foreach(self::$_usings as $k => $v)
 			{
-				$path = $v . DIRECTORY_SEPARATOR . $namespace . self::CLASS_FILE_EXT;
+				$path=$v.DIRECTORY_SEPARATOR.$namespace.self::CLASS_FILE_EXT;
 				if(file_exists($path))
 				{
-					$phpNamespace = '\\'. $k.'\\'.$namespace;
+					$phpNamespace='\\'.$k.'\\'.$namespace;
 					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 					{
 						if(!class_exists($namespace) && !interface_exists($namespace))
@@ -375,10 +375,10 @@ 
 				}
 			}
 
-			if($checkClassExistence && !class_exists($namespace,false) && !interface_exists($namespace,false))
-				throw new TInvalidOperationException('prado_component_unknown',$namespace,'');
-		} elseif(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null) {
-			$className=substr($namespace,$pos+1);
+			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
+				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
+		} elseif(($path=self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT))!==null) {
+			$className=substr($namespace, $pos + 1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)]=$path;
@@ -386,7 +386,7 @@ 
 			else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || (!class_exists($className,false) && !interface_exists($className, false)))
+				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
 				{
 					try
 					{
@@ -396,8 +396,8 @@ 
 					}
 					catch(\Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -420,9 +420,9 @@ 
 	 */
 	public static function getPathOfNamespace($namespace, $ext='')
 	{
-		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
+		$namespace=static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if(self::CLASS_FILE_EXT===$ext || empty($ext))
 		{
 			if(isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
@@ -431,11 +431,11 @@ 
 				return self::$_aliases[$namespace];
 		}
 
-		$segs = explode('\\',$namespace);
-		$alias = array_shift($segs);
+		$segs=explode('\\', $namespace);
+		$alias=array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if(null!==($file=array_pop($segs)) && null!==($root=self::getPathOfAlias($alias)))
+			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $segs), '/\\').(($file==='*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
 
 		return null;
 	}
@@ -446,7 +446,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -460,19 +460,19 @@ 
 	 * @throws TInvalidOperationException if the alias is already defined
 	 * @throws TInvalidDataValueException if the path is not a valid file path
 	 */
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
 		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
 		else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
+			if(strpos($alias, '.')===false)
 				self::$_aliases[$alias]=$rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -497,13 +497,13 @@ 
 				continue;
 			echo '#'.$index.' ';
 			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
 			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
 				$count=0;
@@ -512,25 +512,25 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+						if(strlen($item) > 70)
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
-					else if (is_int($item) || is_float($item))
+					else if(is_int($item) || is_float($item))
 						echo $item;
-					else if (is_object($item))
+					else if(is_object($item))
 						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
+					else if(is_array($item))
+						echo 'array('.count($item).')';
+					else if(is_bool($item))
 						echo $item ? 'true' : 'false';
-					else if ($item === null)
+					else if($item===null)
 						echo 'NULL';
-					else if (is_resource($item))
+					else if(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -557,10 +557,10 @@ 
 			else
 			{
 				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array=explode(';q=', trim($language));
+					$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
@@ -581,7 +581,7 @@ 
 		if($language===null)
 		{
 			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
+			$lang=explode('-', $langs[0]);
 			if(empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language='en';
 			else
@@ -602,7 +602,7 @@ 
 	 * @param (string|TControl) control of the message
 	 * @see log, getLogger
 	 */
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
 			return;
@@ -615,7 +615,7 @@ 
 		}
 		else
 			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+		self::log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -630,11 +630,11 @@ 
 	 * @param string category of the message
 	 * @param (string|TControl) control of the message
 	 */
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level=TLogger::INFO, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_logger===null)
 			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -656,9 +656,9 @@ 
 	 * @param boolean whether to syntax highlight the output. Defaults to false.
 	 * @return string the string representation of the variable
 	 */
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth=10, $highlight=false)
 	{
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 
 	/**
@@ -673,31 +673,31 @@ 
 	 */
 	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
 	{
-		$app = Prado::getApplication()->getGlobalization(false);
+		$app=Prado::getApplication()->getGlobalization(false);
 
-		$params = array();
+		$params=array();
 		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+			$params['{'.$key.'}']=$value;
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		if($app===null || ($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if($catalogue===null)
+			$catalogue=isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
 		//globalization charset
-		$appCharset = $app===null ? '' : $app->getCharset();
+		$appCharset=$app===null ? '' : $app->getCharset();
 
 		//default charset
-		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+		$defaultCharset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) $charset=$appCharset;
+		if(empty($charset)) $charset=$defaultCharset;
 
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }