pradosoft / prado

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

framework/TApplicationConfiguration.php

Spacing +82 added lines, -82 removed lines

@@ -29,35 +29,35 @@ 
 	/**
 	 * @var array list of application initial property values, indexed by property names
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var array list of namespaces to be used
 	 */
-	private $_usings = [];
+	private $_usings=[];
 	/**
 	 * @var array list of path aliases, indexed by alias names
 	 */
-	private $_aliases = [];
+	private $_aliases=[];
 	/**
 	 * @var array list of module configurations
 	 */
-	private $_modules = [];
+	private $_modules=[];
 	/**
 	 * @var array list of service configurations
 	 */
-	private $_services = [];
+	private $_services=[];
 	/**
 	 * @var array list of parameters
 	 */
-	private $_parameters = [];
+	private $_parameters=[];
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes = [];
+	private $_includes=[];
 	/**
 	 * @var boolean whether this configuration contains actual stuff
 	 */
-	private $_empty = true;
+	private $_empty=true;
 
 	/**
 	 * Parses the application configuration file.
@@ -66,14 +66,14 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
+			$fcontent=include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
-			$dom = new TXmlDocument;
+			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
 			$this->loadFromXml($dom, dirname($fname));
 		}
@@ -99,9 +99,9 @@ 
 		{
 			foreach($config['application'] as $name => $value)
 			{
-				$this->_properties[$name] = $value;
+				$this->_properties[$name]=$value;
 			}
-			$this->_empty = false;
+			$this->_empty=false;
 		}
 
 		if(isset($config['paths']) && is_array($config['paths']))
@@ -130,8 +130,8 @@ 
 		// application properties
 		foreach($dom->getAttributes() as $name => $value)
 		{
-			$this->_properties[$name] = $value;
-			$this->_empty = false;
+			$this->_properties[$name]=$value;
+			$this->_empty=false;
 		}
 
 		foreach($dom->getElements() as $element)
@@ -171,16 +171,16 @@ 
 		{
 			foreach($pathsNode['aliases'] as $id => $path)
 			{
-				$path = str_replace('\\', '/', $path);
+				$path=str_replace('\\', '/', $path);
 				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
-					$p = realpath($path);
+					$p=realpath($path);
 				else
-					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-				if($p === false || !is_dir($p))
+					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+				if($p===false || !is_dir($p))
 					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 				if(isset($this->_aliases[$id]))
 					throw new TConfigurationException('appconfig_alias_redefined', $id);
-				$this->_aliases[$id] = $p;
+				$this->_aliases[$id]=$p;
 			}
 		}
 
@@ -188,7 +188,7 @@ 
 		{
 			foreach($pathsNode['using'] as $namespace)
 			{
-				$this->_usings[] = $namespace;
+				$this->_usings[]=$namespace;
 			}
 		}
 	}
@@ -206,31 +206,31 @@ 
 			{
 				case 'alias':
 				{
-					if(($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
+					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
 					{
-						$path = str_replace('\\', '/', $path);
+						$path=str_replace('\\', '/', $path);
 						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
-							$p = realpath($path);
+							$p=realpath($path);
 						else
-							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-						if($p === false || !is_dir($p))
+							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+						if($p===false || !is_dir($p))
 							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined', $id);
-						$this->_aliases[$id] = $p;
+						$this->_aliases[$id]=$p;
 					}
 					else
 						throw new TConfigurationException('appconfig_alias_invalid');
-					$this->_empty = false;
+					$this->_empty=false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace = $element->getAttribute('namespace')) !== null)
-						$this->_usings[] = $namespace;
+					if(($namespace=$element->getAttribute('namespace'))!==null)
+						$this->_usings[]=$namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
-					$this->_empty = false;
+					$this->_empty=false;
 					break;
 				}
 				default:
@@ -250,17 +250,17 @@ 
 		{
 			if(!isset($module['class']))
 				throw new TConfigurationException('appconfig_moduletype_required', $id);
-			$type = $module['class'];
+			$type=$module['class'];
 			unset($module['class']);
-			$properties = [];
+			$properties=[];
 			if(isset($module['properties']))
 			{
-				$properties = $module['properties'];
+				$properties=$module['properties'];
 				unset($module['properties']);
 			}
-			$properties['id'] = $id;
-			$this->_modules[$id] = [$type,$properties,$module];
-			$this->_empty = false;
+			$properties['id']=$id;
+			$this->_modules[$id]=[$type, $properties, $module];
+			$this->_empty=false;
 		}
 	}
 
@@ -273,19 +273,19 @@ 
 	{
 		foreach($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'module')
+			if($element->getTagName()==='module')
 			{
-				$properties = $element->getAttributes();
-				$id = $properties->itemAt('id');
-				$type = $properties->remove('class');
-				if($type === null)
+				$properties=$element->getAttributes();
+				$id=$properties->itemAt('id');
+				$type=$properties->remove('class');
+				if($type===null)
 					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
+				if($id===null)
+					$this->_modules[]=[$type, $properties->toArray(), $element];
 				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
-				$this->_empty = false;
+					$this->_modules[$id]=[$type, $properties->toArray(), $element];
+				$this->_empty=false;
 			}
 			else
 				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
@@ -303,12 +303,12 @@ 
 		{
 			if(!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
-			$type = $service['class'];
-			$properties = isset($service['properties']) ? $service['properties'] : [];
+			$type=$service['class'];
+			$properties=isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
-			$properties['id'] = $id;
-			$this->_services[$id] = [$type,$properties,$service];
-			$this->_empty = false;
+			$properties['id']=$id;
+			$this->_services[$id]=[$type, $properties, $service];
+			$this->_empty=false;
 		}
 	}
 
@@ -321,16 +321,16 @@ 
 	{
 		foreach($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'service')
+			if($element->getTagName()==='service')
 			{
-				$properties = $element->getAttributes();
-				if(($id = $properties->itemAt('id')) === null)
+				$properties=$element->getAttributes();
+				if(($id=$properties->itemAt('id'))===null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type = $properties->remove('class')) === null)
+				if(($type=$properties->remove('class'))===null)
 					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id] = [$type,$properties->toArray(),$element];
-				$this->_empty = false;
+				$this->_services[$id]=[$type, $properties->toArray(), $element];
+				$this->_empty=false;
 			}
 			else
 				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
@@ -350,16 +350,16 @@ 
 			{
 				if(isset($parameter['class']))
 				{
-					$type = $parameter['class'];
+					$type=$parameter['class'];
 					unset($parameter['class']);
-					$properties = isset($service['properties']) ? $service['properties'] : [];
-					$properties['id'] = $id;
-					$this->_parameters[$id] = [$type,$properties];
+					$properties=isset($service['properties']) ? $service['properties'] : [];
+					$properties['id']=$id;
+					$this->_parameters[$id]=[$type, $properties];
 				}
 			}
 			else
 			{
-				$this->_parameters[$id] = $parameter;
+				$this->_parameters[$id]=$parameter;
 			}
 		}
 	}
@@ -373,21 +373,21 @@ 
 	{
 		foreach($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'parameter')
+			if($element->getTagName()==='parameter')
 			{
-				$properties = $element->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				$properties=$element->getAttributes();
+				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type = $properties->remove('class')) === null)
+				if(($type=$properties->remove('class'))===null)
 				{
-					if(($value = $properties->remove('value')) === null)
-						$this->_parameters[$id] = $element;
+					if(($value=$properties->remove('value'))===null)
+						$this->_parameters[$id]=$element;
 					else
-						$this->_parameters[$id] = $value;
+						$this->_parameters[$id]=$value;
 				}
 				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
-				$this->_empty = false;
+					$this->_parameters[$id]=[$type, $properties->toArray()];
+				$this->_empty=false;
 			}
 			else
 				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
@@ -403,15 +403,15 @@ 
 	{
 		foreach($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
+			$when=isset($include['when']) ?true:false;
 			if(!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
-			$filePath = $include['file'];
+			$filePath=$include['file'];
 			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
 			else
-				$$this->_includes[$filePath] = $when;
-			$this->_empty = false;
+				$$this->_includes[$filePath]=$when;
+			$this->_empty=false;
 		}
 	}
 
@@ -422,15 +422,15 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when = $includeNode->getAttribute('when')) === null)
-			$when = true;
-		if(($filePath = $includeNode->getAttribute('file')) === null)
+		if(($when=$includeNode->getAttribute('when'))===null)
+			$when=true;
+		if(($filePath=$includeNode->getAttribute('file'))===null)
 			throw new TConfigurationException('appconfig_includefile_required');
 		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
 		else
-			$this->_includes[$filePath] = $when;
-		$this->_empty = false;
+			$this->_includes[$filePath]=$when;
+		$this->_empty=false;
 	}
 
 	/**

framework/Security/TAuthorizationRuleCollection.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 	{
 		if($user instanceof IUser)
 		{
-			$verb = strtolower(trim($verb));
+			$verb=strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+				if(($decision=$rule->isUserAllowed($user, $verb, $ip))!==0)
 					return ($decision > 0);
 			}
 			return true;

framework/Security/TUserManagerPasswordMode.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
  */
 class TUserManagerPasswordMode extends \Prado\TEnumerable
 {
-	const Clear = 'Clear';
-	const MD5 = 'MD5';
-	const SHA1 = 'SHA1';
+	const Clear='Clear';
+	const MD5='MD5';
+	const SHA1='SHA1';
 }
\ No newline at end of file

framework/Security/TDbUser.php

Spacing +5 added lines, -5 removed lines

@@ -37,19 +37,19 @@
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection === null)
+		if($this->_connection===null)
 		{
-			$userManager = $this->getManager();
+			$userManager=$this->getManager();
 			if($userManager instanceof TDbUserManager)
 			{
-				$connection = $userManager->getDbConnection();
+				$connection=$userManager->getDbConnection();
 				if($connection instanceof TDbConnection)
 				{
 					$connection->setActive(true);
-					$this->_connection = $connection;
+					$this->_connection=$connection;
 				}
 			}
-			if($this->_connection === null)
+			if($this->_connection===null)
 				throw new TConfigurationException('dbuser_dbconnection_invalid');
 		}
 		return $this->_connection;