pradosoft / prado

framework/Caching/TMemCache.php

Spacing +33 added lines, -33 removed lines

@@ -92,7 +92,7 @@ 
 	/**
 	 * @var boolean if the module is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var Memcache the Memcache instance
 	 */
@@ -100,23 +100,23 @@ 
 	/**
 	 * @var string host name of the memcache server
 	 */
-	private $_host = 'localhost';
+	private $_host='localhost';
 	/**
 	 * @var integer the port number of the memcache server
 	 */
-	private $_port = 11211;
+	private $_port=11211;
 
-	private $_timeout = 360;
+	private $_timeout=360;
 
 	/**
 	 * @var integer Controls the minimum value length before attempting to compress automatically.
 	 */
-	private $_threshold = 0;
+	private $_threshold=0;
 
 	/**
 	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
 	 */
-	private $_minSavings = 0.0;
+	private $_minSavings=0.0;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -124,12 +124,12 @@ 
 	 * If false {@link http://pecl.php.net/package/memcache memcache}. will be used.
 	 * Defaults to false.
 	 */
-	private $_useMemcached = false;
+	private $_useMemcached=false;
 	
 	/**
 	 * @var array list of servers available
 	 */
-	private $_servers = [];
+	private $_servers=[];
 
 	/**
 	 * Destructor.
@@ -137,7 +137,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_cache !== null && !$this->_useMemcached)
+		if($this->_cache!==null && !$this->_useMemcached)
 			$this->_cache->close();
 	}
 
@@ -157,27 +157,27 @@ 
 		if(!extension_loaded('memcached') && $this->_useMemcached)
 			throw new TConfigurationException('memcached_extension_required');
 		
-		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
+		$this->_cache=$this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
 		{
 			foreach($this->_servers as $server)
 			{
-				Prado::trace('Adding server ' . $server['Host'] . ' from serverlist', '\Prado\Caching\TMemCache');
-				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', '\Prado\Caching\TMemCache');
+				if($this->_cache->addServer($server['Host'], $server['Port'], $server['Persistent'],
+					$server['Weight'], $server['Timeout'], $server['RetryInterval'])===false)
 					throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
 			}
 		}
 		else
 		{
-			Prado::trace('Adding server ' . $this->_host, '\Prado\Caching\TMemCache');
-			if($this->_cache->addServer($this->_host, $this->_port) === false)
+			Prado::trace('Adding server '.$this->_host, '\Prado\Caching\TMemCache');
+			if($this->_cache->addServer($this->_host, $this->_port)===false)
 				throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
 		}
-		if($this->_threshold !== 0)
+		if($this->_threshold!==0)
 			$this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
-		$this->_initialized = true;
+		$this->_initialized=true;
 		parent::init($config);
 	}
 
@@ -192,29 +192,29 @@ 
 		{
 			foreach($xml->getElementsByTagName('server') as $serverConfig)
 			{
-				$properties = $serverConfig->getAttributes();
-				if(($host = $properties->remove('Host')) === null)
+				$properties=$serverConfig->getAttributes();
+				if(($host=$properties->remove('Host'))===null)
 					throw new TConfigurationException('memcache_serverhost_required');
-				if(($port = $properties->remove('Port')) === null)
+				if(($port=$properties->remove('Port'))===null)
 					throw new TConfigurationException('memcache_serverport_required');
 				if(!is_numeric($port))
 					throw new TConfigurationException('memcache_serverport_invalid');
-				$server = ['Host' => $host,'Port' => $port,'Weight' => 1,'Timeout' => 1800,'RetryInterval' => 15,'Persistent' => true];
-				$checks = [
+				$server=['Host' => $host, 'Port' => $port, 'Weight' => 1, 'Timeout' => 1800, 'RetryInterval' => 15, 'Persistent' => true];
+				$checks=[
 					'Weight' => 'memcache_serverweight_invalid',
 					'Timeout' => 'memcache_servertimeout_invalid',
 					'RetryInterval' => 'memcach_serverretryinterval_invalid'
 				];
 				foreach($checks as $property => $exception)
 				{
-					$value = $properties->remove($property);
-					if($value !== null && is_numeric($value))
-						$server[$property] = $value;
-					elseif($value !== null)
+					$value=$properties->remove($property);
+					if($value!==null && is_numeric($value))
+						$server[$property]=$value;
+					elseif($value!==null)
 						throw new TConfigurationException($exception);
 				}
-				$server['Persistent'] = TPropertyValue::ensureBoolean($properties->remove('Persistent'));
-				$this->_servers[] = $server;
+				$server['Persistent']=TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
 			}
 		}
 	}
@@ -236,7 +236,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_host_unchangeable');
 		else
-			$this->_host = $value;
+			$this->_host=$value;
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_port_unchangeable');
 		else
-			$this->_port = TPropertyValue::ensureInteger($value);
+			$this->_port=TPropertyValue::ensureInteger($value);
 	}
 	
 	/**
@@ -276,7 +276,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_host_unchangeable');
 		else
-			$this->_useMemcached = $value;
+			$this->_useMemcached=$value;
 	}
 	
 	/**
@@ -296,7 +296,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_threshold_unchangeable');
 		else
-			$this->_threshold = TPropertyValue::ensureInteger($value);
+			$this->_threshold=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_min_savings_unchangeable');
 		else
-			$this->_minSavings = TPropertyValue::ensureFloat($value);
+			$this->_minSavings=TPropertyValue::ensureFloat($value);
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -168,8 +168,7 @@
 					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
 					throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
 			}
-		}
-		else
+		} else
 		{
 			Prado::trace('Adding server ' . $this->_host, '\Prado\Caching\TMemCache');
 			if($this->_cache->addServer($this->_host, $this->_port) === false)

framework/Caching/TApplicationStateCacheDependency.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
 	 */
 	public function getHasChanged()
 	{
-		return Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		return Prado::getApplication()->getMode()!==TApplicationMode::Performance;
 	}
 }
