pradosoft / prado

framework/Data/SqlMap/TSqlMapGateway.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 	 */
 	private $_manager;
 
+	/**
+	 * @param TSqlMapManager $manager
+	 */
 	public function __construct($manager)
 	{
 		$this->_manager=$manager;

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function queryForObject($statementName, $parameter=null, $result=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
 	}
 
@@ -88,8 +88,8 @@ 
 	 */
 	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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
+		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
 	}
 
@@ -125,7 +125,7 @@ 
 	 */
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
+		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 */
 	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
 	}
 
@@ -184,7 +184,7 @@ 
 	 */
 	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
 	}
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function insert($statementName, $parameter=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
 	}
 
@@ -225,7 +225,7 @@ 
 	 */
 	public function update($statementName, $parameter=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
 	}
 

framework/Data/TDbCommand.php

Doc Comments +2 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)
@@ -157,6 +158,7 @@ 
 	 * placeholders, this will be the 1-indexed position of the parameter.
 	 * @param mixed The value to bind to the parameter
 	 * @param int SQL data type of the parameter
+	 * @param string $name
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
 	 */
 	public function bindValue($name, $value, $dataType=null)

Braces +6 added lines, -12 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());
 			}
@@ -186,11 +185,9 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
-			}
-			else
+			} else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -223,8 +220,7 @@ 
 			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());
 		}
@@ -250,8 +246,7 @@ 
 			$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());
 		}
@@ -279,8 +274,7 @@ 
 				return stream_get_contents($result);
 			else
 				return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}

Spacing +12 added lines, -12 removed lines

@@ -45,7 +45,7 @@ 
 	 * @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->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"));
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 			}
 			catch(Exception $e)
 			{
-				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
+				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
 		}
 	}
@@ -142,11 +142,11 @@ 
 	{
 		$this->prepare();
 		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
+			$this->_statement->bindParam($name, $value);
 		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
+			$this->_statement->bindParam($name, $value, $dataType);
 		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+			$this->_statement->bindParam($name, $value, $dataType, $length);
 	}
 
 	/**
@@ -163,9 +163,9 @@ 
 	{
 		$this->prepare();
 		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
+			$this->_statement->bindValue($name, $value);
 		else
-			$this->_statement->bindValue($name,$value,$dataType);
+			$this->_statement->bindValue($name, $value, $dataType);
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -226,7 +226,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -253,7 +253,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -282,7 +282,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 

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-2016 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-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data
+	 */
 
 /**
  * TDbCommand class.

framework/Data/TDbDataReader.php

Doc Comments +1 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)

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +6 added lines, -6 removed lines

@@ -63,9 +63,9 @@ 
 	public function bindColumn($column, &$value, $dataType=null)
 	{
 		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		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);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if($this->_index < 0)
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;

framework/Exceptions/TErrorHandler.php

Doc Comments +8 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)
 	{
@@ -171,6 +172,7 @@ 
 	 * mode will be displayed to the client user.
 	 * @param integer response status code
 	 * @param Exception exception instance
+	 * @param integer $statusCode
 	 */
 	protected function handleExternalError($statusCode,$exception)
 	{
@@ -363,6 +365,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace,$pattern)
 	{
 		$result=null;
@@ -395,6 +400,9 @@ 
 		return $source;
 	}
 
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';

Braces +5 added lines, -10 removed lines

@@ -219,8 +219,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');
@@ -251,15 +250,13 @@ 
 			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();
@@ -350,8 +347,7 @@ 
 				$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)
@@ -388,8 +384,7 @@ 
 			{
 				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
-			}
-			else
+			} else
 				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;

Spacing +38 added lines, -38 removed lines

@@ -98,7 +98,7 @@ 
 		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,7 +110,7 @@ 
 	 * @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;
 		// We need to restore error and exception handlers,
