pradosoft / prado

framework/Data/SqlMap/TSqlMapConfig.php

Doc Comments +1 added lines

@@ -77,6 +77,7 @@
 
 	/**
 	 * Saves the current SqlMap manager to cache.
+	 * @param TSqlMapManager $manager
 	 * @return boolean true if SqlMap manager was cached, false otherwise.
 	 */
 	protected function cacheSqlMapManager($manager)

Spacing +20 added lines, -20 removed lines

@@ -24,19 +24,19 @@ 
 {
 	private $_configFile;
 	private $_sqlmap;
-	private $_enableCache=false;
+	private $_enableCache = false;
 
 	/**
 	 * File extension of external configuration file
 	 */
-	const CONFIG_FILE_EXT='.xml';
+	const CONFIG_FILE_EXT = '.xml';
 
 	/**
 	 * @return string module ID + configuration file path.
 	 */
 	private function getCacheKey()
 	{
-		return $this->getID().$this->getConfigFile();
+		return $this->getID() . $this->getConfigFile();
 	}
 
 	/**
@@ -45,7 +45,7 @@ 
 	public function clearCache()
 	{
 		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		if ($cache !== null) {
 			$cache->delete($this->getCacheKey());
 		}
 	}
@@ -60,16 +60,16 @@ 
 	 */
 	public function getSqlMapManager() {
 		Prado::using('System.Data.SqlMap.TSqlMapManager');
-		if(($manager = $this->loadCachedSqlMapManager())===null)
+		if (($manager = $this->loadCachedSqlMapManager()) === null)
 		{
 			$manager = new TSqlMapManager($this->getDbConnection());
-			if(strlen($file=$this->getConfigFile()) > 0)
+			if (strlen($file = $this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif ($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -81,12 +81,12 @@ 
 	 */
 	protected function cacheSqlMapManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
+			if ($cache !== null) {
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					$dependencies = $manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -100,13 +100,13 @@ 
 	 */
 	protected function loadCachedSqlMapManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TSqlMapManager)
+				if ($manager instanceof TSqlMapManager)
 					return $manager;
 			}
 		}
@@ -128,13 +128,13 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(is_file($value))
-			$this->_configFile=$value;
+		if (is_file($value))
+			$this->_configFile = $value;
 		else
 		{
-			$file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid',$value);
+			$file = Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
+			if ($file === null || !is_file($file))
+				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
 			else
 				$this->_configFile = $file;
 		}
@@ -171,8 +171,8 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap===null )
-			$this->_sqlmap=$this->createSqlMapGateway();
+		if ($this->_sqlmap === null)
+			$this->_sqlmap = $this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}
 }

Braces +18 added lines, -15 removed lines

@@ -68,8 +68,7 @@ 
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -86,8 +85,9 @@ 
 			$cache = $this->getApplication()->getCache();
 			if($cache !== null) {
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									$dependencies = $manager->getCacheDependencies();
+				}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -106,8 +106,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TSqlMapManager)
-					return $manager;
+				if($manager instanceof TSqlMapManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -128,15 +129,16 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(is_file($value))
-			$this->_configFile=$value;
-		else
+		if(is_file($value)) {
+					$this->_configFile=$value;
+		} else
 		{
 			$file = Prado::getPathOfNamespace($value,self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
-				throw new TConfigurationException('sqlmap_configfile_invalid',$value);
-			else
-				$this->_configFile = $file;
+			if($file === null || !is_file($file)) {
+							throw new TConfigurationException('sqlmap_configfile_invalid',$value);
+			} else {
+							$this->_configFile = $file;
+			}
 		}
 	}
 
@@ -171,8 +173,9 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap===null )
-			$this->_sqlmap=$this->createSqlMapGateway();
+		if($this->_sqlmap===null ) {
+					$this->_sqlmap=$this->createSqlMapGateway();
+		}
 		return $this->_sqlmap;
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TSqlMapConfig class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.SqlMap
- */
+	 * TSqlMapConfig class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.SqlMap
+	 */
 
 Prado::using('System.Data.TDataSourceConfig');
 

framework/Data/SqlMap/TSqlMapGateway.php

Doc Comments +16 added lines

@@ -32,6 +32,9 @@ 
 	 */
 	private $_manager;
 