\ No newline at end of file

framework/Caching/TChainedCacheDependency.php

Spacing +3 added lines, -3 removed lines

@@ -36,8 +36,8 @@ 
 	 */
 	public function getDependencies()
 	{
-		if($this->_dependencies === null)
-			$this->_dependencies = new TCacheDependencyList;
+		if($this->_dependencies===null)
+			$this->_dependencies=new TCacheDependencyList;
 		return $this->_dependencies;
 	}
 
@@ -49,7 +49,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		if($this->_dependencies !== null)
+		if($this->_dependencies!==null)
 		{
 			foreach($this->_dependencies as $dependency)
 				if($dependency->getHasChanged())

framework/Caching/TXCache.php

Spacing +4 added lines, -4 removed lines

@@ -56,8 +56,8 @@ 
 		if(!function_exists('xcache_isset'))
 			throw new TConfigurationException('xcache_extension_required');
 
-		$enabled = (int)ini_get('xcache.cacher') !== 0;
-		$var_size = (int)ini_get('xcache.var_size');
+		$enabled=(int) ini_get('xcache.cacher')!==0;
+		$var_size=(int) ini_get('xcache.var_size');
 
 		if(!($enabled && $var_size > 0))
 			throw new TConfigurationException('xcache_extension_not_enabled');
@@ -121,9 +121,9 @@ 
 	 */
 	public function flush()
 	{
-		for($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
+		for($i=0, $max=xcache_count(XC_TYPE_VAR); $i < $max; $i++)
 		{
-			if(xcache_clear_cache(XC_TYPE_VAR, $i) === false)
+			if(xcache_clear_cache(XC_TYPE_VAR, $i)===false)
 				return false;
 		}
 		return true;

framework/Caching/TGlobalStateCacheDependency.php

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
 	 */
 	public function setStateName($value)
 	{
-		$this->_stateName = $value;
-		$this->_stateValue = Prado::getApplication()->getGlobalState($value);
+		$this->_stateName=$value;
+		$this->_stateValue=Prado::getApplication()->getGlobalState($value);
 	}
 
 	/**
@@ -64,6 +64,6 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->_stateValue !== Prado::getApplication()->getGlobalState($this->_stateName);
+		return $this->_stateValue!==Prado::getApplication()->getGlobalState($this->_stateName);
 	}
 }
\ No newline at end of file

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);
 	}

Braces +8 added lines, -16 removed lines

@@ -160,8 +160,7 @@ 
 		{
 			$am = self::$_application->getAssetManager();
 			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
-		}
-		else
+		} 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>';
 	}
@@ -213,8 +212,7 @@ 
 		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -328,8 +326,7 @@ 
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -383,8 +380,7 @@ 
 			if($className === '*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
-			}
-			else  // a file
+			} else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
@@ -394,8 +390,7 @@ 
 						include_once($path);
 						if(class_exists($namespace, false) || interface_exists($namespace, false))
 							class_alias($namespace, $className);
-					}
-					catch(\Exception $e)
+					} catch(\Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className, false))
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
@@ -471,8 +466,7 @@ 
 				self::$_aliases[$alias] = $rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
@@ -517,8 +511,7 @@ 
 							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					elseif (is_int($item) || is_float($item))
+					} elseif (is_int($item) || is_float($item))
 						echo $item;
 					elseif (is_object($item))
 						echo get_class($item);
@@ -613,8 +606,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level = TLogger::DEBUG;
-		}
-		else
+		} else
 			$level = TLogger::INFO;
 		self::log($msg, $level, $category, $ctl);
 	}

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/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);
 	}
 }