pradosoft / prado

framework/interfaces.php

Spacing +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled 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);
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
 	 * Nothing will be done if the cache already contains the key.
@@ -210,7 +210,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled 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);
 	/**
 	 * Deletes a value with the specified key from cache
 	 * @param string the key of the value to be deleted

framework/prado.php

Spacing +5 added lines, -5 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Includes the PradoBase class file
  */
-require_once(dirname(__FILE__).'/PradoBase.php');
+require_once(dirname(__FILE__) . '/PradoBase.php');
 
 /**
  * Defines Prado class if not defined.
  */
-if(!class_exists('Prado',false))
+if (!class_exists('Prado', false))
 {
 	/**
 	 * Prado class.
@@ -45,7 +45,7 @@ 
  * cannot be found, if you have multiple autoloaders, Prado::autoload
  * should be registered in the last.
  */
-spl_autoload_register(array('Prado','autoload'));
+spl_autoload_register(array('Prado', 'autoload'));
 
 /**
  * Initializes error and exception handlers
@@ -55,10 +55,10 @@ 
 /**
  * Includes TApplication class file
  */
-require_once(dirname(__FILE__).'/TApplication.php');
+require_once(dirname(__FILE__) . '/TApplication.php');
 
 /**
  * Includes TShellApplication class file
  */
-require_once(dirname(__FILE__).'/TShellApplication.php');
+require_once(dirname(__FILE__) . '/TShellApplication.php');
 

framework/Exceptions/TErrorHandler.php

Spacing +104 added lines, -104 removed lines

@@ -52,20 +52,20 @@ 
 	/**
 	 * 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;
 
 	/**
 	 * @var string error template directory
 	 */
-	private $_templatePath=null;
+	private $_templatePath = null;
 
 	/**
 	 * Initializes the module.
@@ -82,8 +82,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;
 	}
 
@@ -95,10 +95,10 @@ 
 	 */
 	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);
+			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
 
 	/**
@@ -110,30 +110,30 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter (if the event is raised by TApplication, it refers to the exception instance)
 	 */