+	/**
+	 * @param TSqlMapManager|null $manager
+	 */
 	public function __construct($manager)
 	{
 		$this->_manager=$manager;
@@ -63,6 +66,8 @@ 
 	 * @param string The name of the sql statement to execute.
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param mixed An object of the type to be returned.
+	 * @param string $statementName
+	 * @param Account $result
 	 * @return object A single result object populated with the result set data.
 	 */
 	public function queryForObject($statementName, $parameter=null, $result=null)
@@ -84,6 +89,8 @@ 
 	 * pass in null if want to return a list instead.
 	 * @param int The number of rows to skip over.
 	 * @param int The maximum number of rows to return.
+	 * @param string $statementName
+	 * @param AccountCollection $result
 	 * @return TList A List of result objects.
 	 */
 	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
@@ -105,6 +112,7 @@ 
 	 * pass in null if want to return a list instead.
 	 * @param int The number of rows to skip over.
 	 * @param int The maximum number of rows to return.
+	 * @param string $statementName
 	 * @return TList A List of result objects.
 	 */
 	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
@@ -121,6 +129,7 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param integer The maximum number of objects to store in each page.
 	 * @param integer The number of the page to initially load into the list.
+	 * @param string $statementName
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
@@ -161,6 +170,9 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param string The property of the result object to be used as the key.
 	 * @param string The property of the result object to be used as the value.
+	 * @param string $statementName
+	 * @param string $keyProperty
+	 * @param string $valueProperty
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
 	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
@@ -180,6 +192,8 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param string The property of the result object to be used as the key.
 	 * @param string The property of the result object to be used as the value.
+	 * @param string $statementName
+	 * @param string $keyProperty
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
 	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
@@ -200,6 +214,7 @@ 
 	 *
 	 * @param string The name of the statement to execute.
 	 * @param string The parameter object.
+	 * @param string $statementName
 	 * @return mixed The primary key of the newly inserted row.
 	 * This might be automatically generated by the RDBMS,
 	 * or selected from a sequence table or other source.
@@ -233,6 +248,7 @@ 
 	 * Executes a Sql DELETE statement.  Delete returns the number of rows effected.
 	 * @param string The name of the statement to execute.
 	 * @param mixed The parameter object.
+	 * @param string $statementName
 	 * @return integer The number of rows effected.
 	 */
 	public function delete($statementName, $parameter=null)

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 
 	public function __construct($manager)
 	{
-		$this->_manager=$manager;
+		$this->_manager = $manager;
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 * @param mixed An object of the type to be returned.
 	 * @return object A single result object populated with the result set data.
 	 */
-	public function queryForObject($statementName, $parameter=null, $result=null)
+	public function queryForObject($statementName, $parameter = null, $result = null)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
@@ -86,10 +86,10 @@ 
 	 * @param int The maximum number of rows to return.
 	 * @return TList A List of result objects.
 	 */
-	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
+	public function queryForList($statementName, $parameter = null, $result = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return $statement->executeQueryForList($this->getDbConnection(),$parameter, $result, $skip, $max);
+		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 * @param int The maximum number of rows to return.
 	 * @return TList A List of result objects.
 	 */
-	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
+	public function queryWithRowDelegate($statementName, $delegate, $parameter = null, $result = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
@@ -123,7 +123,7 @@ 
 	 * @param integer The number of the page to initially load into the list.
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
-	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
+	public function queryForPagedList($statementName, $parameter = null, $pageSize = 10, $page = 0)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, null, $page);
@@ -144,10 +144,10 @@ 
 	 * @param integer The number of the page to initially load into the list.
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
-	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
+	public function queryForPagedListWithRowDelegate($statementName, $delegate, $parameter = null, $pageSize = 10, $page = 0)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate,$page);
+		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
 	}
 
 
@@ -163,7 +163,7 @@ 
 	 * @param string The property of the result object to be used as the value.
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
-	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
+	public function queryForMap($statementName, $parameter = null, $keyProperty = null, $valueProperty = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
@@ -182,7 +182,7 @@ 
 	 * @param string The property of the result object to be used as the value.
 	 * @return TMap Array object containing the rows keyed by keyProperty.
 	 */
-	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
+	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter = null, $keyProperty = null, $valueProperty = null, $skip = -1, $max = -1)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
@@ -204,7 +204,7 @@ 
 	 * This might be automatically generated by the RDBMS,
 	 * or selected from a sequence table or other source.
 	 */
-	public function insert($statementName, $parameter=null)
+	public function insert($statementName, $parameter = null)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
@@ -223,7 +223,7 @@ 
 	 * @param mixed The parameter object.
 	 * @return integer The number of rows effected.
 	 */
-	public function update($statementName, $parameter=null)
+	public function update($statementName, $parameter = null)
 	{
 		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
@@ -235,7 +235,7 @@ 
 	 * @param mixed The parameter object.
 	 * @return integer The number of rows effected.
 	 */
-	public function delete($statementName, $parameter=null)
+	public function delete($statementName, $parameter = null)
 	{
 		return $this->update($statementName, $parameter);
 	}

framework/Data/SqlMap/TSqlMapManager.php

Doc Comments +5 added lines

@@ -55,6 +55,7 @@ 
 	 * Constructor, create a new SqlMap manager.
 	 * @param TDbConnection database connection
 	 * @param string configuration file.
+	 * @param TDbConnection $connection
 	 */
 	public function __construct($connection=null)
 	{
@@ -68,6 +69,7 @@ 
 
 	/**
 	 * @param TDbConnection default database connection
+	 * @param TComponent $conn
 	 */
 	public function setDbConnection($conn)
 	{
@@ -105,6 +107,7 @@ 
 	/**
 	 * Loads and parses the SqlMap configuration file.
 	 * @param string xml configuration file.
+	 * @param string $file
 	 */
 	public function configureXml($file)
 	{
@@ -180,6 +183,7 @@ 
 	/**
 	 * Gets a named result map
 	 * @param string result name.
+	 * @param string $name
 	 * @return TResultMap the result map.
 	 * @throws TSqlMapUndefinedException
 	 */
@@ -212,6 +216,7 @@ 
 
 	/**
 	 * @param string parameter map ID name.
+	 * @param string $name
 	 * @return TParameterMap the parameter with given ID.
 	 * @throws TSqlMapUndefinedException
 	 */

Spacing +22 added lines, -22 removed lines

@@ -56,14 +56,14 @@ 
 	 * @param TDbConnection database connection
 	 * @param string configuration file.
 	 */
-	public function __construct($connection=null)
+	public function __construct($connection = null)
 	{
-		$this->_connection=$connection;
+		$this->_connection = $connection;
 
-		$this->_mappedStatements=new TMap;
-		$this->_resultMaps=new TMap;
-		$this->_parameterMaps=new TMap;
-		$this->_cacheModels=new TMap;
+		$this->_mappedStatements = new TMap;
+		$this->_resultMaps = new TMap;
+		$this->_parameterMaps = new TMap;
+		$this->_cacheModels = new TMap;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setDbConnection($conn)
 	{
-		$this->_connection=$conn;
+		$this->_connection = $conn;
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers===null)
-			$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+		if ($this->_typeHandlers === null)
+			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
 
@@ -97,8 +97,8 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway===null)
-			$this->_gateway=$this->createSqlMapGateway();
+		if ($this->_gateway === null)
+			$this->_gateway = $this->createSqlMapGateway();
 		return $this->_gateway;
 	}
 
@@ -118,8 +118,8 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies=new TChainedCacheDependency();
+		if ($this->_cacheDependencies === null)
+			$this->_cacheDependencies = new TChainedCacheDependency();
 
 		return $this->_cacheDependencies;
 	}
@@ -150,7 +150,7 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
+		if ($this->_mappedStatements->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
 		return $this->_mappedStatements[$name];
 	}
@@ -164,7 +164,7 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		if ($this->_mappedStatements->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
 		$this->_mappedStatements->add($key, $statement);
 	}
@@ -185,7 +185,7 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
+		if ($this->_resultMaps->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
 		return $this->_resultMaps[$name];
 	}
@@ -197,7 +197,7 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		if ($this->_resultMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
 		$this->_resultMaps->add($key, $result);
 	}
@@ -217,7 +217,7 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
+		if ($this->_parameterMaps->contains($name) == false)
 			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
 		return $this->_parameterMaps[$name];
 	}
@@ -229,7 +229,7 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		if ($this->_parameterMaps->contains($key) == true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}
@@ -241,7 +241,7 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
+		if ($this->_cacheModels->contains($cacheModel->getID()))
 			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
 		else
 			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
@@ -255,7 +255,7 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
+		if (!$this->_cacheModels->contains($name))
 			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
 		return $this->_cacheModels[$name];
 	}
@@ -265,7 +265,7 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
+		foreach ($this->_cacheModels as $cache)
 			$cache->flush();
 	}
 }