@@ -129,11 +129,11 @@ 
 			if(!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
 			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
+				$this->handleExternalError($param->getStatusCode(), $param);
 			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
 
@@ -146,21 +146,21 @@ 
 	 */
 	protected static function hideSecurityRelated($value, $exception=null)
 	{
-		$aRpl = array();
-		if($exception !== null && $exception instanceof Exception)
+		$aRpl=array();
+		if($exception!==null && $exception instanceof Exception)
 		{
-			$aTrace = $exception->getTrace();
+			$aTrace=$exception->getTrace();
 			foreach($aTrace as $item)
 			{
 				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+					$aRpl[dirname($item['file']).DIRECTORY_SEPARATOR]='<hidden>'.DIRECTORY_SEPARATOR;
 			}
 		}
-		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
-		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
-		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
+		$aRpl[$_SERVER['DOCUMENT_ROOT']]='${DocumentRoot}';
+		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])]='${DocumentRoot}';
+		$aRpl[PRADO_DIR.DIRECTORY_SEPARATOR]='${PradoFramework}'.DIRECTORY_SEPARATOR;
 		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
-		$aRpl = array_reverse($aRpl, true);
+		$aRpl=array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
@@ -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))
 			error_log($exception->__toString());
 
-		$content=$this->getErrorTemplate($statusCode,$exception);
+		$content=$this->getErrorTemplate($statusCode, $exception);
 
-		$serverAdmin=isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
+		$serverAdmin=isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
 
-		$isDebug = $this->getApplication()->getMode()===TApplicationMode::Debug;
+		$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
 
-		$errorMessage = $exception->getMessage();
+		$errorMessage=$exception->getMessage();
 		if($isDebug)
 			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 		{
 			$version='';
-			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
+			$errorMessage=self::hideSecurityRelated($errorMessage, $exception);
 		}
 		$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);
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 		if($exception instanceof TTemplateException)
 		{
 			$fileName=$exception->getTemplateFile();
-			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
-			$source=$this->getSourceCode($lines,$exception->getLineNumber());
+			$lines=empty($fileName) ? explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source=$this->getSourceCode($lines, $exception->getLineNumber());
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
@@ -264,7 +264,7 @@ 
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
 			}
-			$source=$this->getSourceCode(@file($fileName),$errorLine);
+			$source=$this->getSourceCode(@file($fileName), $errorLine);
 		}
 
 		if($this->getApplication()->getMode()===TApplicationMode::Debug)
@@ -279,12 +279,12 @@ 
 			'%%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);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	 * @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();
@@ -354,16 +354,16 @@ 
 		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)
@@ -376,21 +376,21 @@ 
 		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)
+		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])));
+				$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;
 	}
@@ -398,7 +398,7 @@ 
 	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);
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
 

framework/Exceptions/TException.php

Doc Comments +2 added lines

@@ -393,6 +393,8 @@
 	 * in the message file. If so, the message in the preferred language
 	 * will be used as the error message. Any rest parameters will be used
 	 * to replace placeholders ({0}, {1}, {2}, etc.) in the message.