-	public function handleError($sender,$param)
+	public function handleError($sender, $param)
 	{
-		static $handling=false;
+		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
 		restore_error_handler();
 		restore_exception_handler();
 		// ensure that we do not enter infinite loop of error handling
-		if($handling)
+		if ($handling)
 			$this->handleRecursiveError($param);
 		else
 		{
-			$handling=true;
-			if(($response=$this->getResponse())!==null)
+			$handling = true;
+			if (($response = $this->getResponse()) !== null)
 				$response->clear();
-			if(!headers_sent())
+			if (!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
-			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
-			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
+			if ($param instanceof THttpException)
+				$this->handleExternalError($param->getStatusCode(), $param);
+			else if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
 
@@ -144,22 +144,22 @@ 
 	 * @return string
 	 * @since 3.1.6
 	 */
-	protected static function hideSecurityRelated($value, $exception=null)
+	protected static function hideSecurityRelated($value, $exception = null)
 	{
 		$aRpl = array();
-		if($exception !== null && $exception instanceof Exception)
+		if ($exception !== null && $exception instanceof Exception)
 		{
 			$aTrace = $exception->getTrace();
-			foreach($aTrace as $item)
+			foreach ($aTrace as $item)
 			{
-				if(isset($item['file']))
+				if (isset($item['file']))
 					$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;
-		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
+		if (isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
 		$aRpl = array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
@@ -172,36 +172,36 @@ 
 	 * @param integer response status code
 	 * @param Exception exception instance
 	 */
-	protected function handleExternalError($statusCode,$exception)
+	protected function handleExternalError($statusCode, $exception)
 	{
-		if(!($exception instanceof THttpException))
+		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();
-		if($isDebug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		if ($isDebug)
+			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
 		else
 		{
-			$version='';
+			$version = '';
 			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
 		}
-		$tokens=array(
+		$tokens = array(
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
 		$this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -213,16 +213,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');
 		}
 	}
@@ -236,55 +236,55 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if(php_sapi_name()==='cli')
+		if (php_sapi_name() === 'cli')
 		{
-			echo $exception->getMessage()."\n";
+			echo $exception->getMessage() . "\n";
 			echo $exception->getTraceAsString();
 			return;
 		}
 
-		if($exception instanceof TTemplateException)
+		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=array(
+		$tokens = array(
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
-			'%%SourceFile%%' => htmlspecialchars($fileName).' ('.$errorLine.')',
+			'%%SourceFile%%' => htmlspecialchars($fileName) . ' (' . $errorLine . ')',
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($exception->getTraceAsString()),
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
-		$content=$this->getExceptionTemplate($exception);
+		$content = $this->getExceptionTemplate($exception);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -296,11 +296,11 @@ 
 	 */
 	protected function getExceptionTemplate($exception)
 	{
-		$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)
+		$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)
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
@@ -321,84 +321,84 @@ 
 	 * @param Exception the exception to be displayed
 	 * @return string the template content
 	 */
-	protected function getErrorTemplate($statusCode,$exception)
+	protected function getErrorTemplate($statusCode, $exception)
 	{
-		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
-		$lang=Prado::getPreferredLanguage();
-		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile="$base$statusCode-$lang.html";
-		else if(is_file("$base$statusCode.html"))
-			$errorFile="$base$statusCode.html";
-		else if(is_file("$base-$lang.html"))
-			$errorFile="$base-$lang.html";
+		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
+		$lang = Prado::getPreferredLanguage();
+		if (is_file("$base$statusCode-$lang.html"))
+			$errorFile = "$base$statusCode-$lang.html";
+		else if (is_file("$base$statusCode.html"))
+			$errorFile = "$base$statusCode.html";
+		else if (is_file("$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)
 	{
-		$trace=$exception->getTrace();
-		$result=null;
+		$trace = $exception->getTrace();
+		$result = null;
 		// 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 ($exception instanceof TPhpErrorException)
 		{
-			if(isset($trace[0]['file']))
-				$result=$trace[0];
-			elseif(isset($trace[1]))
-				$result=$trace[1];
+			if (isset($trace[0]['file']))
+				$result = $trace[0];
+			elseif (isset($trace[1]))
+				$result = $trace[1];
 		}
-		else if($exception instanceof TInvalidOperationException)
+		else if ($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;
 	}
 
-	private function getPropertyAccessTrace($trace,$pattern)
+	private function getPropertyAccessTrace($trace, $pattern)
 	{
-		$result=null;
-		foreach($trace as $t)
+		$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;
 		}
 		return $result;
 	}
 
-	private function getSourceCode($lines,$errorLine)
+	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine=$errorLine-self::SOURCE_LINES>=0?$errorLine-self::SOURCE_LINES:0;
-		$endLine=$errorLine+self::SOURCE_LINES<=count($lines)?$errorLine+self::SOURCE_LINES:count($lines);
+		$beginLine = $errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine = $errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 
-		$source='';
-		for($i=$beginLine;$i<$endLine;++$i)
+		$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)
 	{
-		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
-		return preg_replace('/\b(T[A-Z]\w+)\b/',"<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>",$message);
+		$baseUrl = 'http://pradosoft.github.io/docs/manual/class-';
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
 

framework/Exceptions/TException.php

Spacing +39 added lines, -39 removed lines

@@ -32,8 +32,8 @@ 
  */
 class TException extends Exception
 {
-	private $_errorCode='';
-	static $_messageCache=array();
+	private $_errorCode = '';
+	static $_messageCache = array();
 
 	/**
 	 * Constructor.
@@ -44,15 +44,15 @@ 
 	 */
 	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=array();
-		for($i=0;$i<$n;++$i)
-			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		$n = count($args);
+		$tokens = array();
+		for ($i = 0; $i < $n; ++$i)
+			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**
@@ -62,17 +62,17 @@ 
 	 */
 	protected function translateErrorMessage($key)
 	{
-		$msgFile=$this->getErrorMessageFile();
+		$msgFile = $this->getErrorMessageFile();
 
 		// Cache messages
 		if (!isset(self::$_messageCache[$msgFile]))
 		{
-			if(($entries=@file($msgFile))!==false)
+			if (($entries = @file($msgFile)) !== false)
 			{
-				foreach($entries as $entry)
+				foreach ($entries as $entry)
 				{
-					@list($code,$message)=explode('=',$entry,2);
-					self::$_messageCache[$msgFile][trim($code)]=trim($message);
+					@list($code, $message) = explode('=', $entry, 2);
+					self::$_messageCache[$msgFile][trim($code)] = trim($message);
 				}
 			}
 		}
@@ -84,10 +84,10 @@ 
 	 */
 	protected function getErrorMessageFile()
 	{
-		$lang=Prado::getPreferredLanguage();
-		$msgFile=Prado::getFrameworkPath().'/Exceptions/messages/messages-'.$lang.'.txt';
-		if(!is_file($msgFile))
-			$msgFile=Prado::getFrameworkPath().'/Exceptions/messages/messages.txt';
+		$lang = Prado::getPreferredLanguage();
+		$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages-' . $lang . '.txt';
+		if (!is_file($msgFile))
+			$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages.txt';
 		return $msgFile;
 	}
 
@@ -104,7 +104,7 @@ 
 	 */
 	public function setErrorCode($code)
 	{
-		$this->_errorCode=$code;
+		$this->_errorCode = $code;
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	protected function setErrorMessage($message)
 	{
-		$this->message=$message;
+		$this->message = $message;
 	}
 }
 
@@ -214,9 +214,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.
@@ -231,7 +231,7 @@ 
 	 */
 	public function setTemplateSource($value)
 	{
-		$this->_template=$value;
+		$this->_template = $value;
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 	 */
 	public function setTemplateFile($value)
 	{
-		$this->_fileName=$value;
+		$this->_fileName = $value;
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 */
 	public function setLineNumber($value)
 	{
-		$this->_lineNumber=TPropertyValue::ensureInteger($value);
+		$this->_lineNumber = TPropertyValue::ensureInteger($value);
 	}
 }
 
@@ -338,9 +338,9 @@ 
 	 * @param string error file
 	 * @param integer error line number
 	 */
-	public function __construct($errno,$errstr,$errfile,$errline)
+	public function __construct($errno, $errstr, $errfile, $errline)
 	{
-		static $errorTypes=array(
+		static $errorTypes = array(
 			E_ERROR           => "Error",
 			E_WARNING         => "Warning",
 			E_PARSE           => "Parsing Error",
@@ -354,7 +354,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).");
 	}
 
@@ -394,19 +394,19 @@ 
 	 * will be used as the error message. Any rest parameters will be used
 	 * to replace placeholders ({0}, {1}, {2}, etc.) in the message.
 	 */
-	public function __construct($statusCode,$errorMessage)
+	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=array();
-		for($i=0;$i<$n;++$i)
-			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		$n = count($args);
+		$tokens = array();
+		for ($i = 0; $i < $n; ++$i)
+			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**

framework/Collections/TPagedDataSource.php

Spacing +64 added lines, -64 removed lines

@@ -26,32 +26,32 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TPagedDataSource extends TComponent implements IteratorAggregate,Countable
+class TPagedDataSource extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * @var mixed original data source
 	 */
-	private $_dataSource=null;
+	private $_dataSource = null;
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize=10;
+	private $_pageSize = 10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex=0;
+	private $_currentPageIndex = 0;
 	/**
 	 * @var boolean whether to allow paging
 	 */
-	private $_allowPaging=false;
+	private $_allowPaging = false;
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_allowCustomPaging=false;
+	private $_allowCustomPaging = false;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount=0;
+	private $_virtualCount = 0;
 
 	/**
 	 * @return mixed original data source. Defaults to null.
@@ -66,16 +66,16 @@ 
 	 */
 	public function setDataSource($value)
 	{
-		if(!($value instanceof TMap) && !($value instanceof TList))
+		if (!($value instanceof TMap) && !($value instanceof TList))
 		{
-			if(is_array($value))
-				$value=new TMap($value);
-			else if($value instanceof Traversable)
-				$value=new TList($value);
-			else if($value!==null)
+			if (is_array($value))
+				$value = new TMap($value);
+			else if ($value instanceof Traversable)
+				$value = new TList($value);
+			else if ($value !== null)
 				throw new TInvalidDataTypeException('pageddatasource_datasource_invalid');
 		}
-		$this->_dataSource=$value;
+		$this->_dataSource = $value;
 	}
 
 	/**
@@ -91,8 +91,8 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
-			$this->_pageSize=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) > 0)
+			$this->_pageSize = $value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_pagesize_invalid');
 	}
@@ -110,9 +110,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=0;
-		$this->_currentPageIndex=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = 0;
+		$this->_currentPageIndex = $value;
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function setAllowPaging($value)
 	{
-		$this->_allowPaging=TPropertyValue::ensureBoolean($value);
+		$this->_allowPaging = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 */
 	public function setAllowCustomPaging($value)
 	{
-		$this->_allowCustomPaging=TPropertyValue::ensureBoolean($value);
+		$this->_allowCustomPaging = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -160,8 +160,8 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>=0)
-			$this->_virtualCount=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) >= 0)
+			$this->_virtualCount = $value;
 		else
 			throw new TInvalidDataValueException('pageddatasource_virtualitemcount_invalid');
 	}
@@ -171,12 +171,12 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_dataSource===null)
+		if ($this->_dataSource === null)
 			return 0;
-		if(!$this->_allowPaging)
+		if (!$this->_allowPaging)
 			return $this->getDataSourceCount();
-		if(!$this->_allowCustomPaging && $this->getIsLastPage())
-			return $this->getDataSourceCount()-$this->getFirstIndexInPage();
+		if (!$this->_allowCustomPaging && $this->getIsLastPage())
+			return $this->getDataSourceCount() - $this->getFirstIndexInPage();
 		return $this->_pageSize;
 	}
 
@@ -195,12 +195,12 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_dataSource===null)
+		if ($this->_dataSource === null)
 			return 0;
-		$count=$this->getDataSourceCount();
-		if(!$this->_allowPaging || $count<=0)
+		$count = $this->getDataSourceCount();
+		if (!$this->_allowPaging || $count <= 0)
 			return 1;
-		return (int)(($count+$this->_pageSize-1)/$this->_pageSize);
+		return (int) (($count + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		if($this->_allowPaging)
-			return $this->_currentPageIndex===0;
+		if ($this->_allowPaging)
+			return $this->_currentPageIndex === 0;
 		else
 			return true;
 	}
@@ -219,8 +219,8 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		if($this->_allowPaging)
-			return $this->_currentPageIndex===$this->getPageCount()-1;
+		if ($this->_allowPaging)
+			return $this->_currentPageIndex === $this->getPageCount() - 1;
 		else
 			return true;
 	}
@@ -231,8 +231,8 @@ 
 	 */
 	public function getFirstIndexInPage()
 	{
-		if($this->_dataSource!==null && $this->_allowPaging && !$this->_allowCustomPaging)
-			return $this->_currentPageIndex*$this->_pageSize;
+		if ($this->_dataSource !== null && $this->_allowPaging && !$this->_allowCustomPaging)
+			return $this->_currentPageIndex * $this->_pageSize;
 		else
 			return 0;
 	}
@@ -242,9 +242,9 @@ 
 	 */
 	public function getDataSourceCount()
 	{
-		if($this->_dataSource===null)
+		if ($this->_dataSource === null)
 			return 0;
-		else if($this->_allowCustomPaging)
+		else if ($this->_allowCustomPaging)
 			return $this->_virtualCount;
 		else
 			return $this->_dataSource->getCount();
@@ -255,10 +255,10 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_dataSource instanceof TList)
-			return new TPagedListIterator($this->_dataSource,$this->getFirstIndexInPage(),$this->getCount());
-		else if($this->_dataSource instanceof TMap)
-			return new TPagedMapIterator($this->_dataSource,$this->getFirstIndexInPage(),$this->getCount());
+		if ($this->_dataSource instanceof TList)
+			return new TPagedListIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
+		else if ($this->_dataSource instanceof TMap)
+			return new TPagedMapIterator($this->_dataSource, $this->getFirstIndexInPage(), $this->getCount());
 		else
 			return null;
 	}
@@ -291,15 +291,15 @@ 
 	 * @param integer start index
 	 * @param integer number of items to be iterated through
 	 */
-	public function __construct(TList $list,$startIndex,$count)
+	public function __construct(TList $list, $startIndex, $count)
 	{
-		$this->_list=$list;
-		$this->_index=0;
-		$this->_startIndex=$startIndex;
-		if($startIndex+$count>$list->getCount())
-			$this->_count=$list->getCount()-$startIndex;
+		$this->_list = $list;
+		$this->_index = 0;
+		$this->_startIndex = $startIndex;
+		if ($startIndex + $count > $list->getCount())
+			$this->_count = $list->getCount() - $startIndex;
 		else
-			$this->_count=$count;
+			$this->_count = $count;
 	}
 
 	/**
@@ -308,7 +308,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_index=0;
+		$this->_index = 0;
 	}
 
 	/**
@@ -328,7 +328,7 @@ 
 	 */
 	public function current()
 	{
-		return $this->_list->itemAt($this->_startIndex+$this->_index);
+		return $this->_list->itemAt($this->_startIndex + $this->_index);
 	}
 
 	/**
@@ -347,7 +347,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
 
@@ -375,16 +375,16 @@ 
 	 * Constructor.
 	 * @param array the data to be iterated through
 	 */
-	public function __construct(TMap $map,$startIndex,$count)
+	public function __construct(TMap $map, $startIndex, $count)
 	{
-		$this->_map=$map;
-		$this->_index=0;
-		$this->_startIndex=$startIndex;
-		if($startIndex+$count>$map->getCount())
-			$this->_count=$map->getCount()-$startIndex;
+		$this->_map = $map;
+		$this->_index = 0;
+		$this->_startIndex = $startIndex;
+		if ($startIndex + $count > $map->getCount())
+			$this->_count = $map->getCount() - $startIndex;
 		else
-			$this->_count=$count;
-		$this->_iterator=$map->getIterator();
+			$this->_count = $count;
+		$this->_iterator = $map->getIterator();
 	}
 
 	/**
@@ -394,9 +394,9 @@ 
 	public function rewind()
 	{
 		$this->_iterator->rewind();
-		for($i=0;$i<$this->_startIndex;++$i)
+		for ($i = 0; $i < $this->_startIndex; ++$i)
 			$this->_iterator->next();
-		$this->_index=0;
+		$this->_index = 0;
 	}
 
 	/**
@@ -436,7 +436,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
 

framework/Collections/TQueue.php

Spacing +20 added lines, -20 removed lines

@@ -32,18 +32,18 @@ 
  * @package System.Collections
  * @since 3.1
  */
-class TQueue extends TComponent implements IteratorAggregate,Countable
+class TQueue extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c=0;
+	private $_c = 0;
 
 	/**
 	 * Constructor.
@@ -51,9 +51,9 @@ 
 	 * @param array|Iterator the intial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null)
+	public function __construct($data = null)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 
@@ -73,16 +73,16 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
-				$this->_d[]=$item;
+				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
@@ -91,8 +91,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c=0;
-		$this->_d=array();
+		$this->_c = 0;
+		$this->_d = array();
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true) !== false;
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 			return $this->_d[0];
@@ -125,7 +125,7 @@ 
 	 */
 	public function dequeue()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 		{
@@ -151,7 +151,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -207,9 +207,9 @@ 
 	 */
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

framework/Collections/TListItemCollection.php

Spacing +28 added lines, -28 removed lines

@@ -35,23 +35,23 @@ 
 	 * If -1, the item will be appended to the end.
 	 * @return TListItem list item object
 	 */
-	public function createListItem($index=-1)
+	public function createListItem($index = -1)
 	{
-		$item=$this->createNewListItem();
-		if($index<0)
+		$item = $this->createNewListItem();
+		if ($index < 0)
 			$this->add($item);
 		else
-			$this->insertAt($index,$item);
+			$this->insertAt($index, $item);
 		return $item;
 	}
 
 	/**
 	 * @return TListItem new item.
 	 */
-	protected function createNewListItem($text=null)
+	protected function createNewListItem($text = null)
 	{
-		$item =  new TListItem;
-		if($text!==null)
+		$item = new TListItem;
+		if ($text !== null)
 			$item->setText($text);
 		return $item;
 	}
@@ -63,13 +63,13 @@ 
 	 * @param TListItem the item to be inserted.
 	 * @throws TInvalidDataTypeException if the item being inserted is neither a string nor TListItem
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if(is_string($item))
+		if (is_string($item))
 			$item = $this->createNewListItem($item);
-		if(!($item instanceof TListItem))
-			throw new TInvalidDataTypeException('listitemcollection_item_invalid',get_class($this));
-		parent::insertAt($index,$item);
+		if (!($item instanceof TListItem))
+			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
+		parent::insertAt($index, $item);
 	}
 
 	/**
@@ -78,13 +78,13 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByValue($value,$includeDisabled=true)
+	public function findIndexByValue($value, $includeDisabled = true)
 	{
-		$value=TPropertyValue::ensureString($value);
-		$index=0;
-		foreach($this as $item)
+		$value = TPropertyValue::ensureString($value);
+		$index = 0;
+		foreach ($this as $item)
 		{
-			if($item->getValue()===$value && ($includeDisabled || $item->getEnabled()))
+			if ($item->getValue() === $value && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -97,13 +97,13 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByText($text,$includeDisabled=true)
+	public function findIndexByText($text, $includeDisabled = true)
 	{
-		$text=TPropertyValue::ensureString($text);
-		$index=0;
-		foreach($this as $item)
+		$text = TPropertyValue::ensureString($text);
+		$index = 0;
+		foreach ($this as $item)
 		{
-			if($item->getText()===$text && ($includeDisabled || $item->getEnabled()))
+			if ($item->getText() === $text && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -116,9 +116,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByValue($value,$includeDisabled=true)
+	public function findItemByValue($value, $includeDisabled = true)
 	{
-		if(($index=$this->findIndexByValue($value,$includeDisabled))>=0)
+		if (($index = $this->findIndexByValue($value, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -130,9 +130,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByText($text,$includeDisabled=true)
+	public function findItemByText($text, $includeDisabled = true)
 	{
-		if(($index=$this->findIndexByText($text,$includeDisabled))>=0)
+		if (($index = $this->findIndexByText($text, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -146,7 +146,7 @@ 
 	public function loadState($state)
 	{
 		$this->clear();
-		if($state!==null)
+		if ($state !== null)
 			$this->copyFrom($state);
 	}
 
@@ -157,6 +157,6 @@ 
 	 */
 	public function saveState()
 	{
-		return ($this->getCount()>0) ? $this->toArray() : null;
+		return ($this->getCount() > 0) ? $this->toArray() : null;
 	}
 }

framework/Collections/TStack.php

Spacing +21 added lines, -21 removed lines

@@ -29,18 +29,18 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TStack extends TComponent implements IteratorAggregate,Countable
+class TStack extends TComponent implements IteratorAggregate, Countable
 {
 	/**
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c=0;
+	private $_c = 0;
 
 	/**
 	 * Constructor.
@@ -48,9 +48,9 @@ 
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null)
+	public function __construct($data = null)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 
@@ -70,16 +70,16 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
-				$this->_d[]=$item;
+				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
@@ -88,8 +88,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c=0;
-		$this->_d=array();
+		$this->_c = 0;
+		$this->_d = array();
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true) !== false;
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('stack_empty');
 		else
-			return $this->_d[$this->_c-1];
+			return $this->_d[$this->_c - 1];
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function pop()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 		{
@@ -148,7 +148,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -204,9 +204,9 @@ 
 	 */
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 
 	/**
@@ -215,7 +215,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 

framework/Collections/TPagedList.php

Spacing +54 added lines, -54 removed lines

@@ -58,28 +58,28 @@ 
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_customPaging=false;
+	private $_customPaging = false;
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize=10;
+	private $_pageSize = 10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex=-1;
+	private $_currentPageIndex = -1;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount=-1;
+	private $_virtualCount = -1;
 
 	/**
 	 * Constructor.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data = null, $readOnly = false)
 	{
-		parent::__construct($data,true);
+		parent::__construct($data, true);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setCustomPaging($value)
 	{
-		$this->_customPaging=TPropertyValue::ensureBoolean($value);
+		$this->_customPaging = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
-			$this->_pageSize=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) > 0)
+			$this->_pageSize = $value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
 	}
@@ -131,7 +131,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false)
+		if ($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
 			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
 	}
 
@@ -142,7 +142,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function onFetchData($param)
 	{
-		$this->raiseEvent('OnFetchData',$this,$param);
+		$this->raiseEvent('OnFetchData', $this, $param);
 	}
 
 	/**
@@ -164,21 +164,21 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex===$this->_currentPageIndex)
+		if ($pageIndex === $this->_currentPageIndex)
 			return $pageIndex;
-		if($this->_customPaging)
+		if ($this->_customPaging)
 		{
-			if($pageIndex>=0 && ($this->_virtualCount<0 || $pageIndex<$this->getPageCount()))
+			if ($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param=new TPagedListFetchDataEventParameter($pageIndex,$this->_pageSize*$pageIndex,$this->_pageSize);
+				$param = new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
-				if(($data=$param->getData())!==null)
+				if (($data = $param->getData()) !== null)
 				{
 					$this->setReadOnly(false);
 					$this->copyFrom($data);
 					$this->setReadOnly(true);
-					$oldPage=$this->_currentPageIndex;
-					$this->_currentPageIndex=$pageIndex;
+					$oldPage = $this->_currentPageIndex;
+					$this->_currentPageIndex = $pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
 				}
@@ -190,9 +190,9 @@ 
 		}
 		else
 		{
-			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
+			if ($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
-				$this->_currentPageIndex=$pageIndex;
+				$this->_currentPageIndex = $pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
 			}
@@ -207,7 +207,7 @@ 
 	 */
 	public function nextPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex+1);
+		return $this->gotoPage($this->_currentPageIndex + 1);
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 */
 	public function previousPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex-1);
+		return $this->gotoPage($this->_currentPageIndex - 1);
 	}
 
 	/**
@@ -232,9 +232,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		$this->_virtualCount=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		$this->_virtualCount = $value;
 	}
 
 	/**
@@ -242,15 +242,15 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 		{
-			if($this->_virtualCount>=0)
-				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
+			if ($this->_virtualCount >= 0)
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -258,7 +258,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		return $this->_currentPageIndex===0;
+		return $this->_currentPageIndex === 0;
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex===$this->getPageCount()-1;
+		return $this->_currentPageIndex === $this->getPageCount() - 1;
 	}
 
 	/**
@@ -274,12 +274,12 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex===$this->getPageCount()-1)
-				return parent::getCount()-$this->_pageSize*$this->_currentPageIndex;
+			if ($this->_currentPageIndex === $this->getPageCount() - 1)
+				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
 		}
@@ -290,11 +290,11 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::getIterator();
 		else
 		{
-			$data=$this->toArray();
+			$data = $this->toArray();
 			return new TListIterator($data);
 		}
 	}
@@ -308,10 +308,10 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::itemAt($index);
 		else
-			return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
 	}
 
 	/**
@@ -320,9 +320,9 @@ 
 	 */
 	public function indexOf($item)
 	{
-		$c=$this->getCount();
-		for($i=0;$i<$c;++$i)
-			if($this->itemAt($i)===$item)
+		$c = $this->getCount();
+		for ($i = 0; $i < $c; ++$i)
+			if ($this->itemAt($i) === $item)
 				return $i;
 		return -1;
 	}
@@ -335,7 +335,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -355,10 +355,10 @@ 
 	 */
 	public function toArray()
 	{
-		$c=$this->getCount();
-		$array=array();
-		for($i=0;$i<$c;++$i)
-			$array[$i]=$this->itemAt($i);
+		$c = $this->getCount();
+		$array = array();
+		for ($i = 0; $i < $c; ++$i)
+			$array[$i] = $this->itemAt($i);
 		return $array;
 	}
 }
@@ -383,7 +383,7 @@ 
 	 */
 	public function __construct($oldPage)
 	{
-		$this->_oldPage=$oldPage;
+		$this->_oldPage = $oldPage;
 	}
 
 	/**
@@ -415,7 +415,7 @@ 
 	private $_pageIndex;
 	private $_offset;
 	private $_limit;
-	private $_data=null;
+	private $_data = null;
 
 	/**
 	 * Constructor.
@@ -423,11 +423,11 @@ 
 	 * @param integer offset of the first item in the new page
 	 * @param integer number of items in the new page desired
 	 */
-	public function __construct($pageIndex,$offset,$limit)
+	public function __construct($pageIndex, $offset, $limit)
 	{
-		$this->_pageIndex=$pageIndex;
-		$this->_offset=$offset;
-		$this->_limit=$limit;
+		$this->_pageIndex = $pageIndex;
+		$this->_offset = $offset;
+		$this->_limit = $limit;
 	}
 
 	/**
@@ -467,7 +467,7 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data=$value;
+		$this->_data = $value;
 	}
 }