Braces +38 added lines, -26 removed lines

@@ -87,8 +87,9 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers===null)
-			$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+		if($this->_typeHandlers===null) {
+					$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+		}
 		return $this->_typeHandlers;
 	}
 
@@ -97,8 +98,9 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway===null)
-			$this->_gateway=$this->createSqlMapGateway();
+		if($this->_gateway===null) {
+					$this->_gateway=$this->createSqlMapGateway();
+		}
 		return $this->_gateway;
 	}
 
@@ -118,8 +120,9 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies=new TChainedCacheDependency();
+		if($this->_cacheDependencies === null) {
+					$this->_cacheDependencies=new TChainedCacheDependency();
+		}
 
 		return $this->_cacheDependencies;
 	}
@@ -150,8 +153,9 @@ 
 	 */
 	public function getMappedStatement($name)
 	{
-		if($this->_mappedStatements->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		if($this->_mappedStatements->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_statement', $name);
+		}
 		return $this->_mappedStatements[$name];
 	}
 
@@ -164,8 +168,9 @@ 
 	public function addMappedStatement(IMappedStatement $statement)
 	{
 		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		if($this->_mappedStatements->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
+		}
 		$this->_mappedStatements->add($key, $statement);
 	}
 
@@ -185,8 +190,9 @@ 
 	 */
 	public function getResultMap($name)
 	{
-		if($this->_resultMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		if($this->_resultMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_result_map', $name);
+		}
 		return $this->_resultMaps[$name];
 	}
 
@@ -197,8 +203,9 @@ 
 	public function addResultMap(TResultMap $result)
 	{
 		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		if($this->_resultMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
+		}
 		$this->_resultMaps->add($key, $result);
 	}
 
@@ -217,8 +224,9 @@ 
 	 */
 	public function getParameterMap($name)
 	{
-		if($this->_parameterMaps->contains($name) == false)
-			throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		if($this->_parameterMaps->contains($name) == false) {
+					throw new TSqlMapUndefinedException('sqlmap_contains_no_parameter_map', $name);
+		}
 		return $this->_parameterMaps[$name];
 	}
 
@@ -229,8 +237,9 @@ 
 	public function addParameterMap(TParameterMap $parameter)
 	{
 		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
-			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		if($this->_parameterMaps->contains($key) == true) {
+					throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
+		}
 		$this->_parameterMaps->add($key, $parameter);
 	}
 
@@ -241,10 +250,11 @@ 
 	 */
 	public function addCacheModel(TSqlMapCacheModel $cacheModel)
 	{
-		if($this->_cacheModels->contains($cacheModel->getID()))
-			throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
-		else
-			$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		if($this->_cacheModels->contains($cacheModel->getID())) {
+					throw new TSqlMapConfigurationException('sqlmap_cache_model_already_exists', $cacheModel->getID());
+		} else {
+					$this->_cacheModels->add($cacheModel->getID(), $cacheModel);
+		}
 	}
 
 	/**
@@ -255,8 +265,9 @@ 
 	 */
 	public function getCacheModel($name)
 	{
-		if(!$this->_cacheModels->contains($name))
-			throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		if(!$this->_cacheModels->contains($name)) {
+					throw new TSqlMapConfigurationException('sqlmap_unable_to_find_cache_model', $name);
+		}
 		return $this->_cacheModels[$name];
 	}
 
@@ -265,8 +276,9 @@ 
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
-			$cache->flush();
+		foreach($this->_cacheModels as $cache) {
+					$cache->flush();
+		}
 	}
 }
 

framework/Data/TDataSourceConfig.php

Doc Comments +1 added lines

@@ -149,6 +149,7 @@
 	/**
 	 * Finds the database connection instance from the Application modules.
 	 * @param string Database connection module ID.
+	 * @param string $id
 	 * @return TDbConnection database connection.
 	 * @throws TConfigurationException when module is not of TDbConnection or TDataSourceConfig.
 	 */

Spacing +19 added lines, -19 removed lines