+	 * @param integer $statusCode
+	 * @param string $errorMessage
 	 */
 	public function __construct($statusCode,$errorMessage)
 	{

Spacing +9 added lines, -9 removed lines

@@ -50,9 +50,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**
@@ -65,13 +65,13 @@ 
 		$msgFile=$this->getErrorMessageFile();
 
 		// Cache messages
-		if (!isset(self::$_messageCache[$msgFile]))
+		if(!isset(self::$_messageCache[$msgFile]))
 		{
 			if(($entries=@file($msgFile))!==false)
 			{
 				foreach($entries as $entry)
 				{
-					@list($code,$message)=explode('=',$entry,2);
+					@list($code, $message)=explode('=', $entry, 2);
 					self::$_messageCache[$msgFile][trim($code)]=trim($message);
 				}
 			}
@@ -338,7 +338,7 @@ 
 	 * @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(
 			E_ERROR           => "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,7 +394,7 @@ 
 	 * 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->setErrorCode($errorMessage);
@@ -404,9 +404,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
-		parent::__construct(strtr($errorMessage,$tokens));
+		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
 	/**

framework/I18N/core/ChoiceFormat.php

Doc Comments +4 added lines

@@ -165,6 +165,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function isValidSetNotation($number, $set)
 	{
 		$str = '$result = '.str_replace('n', '$number', $set).';';
@@ -208,6 +211,7 @@ 
 	 * string that satisfied the set within the choices.
 	 * @param string the choices string.
 	 * @param float the number to test.
+	 * @param double $number
 	 * @return string the choosen string.
 	 */
 	public function format($string, $number)

Spacing +41 added lines, -41 removed lines

@@ -82,13 +82,13 @@ 
 	 * The pattern to validate a set notation
 	 * @var string
 	 */
-	protected $validate = '/[\(\[\{]|[-Inf\d:\s]+|,|[\+Inf\d\s:\?\-=!><%\|&\(\)]+|[\)\]\}]/ms';
+	protected $validate='/[\(\[\{]|[-Inf\d:\s]+|,|[\+Inf\d\s:\?\-=!><%\|&\(\)]+|[\)\]\}]/ms';
 
 	/**
 	 * The pattern to parse the formatting string.
 	 * @var string
 	 */
-	protected $parse = '/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
+	protected $parse='/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
 
 	/**
 	 * The value for positive infinity.
@@ -102,7 +102,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->inf = -log(0);
+		$this->inf=-log(0);
 	}
 
 
@@ -114,7 +114,7 @@ 
 	 */
 	function isValid($number, $set)
 	{
-		$n = preg_match_all($this->validate,$set,$matches,PREG_SET_ORDER);
+		$n=preg_match_all($this->validate, $set, $matches, PREG_SET_ORDER);
 
 		if($n < 3) throw new Exception("Invalid set \"{$set}\"");
 
@@ -123,42 +123,42 @@ 
 			return $this->isValidSetNotation($number, $def[1]);
 		}
 
-		$leftBracket = $matches[0][0];
-		$rightBracket = $matches[$n-1][0];
+		$leftBracket=$matches[0][0];
+		$rightBracket=$matches[$n - 1][0];
 
-		$i = 0;
-		$elements = array();
+		$i=0;
+		$elements=array();
 		foreach($matches as $match)
 		{
-			$string = $match[0];
-			if($i != 0 && $i != $n-1 && $string !== ',')
+			$string=$match[0];
+			if($i!=0 && $i!=$n - 1 && $string!==',')
 			{
-				if($string == '-Inf')
-					$elements[] = -1*$this->inf;
-				else if ($string == '+Inf' || $string == 'Inf')
-					$elements[] = $this->inf;
+				if($string=='-Inf')
+					$elements[]=-1 * $this->inf;
+				else if($string=='+Inf' || $string=='Inf')
+					$elements[]=$this->inf;
 				else
-					$elements[] = floatval($string);
+					$elements[]=floatval($string);
 			}
 			$i++;
 		}
-		$total = count($elements);
-		$number = floatval($number);
+		$total=count($elements);
+		$number=floatval($number);
 
-		if($leftBracket == '{' && $rightBracket == '}')
+		if($leftBracket=='{' && $rightBracket=='}')
 			return in_array($number, $elements);
 
-		$left = false;
-		if($leftBracket == '[')
-			$left = $number >= $elements[0];
-		else if ($leftBracket == '(')
-			$left = $number > $elements[0];
+		$left=false;
+		if($leftBracket=='[')
+			$left=$number >= $elements[0];
+		else if($leftBracket=='(')
+			$left=$number > $elements[0];
 
-		$right = false;
+		$right=false;
 		if($rightBracket==']')
-			$right = $number <= $elements[$total-1];
-		else if($rightBracket == ')')
-			$right = $number < $elements[$total-1];
+			$right=$number <= $elements[$total - 1];
+		else if($rightBracket==')')
+			$right=$number < $elements[$total - 1];
 
 		if($left && $right) return true;
 
@@ -167,7 +167,7 @@ 
 
 	protected function isValidSetNotation($number, $set)
 	{
-		$str = '$result = '.str_replace('n', '$number', $set).';';
+		$str='$result = '.str_replace('n', '$number', $set).';';
 		try
 		{
 			eval($str);
@@ -187,18 +187,18 @@ 
 	 */
 	function parse($string)
 	{
-		$n = preg_match_all($this->parse,$string,$matches, PREG_OFFSET_CAPTURE);
-		$sets = array();
+		$n=preg_match_all($this->parse, $string, $matches, PREG_OFFSET_CAPTURE);
+		$sets=array();
 		foreach($matches[1] as $match)
-			$sets[] = $match[0];
-		$offset = $matches[0];
-		$strings = array();
-		for($i = 0; $i < $n; $i++)
+			$sets[]=$match[0];
+		$offset=$matches[0];
+		$strings=array();
+		for($i=0; $i < $n; $i++)
 		{
-			$len = strlen($offset[$i][0]);
-			$begin = $i == 0? $len : $offset[$i][1] + $len;
-			$end = $i == $n-1 ? strlen($string) : $offset[$i+1][1];
-			$strings[] = substr($string, $begin, $end - $begin);
+			$len=strlen($offset[$i][0]);
+			$begin=$i==0 ? $len : $offset[$i][1] + $len;
+			$end=$i==$n - 1 ? strlen($string) : $offset[$i + 1][1];
+			$strings[]=substr($string, $begin, $end - $begin);
 		}
 		return array($sets, $strings);
 	}
@@ -212,9 +212,9 @@ 
 	 */
 	public function format($string, $number)
 	{
-		list($sets, $strings) = $this->parse($string);
-		$total = count($sets);
-		for($i = 0; $i < $total; $i++)
+		list($sets, $strings)=$this->parse($string);
+		$total=count($sets);
+		for($i=0; $i < $total; $i++)
 		{
 			if($this->isValid($number, $sets[$i]))
 				return $strings[$i];

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 		try
 		{
 			$highlighter=Text_Highlighter::factory($this->getLanguage());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$highlighter=false;
 		}

framework/I18N/TGlobalization.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	}
 
 	/**
-	 * @return string default culture
+	 * @return boolean default culture
 	 */
 	public function getTranslateDefaultCulture()
 	{

Spacing +28 added lines, -28 removed lines

@@ -29,13 +29,13 @@ 
 	 * Default character set is 'UTF-8'.
 	 * @var string
 	 */
-	private $_defaultCharset = 'UTF-8';
+	private $_defaultCharset='UTF-8';
 
 	/**
 	 * Default culture is 'en'.
 	 * @var string
 	 */
-	private $_defaultCulture = 'en';
+	private $_defaultCulture='en';
 
 	/**
 	 * The current charset.
@@ -77,11 +77,11 @@ 
 		if($config!==null)
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+				$translation=isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
-				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$t=$config->getElementByTagName('translation');
+				$translation=($t) ? $t->getAttributes() : null;
 			}
 			if($translation)
 				$this->setTranslationConfiguration($translation);
@@ -102,7 +102,7 @@ 
 	 */
 	public function setTranslateDefaultCulture($value)
 	{
-		$this->_translateDefaultCulture = TPropertyValue::ensureBoolean($value);
+		$this->_translateDefaultCulture=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-','_',$culture);
+		$this->_defaultCulture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	public function setDefaultCharset($charset)
 	{
-		$this->_defaultCharset = $charset;
+		$this->_defaultCharset=$charset;
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-','_',$culture);
+		$this->_culture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = $charset;
+		$this->_charset=$charset;
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 */
 	public function getTranslationConfiguration()
 	{
-		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture() == $this->getCulture()))
+		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture()==$this->getCulture()))
 			? null
 			: $this->_translation;
 	}
@@ -196,11 +196,11 @@ 
 	 */
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
+		if($config['type']=='XLIFF' || $config['type']=='gettext')
 		{
 			if($config['source'])
 			{
-				$config['source'] = Prado::getPathOfNamespace($config['source']);
+				$config['source']=Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
 					if(@mkdir($config['source'])===false)
@@ -216,7 +216,7 @@ 
 		}
 		if($config['cache'])
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
+			$config['cache']=$this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
 				if(@mkdir($config['cache'])===false)
@@ -225,7 +225,7 @@ 
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
 			}
 		}
-		$this->_translation = $config;
+		$this->_translation=$config;
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function setTranslationCatalogue($value)
 	{
-		$this->_translation['catalogue'] = $value;
+		$this->_translation['catalogue']=$value;
 	}
 
 	/**
@@ -252,11 +252,11 @@ 
 	 */
 	public function getCultureVariants($culture=null)
 	{
-		if($culture===null) $culture = $this->getCulture();
-		$variants = explode('_', $culture);
-		$result = array();
+		if($culture===null) $culture=$this->getCulture();
+		$variants=explode('_', $culture);
+		$result=array();
 		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+			$result[]=implode('_', $variants);
 		return $result;
 	}
 
@@ -279,17 +279,17 @@ 
 	 * @param string culture string, null to use current culture
 	 * @return array list of possible localized resource files.
 	 */
-	public function getLocalizedResource($file,$culture=null)
+	public function getLocalizedResource($file, $culture=null)
 	{
-		$files = array();
-		$variants = $this->getCultureVariants($culture);
-		$path = pathinfo($file);
+		$files=array();
+		$variants=$this->getCultureVariants($culture);
+		$path=pathinfo($file);
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
-		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		$filename=substr($path['basename'], 0, strrpos($path['basename'], '.'));
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
-		$files[] = $file;
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		$files[]=$file;
 		return $files;
 	}
 

Braces +1 added lines, -2 removed lines

@@ -158,8 +158,7 @@
 				$e->setAttribute('maxOccurs','unbounded');
 				$sequence->appendChild($e);
 				$complexType->appendChild($sequence);
-			}
-			else
+			} else
 			{
 				$all = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:all');
 				foreach($elements as $elem)

framework/Security/TSecurityManager.php

Doc Comments +3 added lines, -1 removed lines

@@ -182,7 +182,7 @@ 
 	}
 
 	/**
-	 * @return mixed the algorithm used to encrypt/decrypt data. Defaults to the string 'rijndael-256'.
+	 * @return string the algorithm used to encrypt/decrypt data. Defaults to the string 'rijndael-256'.
 	 */
 	public function getCryptAlgorithm()
 	{
@@ -201,6 +201,7 @@ 
 	/**
 	 * Encrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be encrypted.
+	 * @param string $data
 	 * @return string the encrypted data
 	 * @throws TNotSupportedException if PHP Mcrypt extension is not loaded
 	 */
@@ -220,6 +221,7 @@ 
 	/**
 	 * Decrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be decrypted.
+	 * @param string $data
 	 * @return string the decrypted data
 	 * @throws TNotSupportedException if PHP Mcrypt extension is not loaded
 	 */

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +46 added lines, -46 removed lines

@@ -40,13 +40,13 @@ 
  */
 class TSecurityManager extends TModule
 {
-	const STATE_VALIDATION_KEY = 'prado:securitymanager:validationkey';
-	const STATE_ENCRYPTION_KEY = 'prado:securitymanager:encryptionkey';
+	const STATE_VALIDATION_KEY='prado:securitymanager:validationkey';
+	const STATE_ENCRYPTION_KEY='prado:securitymanager:encryptionkey';
 
-	private $_validationKey = null;
-	private $_encryptionKey = null;
-	private $_hashAlgorithm = 'sha1';
-	private $_cryptAlgorithm = 'rijndael-256';
+	private $_validationKey=null;
+	private $_encryptionKey=null;
+	private $_hashAlgorithm='sha1';
+	private $_cryptAlgorithm='rijndael-256';
 	private $_mbstring;
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	protected function generateRandomKey()
 	{
-		return sprintf('%08x%08x%08x%08x',mt_rand(),mt_rand(),mt_rand(),mt_rand());
+		return sprintf('%08x%08x%08x%08x', mt_rand(), mt_rand(), mt_rand(), mt_rand());
 	}
 
 	/**
@@ -74,9 +74,9 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
-				$this->_validationKey = $this->generateRandomKey();
+		if(null===$this->_validationKey) {
+			if(null===($this->_validationKey=$this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+				$this->_validationKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
@@ -89,10 +89,10 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
-		$this->_validationKey = $value;
+		$this->_validationKey=$value;
 	}
 
 	/**
@@ -101,9 +101,9 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
-				$this->_encryptionKey = $this->generateRandomKey();
+		if(null===$this->_encryptionKey) {
+			if(null===($this->_encryptionKey=$this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+				$this->_encryptionKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
@@ -116,10 +116,10 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
-		$this->_encryptionKey = $value;
+		$this->_encryptionKey=$value;
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setValidation($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureEnum($value, 'TSecurityManagerValidationMode');
+		$this->_hashAlgorithm=TPropertyValue::ensureEnum($value, 'TSecurityManagerValidationMode');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setHashAlgorithm($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
+		$this->_hashAlgorithm=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public function setEncryption($value)
 	{
-		$this->_cryptAlgorithm = $value;
+		$this->_cryptAlgorithm=$value;
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 */
 	public function setCryptAlgorithm($value)
 	{
-		$this->_cryptAlgorithm = $value;
+		$this->_cryptAlgorithm=$value;
 	}
 
 	/**
@@ -207,11 +207,11 @@ 
 	public function encrypt($data)
 	{
 		$module=$this->openCryptModule();
-		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
+		$key=$this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		srand();
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
+		$iv=mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
 		mcrypt_generic_init($module, $key, $iv);
-		$encrypted = $iv.mcrypt_generic($module, $data);
+		$encrypted=$iv.mcrypt_generic($module, $data);
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $encrypted;
@@ -226,11 +226,11 @@ 
 	public function decrypt($data)
 	{
 		$module=$this->openCryptModule();
-		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
-		$ivSize = mcrypt_enc_get_iv_size($module);
-		$iv = $this->substr($data, 0, $ivSize);
+		$key=$this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
+		$ivSize=mcrypt_enc_get_iv_size($module);
+		$iv=$this->substr($data, 0, $ivSize);
 		mcrypt_generic_init($module, $key, $iv);
-		$decrypted = mdecrypt_generic($module, $this->substr($data, $ivSize, $this->strlen($data)));
+		$decrypted=mdecrypt_generic($module, $this->substr($data, $ivSize, $this->strlen($data)));
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $decrypted;
@@ -246,9 +246,9 @@ 
 		if(extension_loaded('mcrypt'))
 		{
 			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+				$module=@call_user_func_array('mcrypt_module_open', $this->_cryptAlgorithm);
 			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+				$module=@mcrypt_module_open($this->_cryptAlgorithm, '', MCRYPT_MODE_CBC, '');
 
 			if($module===false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
@@ -266,7 +266,7 @@ 
 	 */
 	public function hashData($data)
 	{
-		$hmac = $this->computeHMAC($data);
+		$hmac=$this->computeHMAC($data);
 		return $hmac.$data;
 	}
 
@@ -284,9 +284,9 @@ 
 		if($this->strlen($data) < $len)
 			return false;
 
-		$hmac = $this->substr($data, 0, $len);
+		$hmac=$this->substr($data, 0, $len);
 		$data2=$this->substr($data, $len, $this->strlen($data));
-		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
+		return $hmac===$this->computeHMAC($data2) ? $data2 : false;
 	}
 
 	/**
@@ -296,22 +296,22 @@ 
 	 */
 	protected function computeHMAC($data)
 	{
-		$key = $this->getValidationKey();
+		$key=$this->getValidationKey();
 
 		if(function_exists('hash_hmac'))
 			return hash_hmac($this->_hashAlgorithm, $data, $key);
 
-		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
+		if(!strcasecmp($this->_hashAlgorithm, 'sha1'))
 		{
-			$pack = 'H40';
-			$func = 'sha1';
+			$pack='H40';
+			$func='sha1';
 		} else {
-			$pack = 'H32';
-			$func = 'md5';
+			$pack='H32';
+			$func='md5';
 		}
 
-		$key = str_pad($func($key), 64, chr(0));
-		return $func((str_repeat(chr(0x5C), 64) ^ substr($key, 0, 64)) . pack($pack, $func((str_repeat(chr(0x36), 64) ^ substr($key, 0, 64)) . $data)));
+		$key=str_pad($func($key), 64, chr(0));
+		return $func((str_repeat(chr(0x5C), 64) ^ substr($key, 0, 64)).pack($pack, $func((str_repeat(chr(0x36), 64) ^ substr($key, 0, 64)).$data)));
 	}
 
 	/**
@@ -322,7 +322,7 @@ 
 	 */
 	private function strlen($string)
 	{
-		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
+		return $this->_mbstring ? mb_strlen($string, '8bit') : strlen($string);
 	}
 
 	/**
@@ -333,9 +333,9 @@ 
 	 * @param int $length the desired portion length
 	 * @return string the extracted part of string, or FALSE on failure or an empty string.
 	 */
-	private function substr($string,$start,$length)
+	private function substr($string, $start, $length)
 	{
-		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
+		return $this->_mbstring ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
 	}
 }
 
@@ -357,6 +357,6 @@ 
  */
 class TSecurityManagerValidationMode extends TEnumerable
 {
-	const MD5 = 'MD5';
-	const SHA1 = 'SHA1';
+	const MD5='MD5';
+	const SHA1='SHA1';
 }

framework/Security/TUser.php

Doc Comments +4 added lines

@@ -73,6 +73,7 @@ 
 
 	/**
 	 * @param string username
+	 * @param string $value
 	 */
 	public function setName($value)
 	{
@@ -89,6 +90,7 @@ 
 
 	/**
 	 * @param boolean if the user is a guest
+	 * @param boolean $value
 	 */
 	public function setIsGuest($value)
 	{
@@ -170,6 +172,7 @@ 
 	 *
 	 * @param string variable name
 	 * @param mixed default value
+	 * @param string $key
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
@@ -190,6 +193,7 @@ 
 	 * @param string variable name
 	 * @param mixed variable value
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
+	 * @param string $key
 	 * @see getState
 	 */
 	protected function setState($key,$value,$defaultValue=null)

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getState('Name','');
+		return $this->getState('Name', '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->setState('Name',$value,'');
+		$this->setState('Name', $value, '');
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function getIsGuest()
 	{
-		return $this->getState('IsGuest',true);
+		return $this->getState('IsGuest', true);
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles(array());
 		}
-		$this->setState('IsGuest',$isGuest);
+		$this->setState('IsGuest', $isGuest);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getRoles()
 	{
-		return $this->getState('Roles',array());
+		return $this->getState('Roles', array());
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
 	public function setRoles($value)
 	{
 		if(is_array($value))
-			$this->setState('Roles',$value,array());
+			$this->setState('Roles', $value, array());
 		else
 		{
 			$roles=array();
-			foreach(explode(',',$value) as $role)
+			foreach(explode(',', $value) as $role)
 			{
 				if(($role=trim($role))!=='')
 					$roles[]=$role;
 			}
-			$this->setState('Roles',$roles,array());
+			$this->setState('Roles', $roles, array());
 		}
 	}
 
@@ -134,7 +134,7 @@ 
 	public function isInRole($role)
 	{
 		foreach($this->getRoles() as $r)
-			if(strcasecmp($role,$r)===0)
+			if(strcasecmp($role, $r)===0)
 				return true;
 		return false;
 	}
@@ -173,9 +173,9 @@ 
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
-	protected function getState($key,$defaultValue=null)
+	protected function getState($key, $defaultValue=null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
 	 * @see getState
 	 */
-	protected function setState($key,$value,$defaultValue=null)
+	protected function setState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_state[$key]);