pradosoft / prado

framework/Caching/TDirectoryCacheDependency.php

Spacing +16 added lines, -16 removed lines

@@ -35,8 +35,8 @@ 
  */
 class TDirectoryCacheDependency extends TCacheDependency
 {
-	private $_recursiveCheck = true;
-	private $_recursiveLevel = -1;
+	private $_recursiveCheck=true;
+	private $_recursiveLevel=-1;
 	private $_timestamps;
 	private $_directory;
 
@@ -63,10 +63,10 @@ 
 	 */
 	public function setDirectory($directory)
 	{
-		if(($path = realpath($directory)) === false || !is_dir($path))
+		if(($path=realpath($directory))===false || !is_dir($path))
 			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
-		$this->_directory = $path;
-		$this->_timestamps = $this->generateTimestamps($path);
+		$this->_directory=$path;
+		$this->_timestamps=$this->generateTimestamps($path);
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function setRecursiveCheck($value)
 	{
-		$this->_recursiveCheck = TPropertyValue::ensureBoolean($value);
+		$this->_recursiveCheck=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setRecursiveLevel($value)
 	{
-		$this->_recursiveLevel = TPropertyValue::ensureInteger($value);
+		$this->_recursiveLevel=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->generateTimestamps($this->_directory) != $this->_timestamps;
+		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
 	}
 
 	/**
@@ -152,23 +152,23 @@ 
 	 * @param int level of the recursion
 	 * @return array list of file modification time indexed by the file path
 	 */
-	protected function generateTimestamps($directory, $level = 0)
+	protected function generateTimestamps($directory, $level=0)
 	{
-		if(($dir = opendir($directory)) === false)
+		if(($dir=opendir($directory))===false)
 			throw new TIOException('directorycachedependency_directory_invalid', $directory);
-		$timestamps = [];
-		while(($file = readdir($dir)) !== false)
+		$timestamps=[];
+		while(($file=readdir($dir))!==false)
 		{
-			$path = $directory . DIRECTORY_SEPARATOR . $file;
-			if($file === '.' || $file === '..')
+			$path=$directory.DIRECTORY_SEPARATOR.$file;
+			if($file==='.' || $file==='..')
 				continue;
 			elseif(is_dir($path))
 			{
 				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
+					$timestamps=array_merge($this->generateTimestamps($path, $level + 1));
 			}
 			elseif($this->validateFile($path))
-				$timestamps[$path] = filemtime($path);
+				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;

framework/Caching/TCache.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 abstract class TCache extends \Prado\TModule implements ICache, \ArrayAccess
 {
 	private $_prefix;
-	private $_primary = true;
+	private $_primary=true;
 
 	/**
 	 * Initializes the cache module.
@@ -61,11 +61,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_prefix === null)
-			$this->_prefix = $this->getApplication()->getUniqueID();
+		if($this->_prefix===null)
+			$this->_prefix=$this->getApplication()->getUniqueID();
 		if($this->_primary)
 		{
-			if($this->getApplication()->getCache() === null)
+			if($this->getApplication()->getCache()===null)
 				$this->getApplication()->setCache($this);
 			else
 				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
@@ -88,7 +88,7 @@ 
 	 */
 	public function setPrimaryCache($value)
 	{
-		$this->_primary = TPropertyValue::ensureBoolean($value);
+		$this->_primary=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setKeyPrefix($value)
 	{
-		$this->_prefix = $value;
+		$this->_prefix=$value;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	protected function generateUniqueKey($key)
 	{
-		return md5($this->_prefix . $key);
+		return md5($this->_prefix.$key);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function get($id)
 	{
-		if(($data = $this->getValue($this->generateUniqueKey($id))) !== false)
+		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
 		{
 			if(!is_array($data))
 				return false;
@@ -146,13 +146,13 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id, $value, $expire = 0, $dependency = null)
+	public function set($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			$this->delete($id);
 		else
 		{
-			$data = [$value,$dependency];
+			$data=[$value, $dependency];
 			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
@@ -166,11 +166,11 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id, $value, $expire = 0, $dependency = null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			return false;
-		$data = [$value,$dependency];
+		$data=[$value, $dependency];
 		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 
@@ -250,7 +250,7 @@ 
 	 */
 	public function offsetExists($id)
 	{
-		return $this->get($id) !== false;
+		return $this->get($id)!==false;
 	}
 
 	/**

framework/TService.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 	/**
 	 * @var boolean whether the service is enabled
 	 */
-	private $_enabled = true;
+	private $_enabled=true;
 
 	/**
 	 * Initializes the service and attaches {@link run} to the RunService event of application.
@@ -54,7 +54,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled = TPropertyValue::ensureBoolean($value);
+		$this->_enabled=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

framework/PradoBase.php

Spacing +115 added lines, -115 removed lines

@@ -37,7 +37,7 @@ 
  */
 if(!defined('PRADO_VENDORDIR'))
 {
-	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');
+	$reflector=new \ReflectionClass('\Composer\Autoload\ClassLoader');
 	define('PRADO_VENDORDIR', dirname(dirname($reflector->getFileName())));
 }
 
@@ -60,36 +60,36 @@ 
 	/**
 	 * File extension for Prado class files.
 	 */
-	const CLASS_FILE_EXT = '.php';
+	const CLASS_FILE_EXT='.php';
 	/**
 	 * @var array list of path aliases
 	 */
-	private static $_aliases = [
+	private static $_aliases=[
 		'Prado' => PRADO_DIR,
 		'Vendor' => PRADO_VENDORDIR
 		];
 	/**
 	 * @var array list of namespaces currently in use
 	 */
-	private static $_usings = [
+	private static $_usings=[
 		'Prado' => PRADO_DIR
 		];
 	/**
 	 * @var array list of namespaces currently in use
 	 */
-	public static $classMap = [];
+	public static $classMap=[];
 	/**
 	 * @var TApplication the application instance
 	 */
-	private static $_application = null;
+	private static $_application=null;
 	/**
 	 * @var TLogger logger instance
 	 */
-	private static $_logger = null;
+	private static $_logger=null;
 	/**
 	 * @var array list of class exists checks
 	 */
-	protected static $classExists = [];
+	protected static $classExists=[];
 	/**
 	 * @return string the version of Prado framework
 	 */
@@ -109,7 +109,7 @@ 
 	 */
 	public static function initAutoloader()
 	{
-		self::$classMap = require(__DIR__ . '/classes.php');
+		self::$classMap=require(__DIR__.'/classes.php');
 
 		spl_autoload_register([get_called_class(), 'autoload']);
 	}
@@ -124,15 +124,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(['\Prado\PradoBase','phpErrorHandler']);
+		set_error_handler(['\Prado\PradoBase', 'phpErrorHandler']);
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(['PradoBase','phpFatalErrorHandler']);
+		register_shutdown_function(['PradoBase', 'phpFatalErrorHandler']);
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(['\Prado\PradoBase','exceptionHandler']);
+		set_exception_handler(['\Prado\PradoBase', 'exceptionHandler']);
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -153,17 +153,17 @@ 
 	 * @param integer the type of "powered logo". Valid values include 0 and 1.
 	 * @return string a string that can be displayed on your Web page showing powered-by-PRADO information
 	 */
-	public static function poweredByPrado($logoType = 0)
+	public static function poweredByPrado($logoType=0)
 	{
-		$logoName = $logoType == 1?'powered2':'powered';
-		if(self::$_application !== null)
+		$logoName=$logoType==1 ? 'powered2' : 'powered';
+		if(self::$_application!==null)
 		{
-			$am = self::$_application->getAssetManager();
-			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
+			$am=self::$_application->getAssetManager();
+			$url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName, '.gif'));
 		}
 		else
-			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
-		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
+		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 */
 	public static function phpFatalErrorHandler()
 	{
-		$error = error_get_last();
+		$error=error_get_last();
 		if($error &&
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
@@ -210,7 +210,7 @@ 
 	 */
 	public static function exceptionHandler($exception)
 	{
-		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
+		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null, $exception);
 		}
@@ -232,9 +232,9 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application !== null && !defined('PRADO_TEST_RUN'))
+		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
-		self::$_application = $application;
+		self::$_application=$application;
 	}
 
 	/**
@@ -261,10 +261,10 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
-			$type = 'Prado' . substr($type, 6);
+		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;
@@ -285,13 +285,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]) {
 			static::using($type);
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 		}
 
 		/*
@@ -301,12 +301,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,9 +321,9 @@ 
 					return new $type($args[1], $args[2], $args[3], $args[4]);
 				break;
 				default:
-					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
-						$s .= ",\$args[$i]";
+					$s='$args[1]';
+					for($i=2; $i < $n; ++$i)
+						$s.=",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
@@ -342,9 +342,9 @@ 
 	 * @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))
 			return;
@@ -352,21 +352,21 @@ 
 		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))
@@ -378,11 +378,11 @@ 
 
 			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
+		} 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;
+				self::$_usings[substr($namespace, 0, $pos)]=$path;
 			}
 			else  // a file
 			{
@@ -419,11 +419,11 @@ 
 	 * @param string extension to be appended if the namespace refers to a file
 	 * @return string file path corresponding to the namespace, null if namespace is invalid
 	 */
-	public static function getPathOfNamespace($namespace, $ext = '')
+	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];
@@ -432,11 +432,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;
 	}
@@ -447,7 +447,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()
@@ -465,10 +465,10 @@ 
 	{
 		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_alias_redefined', $alias);
-		elseif(($rp = realpath($path)) !== false && is_dir($rp))
+		elseif(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias, '.') === false)
-				self::$_aliases[$alias] = $rp;
+			if(strpos($alias, '.')===false)
+				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
@@ -485,53 +485,53 @@ 
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
-		echo '<p>' . $msg . '</p>';
+		echo '<p>'.$msg.'</p>';
 		if(!function_exists('debug_backtrace'))
 			return;
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
-		$index = -1;
+		$index=-1;
 		foreach(debug_backtrace() as $t)
 		{
 			$index++;
-			if($index == 0)  // hide the backtrace of this function
+			if($index==0)  // hide the backtrace of this function
 				continue;
-			echo '#' . $index . ' ';
+			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']) && count($t['args']) > 0)
 			{
-				$count = 0;
+				$count=0;
 				foreach($t['args'] as $item)
 				{
 					if(is_string($item))
 					{
-						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'" . substr($str, 0, 70) . "...'";
+						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
+						if(strlen($item) > 70)
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
-					elseif (is_int($item) || is_float($item))
+					elseif(is_int($item) || is_float($item))
 						echo $item;
-					elseif (is_object($item))
+					elseif(is_object($item))
 						echo get_class($item);
-					elseif (is_array($item))
-						echo 'array(' . count($item) . ')';
-					elseif (is_bool($item))
+					elseif(is_array($item))
+						echo 'array('.count($item).')';
+					elseif(is_bool($item))
 						echo $item ? 'true' : 'false';
-					elseif ($item === null)
+					elseif($item===null)
 						echo 'NULL';
-					elseif (is_resource($item))
+					elseif(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -550,23 +550,23 @@ 
 	 */
 	public static function getUserLanguages()
 	{
-		static $languages = null;
-		if($languages === null)
+		static $languages=null;
+		if($languages===null)
 		{
 			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0] = 'en';
+				$languages[0]='en';
 			else
 			{
-				$languages = [];
+				$languages=[];
 				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);
+				$languages=array_keys($languages);
 				if(empty($languages))
-					$languages[0] = 'en';
+					$languages[0]='en';
 			}
 		}
 		return $languages;
@@ -578,15 +578,15 @@ 
 	 */
 	public static function getPreferredLanguage()
 	{
-		static $language = null;
-		if($language === null)
+		static $language=null;
+		if($language===null)
 		{
-			$langs = Prado::getUserLanguages();
-			$lang = explode('-', $langs[0]);
+			$langs=Prado::getUserLanguages();
+			$lang=explode('-', $langs[0]);
 			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language = 'en';
+				$language='en';
 			else
-				$language = $lang[0];
+				$language=$lang[0];
 		}
 		return $language;
 	}
@@ -603,19 +603,19 @@ 
 	 * @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)
+		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
 			return;
-		if(!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
+		if(!self::$_application || self::$_application->getMode()===TApplicationMode::Debug)
 		{
-			$trace = debug_backtrace();
+			$trace=debug_backtrace();
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
-			$level = TLogger::DEBUG;
+				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
+			$level=TLogger::DEBUG;
 		}
 		else
-			$level = TLogger::INFO;
+			$level=TLogger::INFO;
 		self::log($msg, $level, $category, $ctl);
 	}
 
@@ -631,10 +631,10 @@ 
 	 * @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;
+		if(self::$_logger===null)
+			self::$_logger=new TLogger;
 		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
@@ -643,8 +643,8 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger === null)
-			self::$_logger = new TLogger;
+		if(self::$_logger===null)
+			self::$_logger=new TLogger;
 		return self::$_logger;
 	}
 
@@ -657,7 +657,7 @@ 
 	 * @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);
 	}
@@ -672,32 +672,32 @@ 
 	 * @see TTranslate::formatter()
 	 * @see TTranslate::init()
 	 */
-	public static function localize($text, $parameters = [], $catalogue = null, $charset = null)
+	public static function localize($text, $parameters=[], $catalogue=null, $charset=null)
 	{
-		$app = Prado::getApplication()->getGlobalization(false);
+		$app=Prado::getApplication()->getGlobalization(false);
 
-		$params = [];
+		$params=[];
 		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);
 	}

framework/Exceptions/THttpException.php

Spacing +7 added lines, -7 removed lines

@@ -38,16 +38,16 @@
 	 */
 	public function __construct($statusCode, $errorMessage)
 	{
-		$this->_statusCode = $statusCode;
+		$this->_statusCode=$statusCode;
 		$this->setErrorCode($errorMessage);
-		$errorMessage = $this->translateErrorMessage($errorMessage);
-		$args = func_get_args();
+		$errorMessage=$this->translateErrorMessage($errorMessage);
+		$args=func_get_args();
 		array_shift($args);
 		array_shift($args);
-		$n = count($args);
-		$tokens = [];
-		for($i = 0;$i < $n;++$i)
-			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		$n=count($args);
+		$tokens=[];
+		for($i=0; $i < $n; ++$i)
+			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
 

framework/Exceptions/TErrorHandler.php

Spacing +98 added lines, -98 removed lines

@@ -57,19 +57,19 @@ 
 	/**
 	 * error template file basename
 	 */
-	const ERROR_FILE_NAME = 'error';
+	const ERROR_FILE_NAME='error';
 	/**
 	 * exception template file basename
 	 */
-	const EXCEPTION_FILE_NAME = 'exception';
+	const EXCEPTION_FILE_NAME='exception';
 	/**
 	 * number of lines before and after the error line to be displayed in case of an exception
 	 */
-	const SOURCE_LINES = 12;
+	const SOURCE_LINES=12;
 	/**
 	 * number of prado internal function calls to be dropped from stack traces on fatal errors
 	 */
-	const FATAL_ERROR_TRACE_DROP_LINES = 5;
+	const FATAL_ERROR_TRACE_DROP_LINES=5;
 
 	/**
 	 * @var string error template directory
@@ -91,8 +91,8 @@ 
 	 */
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath === null)
-			$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
+		if($this->_templatePath===null)
+			$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
 		return $this->_templatePath;
 	}
 
@@ -104,8 +104,8 @@ 
 	 */
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
-			$this->_templatePath = $templatePath;
+		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
+			$this->_templatePath=$templatePath;
 		else
 			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
@@ -121,7 +121,7 @@ 
 	 */
 	public function handleError($sender, $param)
 	{
-		static $handling = false;
+		static $handling=false;
 		// We need to restore error and exception handlers,
 		// because within error and exception handlers, new errors and exceptions
 		// cannot be handled properly by PHP
@@ -132,14 +132,14 @@ 
 			$this->handleRecursiveError($param);
 		else
 		{
-			$handling = true;
-			if(($response = $this->getResponse()) !== null)
+			$handling=true;
+			if(($response=$this->getResponse())!==null)
 				$response->clear();
 			if(!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
 			if($param instanceof THttpException)
 				$this->handleExternalError($param->getStatusCode(), $param);
-			elseif($this->getApplication()->getMode() === TApplicationMode::Debug)
+			elseif($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->displayException($param);
 			else
 				$this->handleExternalError(500, $param);
@@ -153,30 +153,30 @@ 
 	 * @return string
 	 * @since 3.1.6
 	 */
-	protected static function hideSecurityRelated($value, $exception = null)
+	protected static function hideSecurityRelated($value, $exception=null)
 	{
-		$aRpl = [];
-		if($exception !== null && $exception instanceof \Exception)
+		$aRpl=[];
+		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);
 	}
@@ -193,21 +193,21 @@ 
 		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();
+			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 		{
-			$version = '';
-			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
+			$version='';
+			$errorMessage=self::hideSecurityRelated($errorMessage, $exception);
 		}
-		$tokens = [
+		$tokens=[
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
@@ -229,16 +229,16 @@ 
 	 */
 	protected function handleRecursiveError($exception)
 	{
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
+		if($this->getApplication()->getMode()===TApplicationMode::Debug)
 		{
 			echo "<html><head><title>Recursive Error</title></head>\n";
 			echo "<body><h1>Recursive Error</h1>\n";
-			echo "<pre>" . $exception->__toString() . "</pre>\n";
+			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
 		}
 		else
 		{
-			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
+			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
 		}
 	}
@@ -252,53 +252,53 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if(php_sapi_name() === 'cli')
+		if(php_sapi_name()==='cli')
 		{
-			echo $exception->getMessage() . "\n";
+			echo $exception->getMessage()."\n";
 			echo $this->getExactTraceAsString($exception);
 			return;
 		}
 
 		if($exception instanceof TTemplateException)
 		{
-			$fileName = $exception->getTemplateFile();
-			$lines = empty($fileName)?explode("\n", $exception->getTemplateSource()):@file($fileName);
-			$source = $this->getSourceCode($lines, $exception->getLineNumber());
-			if($fileName === '')
-				$fileName = '---embedded template---';
-			$errorLine = $exception->getLineNumber();
+			$fileName=$exception->getTemplateFile();
+			$lines=empty($fileName) ?explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source=$this->getSourceCode($lines, $exception->getLineNumber());
+			if($fileName==='')
+				$fileName='---embedded template---';
+			$errorLine=$exception->getLineNumber();
 		}
 		else
 		{
-			if(($trace = $this->getExactTrace($exception)) !== null)
+			if(($trace=$this->getExactTrace($exception))!==null)
 			{
-				$fileName = $trace['file'];
-				$errorLine = $trace['line'];
+				$fileName=$trace['file'];
+				$errorLine=$trace['line'];
 			}
 			else
 			{
-				$fileName = $exception->getFile();
-				$errorLine = $exception->getLine();
+				$fileName=$exception->getFile();
+				$errorLine=$exception->getLine();
 			}
-			$source = $this->getSourceCode(@file($fileName), $errorLine);
+			$source=$this->getSourceCode(@file($fileName), $errorLine);
 		}
 
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+		if($this->getApplication()->getMode()===TApplicationMode::Debug)
+			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
-			$version = '';
+			$version='';
 
-		$tokens = [
+		$tokens=[
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
-			'%%SourceFile%%' => htmlspecialchars($fileName) . ' (' . $errorLine . ')',
+			'%%SourceFile%%' => htmlspecialchars($fileName).' ('.$errorLine.')',
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($this->getExactTraceAsString($exception)),
 			'%%Version%%' => $version,
 			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		];
 
-		$content = $this->getExceptionTemplate($exception);
+		$content=$this->getExceptionTemplate($exception);
 
 		echo strtr($content, $tokens);
 	}
@@ -312,11 +312,11 @@ 
 	 */
 	protected function getExceptionTemplate($exception)
 	{
-		$lang = Prado::getPreferredLanguage();
-		$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '-' . $lang . '.html';
+		$lang=Prado::getPreferredLanguage();
+		$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html';
 		if(!is_file($exceptionFile))
-			$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
-		if(($content = @file_get_contents($exceptionFile)) === false)
+			$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
+		if(($content=@file_get_contents($exceptionFile))===false)
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
@@ -339,45 +339,45 @@ 
 	 */
 	protected function getErrorTemplate($statusCode, $exception)
 	{
-		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
-		$lang = Prado::getPreferredLanguage();
+		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
+		$lang=Prado::getPreferredLanguage();
 		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile = "$base$statusCode-$lang.html";
+			$errorFile="$base$statusCode-$lang.html";
 		elseif(is_file("$base$statusCode.html"))
-			$errorFile = "$base$statusCode.html";
+			$errorFile="$base$statusCode.html";
 		elseif(is_file("$base-$lang.html"))
-			$errorFile = "$base-$lang.html";
+			$errorFile="$base-$lang.html";
 		else
-			$errorFile = "$base.html";
-		if(($content = @file_get_contents($errorFile)) === false)
+			$errorFile="$base.html";
+		if(($content=@file_get_contents($errorFile))===false)
 			die("Unable to open error template file '$errorFile'.");
 		return $content;
 	}
 
 	private function getExactTrace($exception)
 	{
-		$result = null;
+		$result=null;
 		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();
+			$trace=$exception->getTrace();
 		}
 		
 		// if PHP exception, we want to show the 2nd stack level context
 		// because the 1st stack level is of little use (it's in error handler)
 		if($exception instanceof TPhpErrorException) {
 			if(isset($trace[0]['file']))
-				$result = $trace[0];
+				$result=$trace[0];
 			elseif(isset($trace[1]))
-				$result = $trace[1];
+				$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;
@@ -388,19 +388,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++;
 			}
 
@@ -412,11 +412,11 @@ 
 
 	private function getPropertyAccessTrace($trace, $pattern)
 	{
-		$result = null;
+		$result=null;
 		foreach($trace as $t)
 		{
-			if(isset($t['function']) && $t['function'] === $pattern)
-				$result = $t;
+			if(isset($t['function']) && $t['function']===$pattern)
+				$result=$t;
 			else
 				break;
 		}
@@ -425,44 +425,44 @@ 
 
 	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)
+		$source='';
+		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])));
-				$source .= "<div class=\"error\">" . $line . "</div>";
+				$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;
 	}
 
 	private function addLink($message) {
-		if (null !== ($class = $this->getErrorClassNameSpace($message))) {
-			return str_replace($class['name'], '<a href="' . $class['url'] . '" target="_blank">' . $class['name'] . '</a>', $message);
+		if(null!==($class=$this->getErrorClassNameSpace($message))) {
+			return str_replace($class['name'], '<a href="'.$class['url'].'" target="_blank">'.$class['name'].'</a>', $message);
 		}
 		return $message;
 	}
 
 	private function getErrorClassNameSpace($message) {
-		$matches = [];
+		$matches=[];
 		preg_match('/\b(T[A-Z]\w+)\b/', $message, $matches);
-		if (is_array($matches) && count($matches) > 0) {
-			$class = $matches[0];
+		if(is_array($matches) && count($matches) > 0) {
+			$class=$matches[0];
 			try {
-				$function = new \ReflectionClass($class);
+				$function=new \ReflectionClass($class);
 			}
-			catch (\Exception $e) {
+			catch(\Exception $e) {
 				return null;
 			}
-			$classname = $function->getNamespaceName();
+			$classname=$function->getNamespaceName();
 			return [
-				'url' => 'http://pradosoft.github.io/docs/manual/class-' . str_replace('\\', '.', (string) $classname) . '.' . $class . '.html',
+				'url' => 'http://pradosoft.github.io/docs/manual/class-'.str_replace('\\', '.', (string) $classname).'.'.$class.'.html',
 				'name' => $class,
 			];
 		}

framework/Exceptions/TTemplateException.php

Spacing +6 added lines, -6 removed lines

@@ -24,9 +24,9 @@ 
  */
 class TTemplateException extends TConfigurationException
 {
-	private $_template = '';
-	private $_lineNumber = 0;
-	private $_fileName = '';
+	private $_template='';
+	private $_lineNumber=0;
+	private $_fileName='';
 
 	/**
 	 * @return string the template source code that causes the exception. This is empty if {@link getTemplateFile TemplateFile} is not empty.
@@ -41,7 +41,7 @@ 
 	 */
 	public function setTemplateSource($value)
 	{
-		$this->_template = $value;
+		$this->_template=$value;
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 */
 	public function setTemplateFile($value)
 	{
-		$this->_fileName = $value;
+		$this->_fileName=$value;
 	}
 
 	/**
@@ -73,6 +73,6 @@ 
 	 */
 	public function setLineNumber($value)
 	{
-		$this->_lineNumber = TPropertyValue::ensureInteger($value);
+		$this->_lineNumber=TPropertyValue::ensureInteger($value);
 	}
 }

framework/Exceptions/TException.php

Spacing +19 added lines, -19 removed lines

@@ -37,8 +37,8 @@ 
  */
 class TException extends \Exception
 {
-	private $_errorCode = '';
-	protected static $_messageCache = [];
+	private $_errorCode='';
+	protected static $_messageCache=[];
 
 	/**
 	 * Constructor.
@@ -49,14 +49,14 @@ 
 	 */
 	public function __construct($errorMessage)
 	{
-		$this->_errorCode = $errorMessage;
-		$errorMessage = $this->translateErrorMessage($errorMessage);
-		$args = func_get_args();
+		$this->_errorCode=$errorMessage;
+		$errorMessage=$this->translateErrorMessage($errorMessage);
+		$args=func_get_args();
 		array_shift($args);
-		$n = count($args);
-		$tokens = [];
-		for($i = 0;$i < $n;++$i)
-			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		$n=count($args);
+		$tokens=[];
+		for($i=0; $i < $n; ++$i)
+			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
@@ -67,17 +67,17 @@ 
 	 */
 	protected function translateErrorMessage($key)
 	{
-		$msgFile = $this->getErrorMessageFile();
+		$msgFile=$this->getErrorMessageFile();
 
 		// Cache messages
-		if (!isset(self::$_messageCache[$msgFile]))
+		if(!isset(self::$_messageCache[$msgFile]))
 		{
-			if(($entries = @file($msgFile)) !== false)
+			if(($entries=@file($msgFile))!==false)
 			{
 				foreach($entries as $entry)
 				{
-					list($code, $message) = array_merge(explode('=', $entry, 2), [ '' ]);
-					self::$_messageCache[$msgFile][trim($code)] = trim($message);
+					list($code, $message)=array_merge(explode('=', $entry, 2), ['']);
+					self::$_messageCache[$msgFile][trim($code)]=trim($message);
 				}
 			}
 		}
@@ -89,10 +89,10 @@ 
 	 */
 	protected function getErrorMessageFile()
 	{
-		$lang = Prado::getPreferredLanguage();
-		$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages-' . $lang . '.txt';
+		$lang=Prado::getPreferredLanguage();
+		$msgFile=Prado::getFrameworkPath().'/Exceptions/messages/messages-'.$lang.'.txt';
 		if(!is_file($msgFile))
-			$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages.txt';
+			$msgFile=Prado::getFrameworkPath().'/Exceptions/messages/messages.txt';
 		return $msgFile;
 	}
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function setErrorCode($code)
 	{
-		$this->_errorCode = $code;
+		$this->_errorCode=$code;
 	}
 
 	/**
@@ -125,6 +125,6 @@ 
 	 */
 	protected function setErrorMessage($message)
 	{
-		$this->message = $message;
+		$this->message=$message;
 	}
 }

framework/Exceptions/TPhpErrorException.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public function __construct($errno, $errstr, $errfile, $errline)
 	{
-		static $errorTypes = [
+		static $errorTypes=[
 			E_ERROR => "Error",
 			E_WARNING => "Warning",
 			E_PARSE => "Parsing Error",
@@ -46,7 +46,7 @@ 
 			E_USER_NOTICE => "User Notice",
 			E_STRICT => "Runtime Notice"
 		];
-		$errorType = isset($errorTypes[$errno])?$errorTypes[$errno]:'Unknown Error';
+		$errorType=isset($errorTypes[$errno]) ? $errorTypes[$errno] : 'Unknown Error';
 		parent::__construct("[$errorType] $errstr (@line $errline in file $errfile).");
 	}