@@ -46,9 +46,9 @@ 
  */
 class TDataSourceConfig extends TModule
 {
-	private $_connID='';
+	private $_connID = '';
 	private $_conn;
-	private $_connClass='System.Data.TDbConnection';
+	private $_connClass = 'System.Data.TDbConnection';
 
 	/**
 	 * Initalize the database connection properties from attributes in <database> tag.
@@ -56,22 +56,22 @@ 
 	 */
 	public function init($xml)
 	{
-		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(isset($xml['database']) && is_array($xml['database']))
+			if (isset($xml['database']) && is_array($xml['database']))
 			{
-				$db=$this->getDbConnection();
-				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+				$db = $this->getDbConnection();
+				foreach ($xml['database'] as $name=>$value)
+					$db->setSubProperty($name, $value);
 			}
 		}
 		else
 		{
-			if($prop=$xml->getElementByTagName('database'))
+			if ($prop = $xml->getElementByTagName('database'))
 			{
-				$db=$this->getDbConnection();
-				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+				$db = $this->getDbConnection();
+				foreach ($prop->getAttributes() as $name=>$value)
+					$db->setSubproperty($name, $value);
 			}
 		}
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public function setConnectionID($value)
 	{
-		$this->_connID=$value;
+		$this->_connID = $value;
 	}
 
 	/**
@@ -103,9 +103,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn===null)
+		if ($this->_conn === null)
 		{
-			if($this->_connID!=='')
+			if ($this->_connID !== '')
 				$this->_conn = $this->findConnectionByID($this->getConnectionID());
 			else
 				$this->_conn = Prado::createComponent($this->getConnectionClass());
@@ -141,9 +141,9 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn!==null)
+		if ($this->_conn !== null)
 			throw new TConfigurationException('datasource_dbconnection_exists', $value);
-		$this->_connClass=$value;
+		$this->_connClass = $value;
 	}
 
 	/**
@@ -155,11 +155,11 @@ 
 	protected function findConnectionByID($id)
 	{
 		$conn = $this->getApplication()->getModule($id);
-		if($conn instanceof TDbConnection)
+		if ($conn instanceof TDbConnection)
 			return $conn;
-		else if($conn instanceof TDataSourceConfig)
+		else if ($conn instanceof TDataSourceConfig)
 			return $conn->getDbConnection();
 		else
-			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+			throw new TConfigurationException('datasource_dbconnection_invalid', $id);
 	}
 }

Braces +22 added lines, -18 removed lines

@@ -61,17 +61,18 @@ 
 			if(isset($xml['database']) && is_array($xml['database']))
 			{
 				$db=$this->getDbConnection();
-				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+				foreach($xml['database'] as $name=>$value) {
+									$db->setSubProperty($name,$value);
+				}
 			}
-		}
-		else
+		} else
 		{
 			if($prop=$xml->getElementByTagName('database'))
 			{
 				$db=$this->getDbConnection();
-				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+				foreach($prop->getAttributes() as $name=>$value) {
+									$db->setSubproperty($name,$value);
+				}
 			}
 		}
 	}
@@ -105,10 +106,11 @@ 
 	{
 		if($this->_conn===null)
 		{
-			if($this->_connID!=='')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
-			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+			if($this->_connID!=='') {
+							$this->_conn = $this->findConnectionByID($this->getConnectionID());
+			} else {
+							$this->_conn = Prado::createComponent($this->getConnectionClass());
+			}
 		}
 		return $this->_conn;
 	}
@@ -141,8 +143,9 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn!==null)
-			throw new TConfigurationException('datasource_dbconnection_exists', $value);
+		if($this->_conn!==null) {
+					throw new TConfigurationException('datasource_dbconnection_exists', $value);
+		}
 		$this->_connClass=$value;
 	}
 
@@ -155,11 +158,12 @@ 
 	protected function findConnectionByID($id)
 	{
 		$conn = $this->getApplication()->getModule($id);
-		if($conn instanceof TDbConnection)
-			return $conn;
-		else if($conn instanceof TDataSourceConfig)
-			return $conn->getDbConnection();
-		else
-			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+		if($conn instanceof TDbConnection) {
+					return $conn;
+		} else if($conn instanceof TDataSourceConfig) {
+					return $conn->getDbConnection();
+		} else {
+					throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+		}
 	}
 }

framework/Data/TDbCommand.php

Doc Comments +1 added lines

@@ -136,6 +136,7 @@
 	 * @param mixed Name of the PHP variable to bind to the SQL statement parameter
 	 * @param int SQL data type of the parameter
 	 * @param int length of the data type
+	 * @param string $name
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
 	 */
 	public function bindParameter($name, &$value, $dataType=null, $length=null)

Spacing +45 added lines, -45 removed lines

@@ -37,17 +37,17 @@ 
 class TDbCommand extends TComponent
 {
 	private $_connection;
-	private $_text='';
-	private $_statement=null;
+	private $_text = '';
+	private $_statement = null;
 
 	/**
 	 * Constructor.
 	 * @param TDbConnection the database connection
 	 * @param string the SQL statement to be executed
 	 */
-	public function __construct(TDbConnection $connection,$text)
+	public function __construct(TDbConnection $connection, $text)
 	{
-		$this->_connection=$connection;
+		$this->_connection = $connection;
 		$this->setText($text);
 	}
 
@@ -56,7 +56,7 @@ 
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0TDbCommand\0_statement"));
+		return array_diff(parent::__sleep(), array("\0TDbCommand\0_statement"));
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->_text=$value;
+		$this->_text = $value;
 		$this->cancel();
 	}
 
@@ -104,15 +104,15 @@ 
 	 */
 	public function prepare()
 	{
-		if($this->_statement==null)
+		if ($this->_statement == null)
 		{
 			try
 			{
-				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
+				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
+				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
 		}
 	}
@@ -122,7 +122,7 @@ 
 	 */
 	public function cancel()
 	{
-		$this->_statement=null;
+		$this->_statement = null;
 	}
 
 	/**
@@ -138,15 +138,15 @@ 
 	 * @param int length of the data type
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
 	 */
-	public function bindParameter($name, &$value, $dataType=null, $length=null)
+	public function bindParameter($name, &$value, $dataType = null, $length = null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
-		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
+		if ($dataType === null)
+			$this->_statement->bindParam($name, $value);
+		else if ($length === null)
+			$this->_statement->bindParam($name, $value, $dataType);
 		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+			$this->_statement->bindParam($name, $value, $dataType, $length);
 	}
 
 	/**
@@ -159,13 +159,13 @@ 
 	 * @param int SQL data type of the parameter
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
 	 */
-	public function bindValue($name, $value, $dataType=null)
+	public function bindValue($name, $value, $dataType = null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
+		if ($dataType === null)
+			$this->_statement->bindValue($name, $value);
 		else
-			$this->_statement->bindValue($name,$value,$dataType);
+			$this->_statement->bindValue($name, $value, $dataType);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 			// Do not trace because it will remain even in
 			// Performance mode or when pradolite.php is used
 			// Prado::trace('Execute Command: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
@@ -190,9 +190,9 @@ 
 			else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -201,7 +201,7 @@ 
 	 */
 	public function getDebugStatementText()
 	{
-		if(Prado::getApplication()->getMode() === TApplicationMode::Debug)
+		if (Prado::getApplication()->getMode() === TApplicationMode::Debug)
 			return $this->_statement instanceof PDOStatement ?
 				$this->_statement->queryString
 				: $this->getText();
@@ -218,15 +218,15 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -238,22 +238,22 @@ 
 	 * @return array the first row of the query result, false if no result.
 	 * @throws TDbException execution failed
 	 */
-	public function queryRow($fetchAssociative=true)
+	public function queryRow($fetchAssociative = true)
 	{
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
-			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
+				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			$result = $this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -269,20 +269,20 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
-			$result=$this->_statement->fetchColumn();
+				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			$result = $this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if(is_resource($result) && get_resource_type($result)==='stream')
+			if (is_resource($result) && get_resource_type($result) === 'stream')
 				return stream_get_contents($result);
 			else
 				return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -296,10 +296,10 @@ 
 	 */
 	public function queryColumn()
 	{
-		$rows=$this->query()->readAll();
-		$column=array();
-		foreach($rows as $row)
-			$column[]=current($row);
+		$rows = $this->query()->readAll();
+		$column = array();
+		foreach ($rows as $row)
+			$column[] = current($row);
 		return $column;
 	}
 }

Braces +45 added lines, -42 removed lines

@@ -109,8 +109,7 @@ 
 			try
 			{
 				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
 			}
@@ -141,12 +140,13 @@ 
 	public function bindParameter($name, &$value, $dataType=null, $length=null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
-		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
-		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+		if($dataType===null) {
+					$this->_statement->bindParam($name,$value);
+		} else if($length===null) {
+					$this->_statement->bindParam($name,$value,$dataType);
+		} else {
+					$this->_statement->bindParam($name,$value,$dataType,$length);
+		}
 	}
 
 	/**
@@ -162,10 +162,11 @@ 
 	public function bindValue($name, $value, $dataType=null)
 	{
 		$this->prepare();
-		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
-		else
-			$this->_statement->bindValue($name,$value,$dataType);
+		if($dataType===null) {
+					$this->_statement->bindValue($name,$value);
+		} else {
+					$this->_statement->bindValue($name,$value,$dataType);
+		}
 	}
 
 	/**
@@ -186,11 +187,10 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
+			} else {
+							return $this->getConnection()->getPdoInstance()->exec($this->getText());
 			}
-			else
-				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -201,10 +201,11 @@ 
 	 */
 	public function getDebugStatementText()
 	{
-		if(Prado::getApplication()->getMode() === TApplicationMode::Debug)
-			return $this->_statement instanceof PDOStatement ?
+		if(Prado::getApplication()->getMode() === TApplicationMode::Debug) {
+					return $this->_statement instanceof PDOStatement ?
 				$this->_statement->queryString
 				: $this->getText();
+		}
 	}
 
 	/**
@@ -218,13 +219,13 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -243,15 +244,15 @@ 
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -269,18 +270,19 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'System.Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result=$this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if(is_resource($result) && get_resource_type($result)==='stream')
-				return stream_get_contents($result);
-			else
-				return $result;
-		}
-		catch(Exception $e)
+			if(is_resource($result) && get_resource_type($result)==='stream') {
+							return stream_get_contents($result);
+			} else {
+							return $result;
+			}
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -298,8 +300,9 @@ 
 	{
 		$rows=$this->query()->readAll();
 		$column=array();
-		foreach($rows as $row)
-			$column[]=current($row);
+		foreach($rows as $row) {
+					$column[]=current($row);
+		}
 		return $column;
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TDbCommand class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data
- */
+	 * TDbCommand class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data
+	 */
 
 /**
  * TDbCommand class.

framework/Data/TDbConnection.php

Doc Comments +4 added lines

@@ -157,6 +157,7 @@ 
 	/**
 	 * Open or close the DB connection.
 	 * @param boolean whether to open or close DB connection
+	 * @param boolean $value
 	 * @throws TDbException if connection fails
 	 */
 	public function setActive($value)
@@ -241,6 +242,7 @@ 
 
 	/**
 	 * @param string The Data Source Name, or DSN, contains the information required to connect to the database.
+	 * @param string $value
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
 	public function setConnectionString($value)
@@ -258,6 +260,7 @@ 
 
 	/**
 	 * @param string the username for establishing DB connection
+	 * @param string $value
 	 */
 	public function setUsername($value)
 	{
@@ -274,6 +277,7 @@ 
 
 	/**
 	 * @param string the password for establishing DB connection
+	 * @param string $value
 	 */
 	public function setPassword($value)
 	{

Spacing +67 added lines, -67 removed lines

@@ -87,13 +87,13 @@ 
 	 */
 	const DEFAULT_TRANSACTION_CLASS = 'System.Data.TDbTransaction';
 
-	private $_dsn='';
-	private $_username='';
-	private $_password='';
-	private $_charset='';
-	private $_attributes=array();
-	private $_active=false;
-	private $_pdo=null;
+	private $_dsn = '';
+	private $_username = '';
+	private $_password = '';
+	private $_charset = '';
+	private $_attributes = array();
+	private $_active = false;
+	private $_pdo = null;
 	private $_transaction;
 
 	/**
@@ -105,7 +105,7 @@ 
 	 * @var string
 	 * @since 3.1.7
 	 */
-	private $_transactionClass=self::DEFAULT_TRANSACTION_CLASS;
+	private $_transactionClass = self::DEFAULT_TRANSACTION_CLASS;
 
 	/**
 	 * Constructor.
@@ -120,12 +120,12 @@ 
 	 * @param string Charset used for DB Connection (MySql & pgsql only). If not set, will use the default charset of your database server
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
-	public function __construct($dsn='',$username='',$password='', $charset='')
+	public function __construct($dsn = '', $username = '', $password = '', $charset = '')
 	{
-		$this->_dsn=$dsn;
-		$this->_username=$username;
-		$this->_password=$password;
-		$this->_charset=$charset;
+		$this->_dsn = $dsn;
+		$this->_username = $username;
+		$this->_password = $password;
+		$this->_charset = $charset;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(),array("\0TDbConnection\0_pdo","\0TDbConnection\0_active"));
+		return array_diff(parent::__sleep(), array("\0TDbConnection\0_pdo", "\0TDbConnection\0_active"));
 	}
 
 	/**
@@ -161,10 +161,10 @@ 
 	 */
 	public function setActive($value)
 	{
-		$value=TPropertyValue::ensureBoolean($value);
-		if($value!==$this->_active)
+		$value = TPropertyValue::ensureBoolean($value);
+		if ($value !== $this->_active)
 		{
-			if($value)
+			if ($value)
 				$this->open();
 			else
 				$this->close();
@@ -177,22 +177,22 @@ 
 	 */
 	protected function open()
 	{
-		if($this->_pdo===null)
+		if ($this->_pdo === null)
 		{
 			try
 			{
-				$this->_pdo=new PDO($this->getConnectionString(),$this->getUsername(),
-									$this->getPassword(),$this->_attributes);
+				$this->_pdo = new PDO($this->getConnectionString(), $this->getUsername(),
+									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
 				@$this->_pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-				$this->_active=true;
+				$this->_active = true;
 				$this->setConnectionCharset();
 			}
-			catch(PDOException $e)
+			catch (PDOException $e)
 			{
-				throw new TDbException('dbconnection_open_failed',$e->getMessage());
+				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
 		}
 	}
@@ -203,8 +203,8 @@ 
 	 */
 	protected function close()
 	{
-		$this->_pdo=null;
-		$this->_active=false;
+		$this->_pdo = null;
+		$this->_active = false;
 	}
 
 	/*
@@ -245,7 +245,7 @@ 
 	 */
 	public function setConnectionString($value)
 	{
-		$this->_dsn=$value;
+		$this->_dsn = $value;
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	 */
 	public function setUsername($value)
 	{
-		$this->_username=$value;
+		$this->_username = $value;
 	}
 
 	/**
@@ -277,13 +277,13 @@ 
 	 */
 	public function setPassword($value)
 	{
-		$this->_password=$value;
+		$this->_password = $value;
 	}
 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -291,9 +291,9 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
-		$this->_charset=$value;
+		$this->_charset = $value;
 		$this->setConnectionCharset();
 	}
 
@@ -313,8 +313,8 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
-			return new TDbCommand($this,$sql);
+		if ($this->getActive())
+			return new TDbCommand($this, $sql);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
@@ -324,9 +324,9 @@ 
 	 */
 	public function getCurrentTransaction()
 	{
-		if($this->_transaction!==null)
+		if ($this->_transaction !== null)
 		{
-			if($this->_transaction->getActive())
+			if ($this->_transaction->getActive())
 				return $this->_transaction;
 		}
 		return null;
@@ -339,10 +339,10 @@ 
 	 */
 	public function beginTransaction()
 	{
-		if($this->getActive())
+		if ($this->getActive())
 		{
 			$this->_pdo->beginTransaction();
-			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
+			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
 		}
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -364,7 +364,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**
@@ -373,9 +373,9 @@ 
 	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
 	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
 	 */
-	public function getLastInsertID($sequenceName='')
+	public function getLastInsertID($sequenceName = '')
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->lastInsertId($sequenceName);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -389,7 +389,7 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->quote($str);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -430,7 +430,7 @@ 
 	 */
 	public function getDbMetaData()
 	{
-		if($this->_dbMeta===null)
+		if ($this->_dbMeta === null)
 		{
 			Prado::using('System.Data.Common.TDbMetaData');
 			$this->_dbMeta = TDbMetaData::getInstance($this);
@@ -443,7 +443,7 @@ 
 	 */
 	public function getColumnCase()
 	{
-		switch($this->getAttribute(PDO::ATTR_CASE))
+		switch ($this->getAttribute(PDO::ATTR_CASE))
 		{
 			case PDO::CASE_NATURAL:
 				return TDbColumnCaseMode::Preserved;
@@ -459,19 +459,19 @@ 
 	 */
 	public function setColumnCase($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbColumnCaseMode'))
+		switch (TPropertyValue::ensureEnum($value, 'TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
-				$value=PDO::CASE_NATURAL;
+				$value = PDO::CASE_NATURAL;
 				break;
 			case TDbColumnCaseMode::LowerCase:
-				$value=PDO::CASE_LOWER;
+				$value = PDO::CASE_LOWER;
 				break;
 			case TDbColumnCaseMode::UpperCase:
-				$value=PDO::CASE_UPPER;
+				$value = PDO::CASE_UPPER;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_CASE,$value);
+		$this->setAttribute(PDO::ATTR_CASE, $value);
 	}
 
 	/**
@@ -479,7 +479,7 @@ 
 	 */
 	public function getNullConversion()
 	{
-		switch($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
+		switch ($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
 		{
 			case PDO::NULL_NATURAL:
 				return TDbNullConversionMode::Preserved;
@@ -495,19 +495,19 @@ 
 	 */
 	public function setNullConversion($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbNullConversionMode'))
+		switch (TPropertyValue::ensureEnum($value, 'TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
-				$value=PDO::NULL_NATURAL;
+				$value = PDO::NULL_NATURAL;
 				break;
 			case TDbNullConversionMode::EmptyStringToNull:
-				$value=PDO::NULL_EMPTY_STRING;
+				$value = PDO::NULL_EMPTY_STRING;
 				break;
 			case TDbNullConversionMode::NullToEmptyString:
-				$value=PDO::NULL_TO_STRING;
+				$value = PDO::NULL_TO_STRING;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_ORACLE_NULLS,$value);
+		$this->setAttribute(PDO::ATTR_ORACLE_NULLS, $value);
 	}
 
 	/**
@@ -525,7 +525,7 @@ 
 	 */
 	public function setAutoCommit($value)
 	{
-		$this->setAttribute(PDO::ATTR_AUTOCOMMIT,TPropertyValue::ensureBoolean($value));
+		$this->setAttribute(PDO::ATTR_AUTOCOMMIT, TPropertyValue::ensureBoolean($value));
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	public function setPersistent($value)
 	{
-		return $this->setAttribute(PDO::ATTR_PERSISTENT,TPropertyValue::ensureBoolean($value));
+		return $this->setAttribute(PDO::ATTR_PERSISTENT, TPropertyValue::ensureBoolean($value));
 	}
 
 	/**
@@ -611,7 +611,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->getAttribute($name);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -623,12 +623,12 @@ 
 	 * @param mixed the attribute value
 	 * @see http://www.php.net/manual/en/function.PDO-setAttribute.php
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name,$value);
+		if ($this->_pdo instanceof PDO)
+			$this->_pdo->setAttribute($name, $value);
 		else
-			$this->_attributes[$name]=$value;
+			$this->_attributes[$name] = $value;
 	}
 }
 
@@ -644,15 +644,15 @@ 
 	/**
 	 * Column name cases are kept as is from the database
 	 */
-	const Preserved='Preserved';
+	const Preserved = 'Preserved';
 	/**
 	 * Column names are converted to lower case
 	 */
-	const LowerCase='LowerCase';
+	const LowerCase = 'LowerCase';
 	/**
 	 * Column names are converted to upper case
 	 */
-	const UpperCase='UpperCase';
+	const UpperCase = 'UpperCase';
 }
 
 /**
@@ -667,14 +667,14 @@ 
 	/**
 	 * No conversion is performed for null and empty values.
 	 */
-	const Preserved='Preserved';
+	const Preserved = 'Preserved';
 	/**
 	 * NULL is converted to empty string
 	 */
-	const NullToEmptyString='NullToEmptyString';
+	const NullToEmptyString = 'NullToEmptyString';
 	/**
 	 * Empty string is converted to NULL
 	 */
-	const EmptyStringToNull='EmptyStringToNull';
+	const EmptyStringToNull = 'EmptyStringToNull';
 }
 

Braces +39 added lines, -32 removed lines

@@ -164,10 +164,11 @@ 
 		$value=TPropertyValue::ensureBoolean($value);
 		if($value!==$this->_active)
 		{
-			if($value)
-				$this->open();
-			else
-				$this->close();
+			if($value) {
+							$this->open();
+			} else {
+							$this->close();
+			}
 		}
 	}
 
@@ -189,8 +190,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active=true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed',$e->getMessage());
 			}
@@ -214,8 +214,9 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
-			return;
+		if ($this->_charset === '' || $this->_active === false) {
+					return;
+		}
 		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
@@ -313,10 +314,11 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
-			return new TDbCommand($this,$sql);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return new TDbCommand($this,$sql);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -326,8 +328,9 @@ 
 	{
 		if($this->_transaction!==null)
 		{
-			if($this->_transaction->getActive())
-				return $this->_transaction;
+			if($this->_transaction->getActive()) {
+							return $this->_transaction;
+			}
 		}
 		return null;
 	}
@@ -343,9 +346,9 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
 		}
-		else
-			throw new TDbException('dbconnection_connection_inactive');
 	}
 
 	/**
@@ -375,10 +378,11 @@ 
 	 */
 	public function getLastInsertID($sequenceName='')
 	{
-		if($this->getActive())
-			return $this->_pdo->lastInsertId($sequenceName);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->lastInsertId($sequenceName);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -389,10 +393,11 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
-			return $this->_pdo->quote($str);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->quote($str);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -611,10 +616,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
-			return $this->_pdo->getAttribute($name);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->getAttribute($name);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -625,10 +631,11 @@ 
 	 */
 	public function setAttribute($name,$value)
 	{
-		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name,$value);
-		else
-			$this->_attributes[$name]=$value;
+		if($this->_pdo instanceof PDO) {
+					$this->_pdo->setAttribute($name,$value);
+		} else {
+					$this->_attributes[$name]=$value;
+		}
 	}
 }
 

framework/Data/TDbDataReader.php

Doc Comments +4 added lines

@@ -58,6 +58,7 @@ 
 	 * should match the case of the column, as returned by the driver.
 	 * @param mixed Name of the PHP variable to which the column will be bound.
 	 * @param int Data type of the parameter
+	 * @param integer $column
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
 	 */
 	public function bindColumn($column, &$value, $dataType=null)
@@ -89,6 +90,7 @@ 
 	/**
 	 * Returns a single column from the next row of a result set.
 	 * @param int zero-based column index
+	 * @param integer $columnIndex
 	 * @return mixed|false the column of the current row, false if no more row available
 	 */
 	public function readColumn($columnIndex)
@@ -100,6 +102,8 @@ 
 	 * Returns a single column from the next row of a result set.
 	 * @param string class name of the object to be created and populated
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
+	 * @param string $className
+	 * @param string[] $fields
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
 	public function readObject($className,$fields)

Spacing +17 added lines, -17 removed lines

@@ -35,9 +35,9 @@ 
 class TDbDataReader extends TComponent implements Iterator
 {
 	private $_statement;
-	private $_closed=false;
+	private $_closed = false;
 	private $_row;
-	private $_index=-1;
+	private $_index = -1;
 
 	/**
 	 * Constructor.
@@ -45,7 +45,7 @@ 
 	 */
 	public function __construct(TDbCommand $command)
 	{
-		$this->_statement=$command->getPdoStatement();
+		$this->_statement = $command->getPdoStatement();
 		$this->_statement->setFetchMode(PDO::FETCH_ASSOC);
 	}
 
@@ -60,12 +60,12 @@ 
 	 * @param int Data type of the parameter
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
 	 */
-	public function bindColumn($column, &$value, $dataType=null)
+	public function bindColumn($column, &$value, $dataType = null)
 	{
-		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+		if ($dataType === null)
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -73,8 +73,8 @@ 
 	 */
 	public function setFetchMode($mode)
 	{
-		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		$params = func_get_args();
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
-	public function readObject($className,$fields)
+	public function readObject($className, $fields)
 	{
-		return $this->_statement->fetchObject($className,$fields);
+		return $this->_statement->fetchObject($className, $fields);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	public function close()
 	{
 		$this->_statement->closeCursor();
-		$this->_closed=true;
+		$this->_closed = true;
 	}
 
 	/**
@@ -171,10 +171,10 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if ($this->_index < 0)
 		{
-			$this->_row=$this->_statement->fetch();
-			$this->_index=0;
+			$this->_row = $this->_statement->fetch();
+			$this->_index = 0;
 		}
 		else
 			throw new TDbException('dbdatareader_rewind_invalid');
@@ -206,7 +206,7 @@ 
 	 */
 	public function next()
 	{
-		$this->_row=$this->_statement->fetch();
+		$this->_row = $this->_statement->fetch();
 		$this->_index++;
 	}
 
@@ -217,7 +217,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_row!==false;
+		return $this->_row !== false;
 	}
 }
 

Braces +7 added lines, -6 removed lines

@@ -62,10 +62,11 @@ 
 	 */
 	public function bindColumn($column, &$value, $dataType=null)
 	{
-		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
-		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+		if($dataType===null) {
+					$this->_statement->bindColumn($column,$value);
+		} else {
+					$this->_statement->bindColumn($column,$value,$dataType);
+		}
 	}
 
 	/**
@@ -175,9 +176,9 @@ 
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;
+		} else {
+					throw new TDbException('dbdatareader_rewind_invalid');
 		}
-		else
-			throw new TDbException('dbdatareader_rewind_invalid');
 	}
 
 	/**

framework/Data/TDbTransaction.php

Doc Comments +1 added lines

@@ -101,6 +101,7 @@
 
 	/**
 	 * @param boolean whether this transaction is active
+	 * @param boolean $value
 	 */
 	protected function setActive($value)
 	{

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
  */
 class TDbTransaction extends TComponent
 {
-	private $_connection=null;
+	private $_connection = null;
 	private $_active;
 
 	/**
@@ -49,7 +49,7 @@ 
 	 */
 	public function __construct(TDbConnection $connection)
 	{
-		$this->_connection=$connection;
+		$this->_connection = $connection;
 		$this->setActive(true);
 	}
 
@@ -59,10 +59,10 @@ 
 	 */
 	public function commit()
 	{
-		if($this->_active && $this->_connection->getActive())
+		if ($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->commit();
-			$this->_active=false;
+			$this->_active = false;
 		}
 		else
 			throw new TDbException('dbtransaction_transaction_inactive');
@@ -74,10 +74,10 @@ 
 	 */
 	public function rollback()
 	{
-		if($this->_active && $this->_connection->getActive())
+		if ($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->rollBack();
-			$this->_active=false;
+			$this->_active = false;
 		}
 		else
 			throw new TDbException('dbtransaction_transaction_inactive');
@@ -104,7 +104,7 @@ 
 	 */
 	protected function setActive($value)
 	{
-		$this->_active=TPropertyValue::ensureBoolean($value);
+		$this->_active = TPropertyValue::ensureBoolean($value);
 	}
 }
 

Braces +4 added lines, -4 removed lines

@@ -63,9 +63,9 @@ 
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active=false;
+		} else {
+					throw new TDbException('dbtransaction_transaction_inactive');
 		}
-		else
-			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active=false;
+		} else {
+					throw new TDbException('dbtransaction_transaction_inactive');
 		}
-		else
-			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
 	/**

framework/Exceptions/TErrorHandler.php

Doc Comments +7 added lines

@@ -109,6 +109,7 @@ 
 	 * It terminates the application immediately after the error is displayed.
 	 * @param mixed sender of the event
 	 * @param mixed event parameter (if the event is raised by TApplication, it refers to the exception instance)
+	 * @param null|TApplication $sender
 	 */
 	public function handleError($sender,$param)
 	{
@@ -363,6 +364,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace,$pattern)
 	{
 		$result=null;
@@ -395,6 +399,9 @@ 
 		return $source;
 	}
 
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';

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

Braces +84 added lines, -69 removed lines

@@ -82,8 +82,9 @@ 
 	 */
 	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 +96,11 @@ 
 	 */
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
-			$this->_templatePath=$templatePath;
-		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath)) {
+					$this->_templatePath=$templatePath;
+		} else {
+					throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+		}
 	}
 
 	/**
@@ -119,21 +121,24 @@ 
 		restore_error_handler();
 		restore_exception_handler();
 		// ensure that we do not enter infinite loop of error handling
-		if($handling)
-			$this->handleRecursiveError($param);
-		else
+		if($handling) {
+					$this->handleRecursiveError($param);
+		} else
 		{
 			$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);
-			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
-				$this->displayException($param);
-			else
-				$this->handleExternalError(500,$param);
+			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);
+			} else if($this->getApplication()->getMode()===TApplicationMode::Debug) {
+							$this->displayException($param);
+			} else {
+							$this->handleExternalError(500,$param);
+			}
 		}
 	}
 
@@ -152,14 +157,17 @@ 
 			$aTrace = $exception->getTrace();
 			foreach($aTrace as $item)
 			{
-				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				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);
@@ -174,8 +182,9 @@ 
 	 */
 	protected function handleExternalError($statusCode,$exception)
 	{
-		if(!($exception instanceof THttpException))
-			error_log($exception->__toString());
+		if(!($exception instanceof THttpException)) {
+					error_log($exception->__toString());
+		}
 
 		$content=$this->getErrorTemplate($statusCode,$exception);
 
@@ -184,9 +193,9 @@ 
 		$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();
-		else
+		if($isDebug) {
+					$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		} else
 		{
 			$version='';
 			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
@@ -219,8 +228,7 @@ 
 			echo "<body><h1>Recursive Error</h1>\n";
 			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
@@ -248,18 +256,17 @@ 
 			$fileName=$exception->getTemplateFile();
 			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
 			$source=$this->getSourceCode($lines,$exception->getLineNumber());
-			if($fileName==='')
-				$fileName='---embedded template---';
+			if($fileName==='') {
+							$fileName='---embedded template---';
+			}
 			$errorLine=$exception->getLineNumber();
-		}
-		else
+		} else
 		{
 			if(($trace=$this->getExactTrace($exception))!==null)
 			{
 				$fileName=$trace['file'];
 				$errorLine=$trace['line'];
-			}
-			else
+			} else
 			{
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
@@ -267,10 +274,11 @@ 
 			$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();
-		else
-			$version='';
+		if($this->getApplication()->getMode()===TApplicationMode::Debug) {
+					$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		} else {
+					$version='';
+		}
 
 		$tokens=array(
 			'%%ErrorType%%' => get_class($exception),
@@ -298,10 +306,12 @@ 
 	{
 		$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'.");
+		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;
 	}
 
@@ -325,16 +335,18 @@ 
 	{
 		$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)
-			die("Unable to open error template file '$errorFile'.");
+		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) {
+					die("Unable to open error template file '$errorFile'.");
+		}
 		return $content;
 	}
 
@@ -346,19 +358,21 @@ 
 		// 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];
-			elseif(isset($trace[1]))
-				$result=$trace[1];
-		}
-		else if($exception instanceof TInvalidOperationException)
+			if(isset($trace[0]['file'])) {
+							$result=$trace[0];
+			} elseif(isset($trace[1])) {
+							$result=$trace[1];
+			}
+		} 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) {
+					return null;
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
-			return null;
 
 		return $result;
 	}
@@ -368,10 +382,11 @@ 
 		$result=null;
 		foreach($trace as $t)
 		{
-			if(isset($t['function']) && $t['function']===$pattern)
-				$result=$t;
-			else
-				break;
+			if(isset($t['function']) && $t['function']===$pattern) {
+							$result=$t;
+			} else {
+							break;
+			}
 		}
 		return $result;
 	}
@@ -388,9 +403,9 @@ 
 			{
 				$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])));
 			}
-			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;
 	}