pradosoft / prado

framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php

Doc Comments +1 added lines

@@ -54,6 +54,7 @@
 	 * @param string parent node id
 	 * @param string new node id
 	 * @param mixed node value
+	 * @param string $node
 	 */
 	public function add($parent, $node, $object = '')
 	{

Spacing +38 added lines, -38 removed lines

@@ -31,22 +31,22 @@ 
 	/**
 	 * @var array object graph as tree
 	 */
-	private $_tree = [];
+	private $_tree=[];
 	/**
 	 * @var array tree node values
 	 */
-	private $_entries = [];
+	private $_entries=[];
 	/**
 	 * @var array resulting object collection
 	 */
-	private $_list = [];
+	private $_list=[];
 
 	/**
 	 * @return boolean true if the graph is empty
 	 */
 	public function isEmpty()
 	{
-		return count($this->_entries) == 0;
+		return count($this->_entries)==0;
 	}
 
 	/**
@@ -55,27 +55,27 @@ 
 	 * @param string new node id
 	 * @param mixed node value
 	 */
-	public function add($parent, $node, $object = '')
+	public function add($parent, $node, $object='')
 	{
-		if(isset($this->_entries[$parent]) && ($this->_entries[$parent] !== null)
-			&& isset($this->_entries[$node]) && ($this->_entries[$node] !== null))
+		if(isset($this->_entries[$parent]) && ($this->_entries[$parent]!==null)
+			&& isset($this->_entries[$node]) && ($this->_entries[$node]!==null))
 		{
-			$this->_entries[$node] = $object;
+			$this->_entries[$node]=$object;
 			return;
 		}
-		$this->_entries[$node] = $object;
+		$this->_entries[$node]=$object;
 		if(empty($parent))
 		{
 			if(isset($this->_entries[$node]))
 				return;
-			$this->_tree[$node] = [];
+			$this->_tree[$node]=[];
 		}
-		$found = $this->addNode($this->_tree, $parent, $node);
+		$found=$this->addNode($this->_tree, $parent, $node);
 		if(!$found && !empty($parent))
 		{
-			$this->_tree[$parent] = [];
-			if(!isset($this->_entries[$parent]) || $object !== '')
-				$this->_entries[$parent] = $object;
+			$this->_tree[$parent]=[];
+			if(!isset($this->_entries[$parent]) || $object!=='')
+				$this->_entries[$parent]=$object;
 			$this->addNode($this->_tree, $parent, $node);
 		}
 	}
@@ -89,20 +89,20 @@ 
 	 */
 	protected function addNode(&$childs, $parent, $node)
 	{
-		$found = false;
+		$found=false;
 		reset($childs);
-		for($i = 0, $k = count($childs); $i < $k; $i++)
+		for($i=0, $k=count($childs); $i < $k; $i++)
 		{
-			$key = key($childs);
+			$key=key($childs);
 			next($childs);
-			if($key == $parent)
+			if($key==$parent)
 			{
-				$found = true;
-				$childs[$key][$node] = [];
+				$found=true;
+				$childs[$key][$node]=[];
 			}
 			else
 			{
-				$found = $found || $this->addNode($childs[$key], $parent, $node);
+				$found=$found || $this->addNode($childs[$key], $parent, $node);
 			}
 		}
 		return $found;
@@ -124,9 +124,9 @@ 
 	 */
 	protected function hasChildren(&$nodes)
 	{
-		$hasChildren = false;
+		$hasChildren=false;
 		foreach($nodes as $node)
-			if(count($node) != 0)
+			if(count($node)!=0)
 				return true;
 		return $hasChildren;
 	}
@@ -138,14 +138,14 @@ 
 	 */
 	protected function collectChildren($parent, &$nodes)
 	{
-		$noChildren = !$this->hasChildren($nodes);
-		$childs = [];
-		for(reset($nodes); $key = key($nodes);)
+		$noChildren=!$this->hasChildren($nodes);
+		$childs=[];
+		for(reset($nodes); $key=key($nodes);)
 		{
 			next($nodes);
 			if($noChildren)
 			{
-				$childs[] = $key;
+				$childs[]=$key;
 				unset($nodes[$key]);
 			}
 			else
@@ -165,17 +165,17 @@ 
 		if(empty($parent) || empty($this->_entries[$parent]))
 			return;
 
-		$parentObject = $this->_entries[$parent]['object'];
-		$property = $this->_entries[$nodes[0]]['property'];
+		$parentObject=$this->_entries[$parent]['object'];
+		$property=$this->_entries[$nodes[0]]['property'];
 
-		$list = TPropertyAccess::get($parentObject, $property);
+		$list=TPropertyAccess::get($parentObject, $property);
 
 		foreach($nodes as $node)
 		{
 			if($list instanceof TList)
-				$parentObject->{$property}[] = $this->_entries[$node]['object'];
+				$parentObject->{$property}[]=$this->_entries[$node]['object'];
 			elseif(is_array($list))
-				$list[] = $this->_entries[$node]['object'];
+				$list[]=$this->_entries[$node]['object'];
 			else
 				throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
@@ -184,8 +184,8 @@ 
 		if(is_array($list))
 			TPropertyAccess::set($parentObject, $property, $list);
 
-		if($this->_entries[$parent]['property'] === null)
-			$this->_list[] = $parentObject;
+		if($this->_entries[$parent]['property']===null)
+			$this->_list[]=$parentObject;
 	}
 
 	/**
@@ -198,10 +198,10 @@ 
 
 	public function __sleep()
 	{
-		$exprops = []; $cn = __CLASS__;
-		if (!count($this->_tree)) $exprops[] = "\0$cn\0_tree";
-		if (!count($this->_entries)) $exprops[] = "\0$cn\0_entries";
-		if (!count($this->_list)) $exprops[] = "\0$cn\0_list";
+		$exprops=[]; $cn=__CLASS__;
+		if(!count($this->_tree)) $exprops[]="\0$cn\0_tree";
+		if(!count($this->_entries)) $exprops[]="\0$cn\0_entries";
+		if(!count($this->_list)) $exprops[]="\0$cn\0_list";
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/TSqlMapGateway.php

Doc Comments +5 added lines, -2 removed lines

@@ -36,6 +36,9 @@ 
 	 */
 	private $_manager;
 
+	/**
+	 * @param TSqlMapManager $manager
+	 */
 	public function __construct($manager)
 	{
 		$this->_manager = $manager;
@@ -125,7 +128,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.
-	 * @return TPagedList A PaginatedList of beans containing the rows.
+	 * @return TSqlMapPagedList A PaginatedList of beans containing the rows.
 	 */
 	public function queryForPagedList($statementName, $parameter = null, $pageSize = 10, $page = 0)
 	{
@@ -146,7 +149,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.
-	 * @return TPagedList A PaginatedList of beans containing the rows.
+	 * @return TSqlMapPagedList A PaginatedList of beans containing the rows.
 	 */
 	public function queryForPagedListWithRowDelegate($statementName, $delegate, $parameter = null, $pageSize = 10, $page = 0)
 	{

Spacing +20 added lines, -20 removed lines

@@ -38,7 +38,7 @@ 
 
 	public function __construct($manager)
 	{
-		$this->_manager = $manager;
+		$this->_manager=$manager;
 	}
 
 	/**
@@ -69,9 +69,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
 	}
 
@@ -90,9 +90,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
 	}
 
@@ -111,9 +111,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
 	}
 
@@ -127,9 +127,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, null, $page);
 	}
 
@@ -148,9 +148,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
 	}
 
@@ -167,9 +167,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
 	}
 
@@ -186,9 +186,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
 	}
 
@@ -208,9 +208,9 @@ 
 	 * 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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
 	}
 
@@ -227,9 +227,9 @@ 
 	 * @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);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
 	}
 
@@ -239,7 +239,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 +3 added lines

@@ -61,6 +61,7 @@ 
 	 * Constructor, create a new SqlMap manager.
 	 * @param TDbConnection database connection
 	 * @param string configuration file.
+	 * @param \Prado\Data\TDbConnection $connection
 	 */
 	public function __construct($connection = null)
 	{
@@ -74,6 +75,7 @@ 
 
 	/**
 	 * @param TDbConnection default database connection
+	 * @param \Prado\Data\TDbConnection $conn
 	 */
 	public function setDbConnection($conn)
 	{
@@ -111,6 +113,7 @@ 
 	/**
 	 * Loads and parses the SqlMap configuration file.
 	 * @param string xml configuration file.
+	 * @param string $file
 	 */
 	public function configureXml($file)
 	{

Spacing +23 added lines, -23 removed lines

@@ -62,14 +62,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;
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 */
 	public function setDbConnection($conn)
 	{
-		$this->_connection = $conn;
+		$this->_connection=$conn;
 	}
 
 	/**
@@ -93,8 +93,8 @@ 
 	 */
 	public function getTypeHandlers()
 	{
-		if($this->_typeHandlers === null)
-			$this->_typeHandlers = new TSqlMapTypeHandlerRegistry();
+		if($this->_typeHandlers===null)
+			$this->_typeHandlers=new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
 
@@ -103,8 +103,8 @@ 
 	 */
 	public function getSqlmapGateway()
 	{
-		if($this->_gateway === null)
-			$this->_gateway = $this->createSqlMapGateway();
+		if($this->_gateway===null)
+			$this->_gateway=$this->createSqlMapGateway();
 		return $this->_gateway;
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	public function configureXml($file)
 	{
-		$config = new TSqlMapXmlConfiguration($this);
+		$config=new TSqlMapXmlConfiguration($this);
 		$config->configure($file);
 	}
 
@@ -124,8 +124,8 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
-			$this->_cacheDependencies = new TChainedCacheDependency();
+		if($this->_cacheDependencies===null)
+			$this->_cacheDependencies=new TChainedCacheDependency();
 
 		return $this->_cacheDependencies;
 	}
@@ -156,7 +156,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];
 	}
@@ -169,8 +169,8 @@ 
 	 */
 	public function addMappedStatement(IMappedStatement $statement)
 	{
-		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		$key=$statement->getID();
+		if($this->_mappedStatements->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
 		$this->_mappedStatements->add($key, $statement);
 	}
@@ -191,7 +191,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];
 	}
@@ -202,8 +202,8 @@ 
 	 */
 	public function addResultMap(TResultMap $result)
 	{
-		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		$key=$result->getID();
+		if($this->_resultMaps->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
 		$this->_resultMaps->add($key, $result);
 	}
@@ -223,7 +223,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];
 	}
@@ -234,8 +234,8 @@ 
 	 */
 	public function addParameterMap(TParameterMap $parameter)
 	{
-		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		$key=$parameter->getID();
+		if($this->_parameterMaps->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}

framework/Data/TDbCommand.php

Doc Comments +2 added lines, -1 removed lines

@@ -165,6 +165,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)
@@ -268,7 +269,7 @@ 
 	 * Executes the SQL statement and returns the value of the first column in the first row of data.
 	 * This is a convenient method of {@link query} when only a single scalar
 	 * value is needed (e.g. obtaining the count of the records).
-	 * @return mixed the value of the first column in the first row of the query result. False is returned if there is no value.
+	 * @return string the value of the first column in the first row of the query result. False is returned if there is no value.
 	 * @throws TDbException execution failed
 	 */
 	public function queryScalar()

Spacing +21 added lines, -21 removed lines

@@ -45,7 +45,7 @@ 
 class TDbCommand extends \Prado\TComponent
 {
 	private $_connection;
-	private $_text = '';
+	private $_text='';
 	private $_statement;
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function __construct(TDbConnection $connection, $text)
 	{
-		$this->_connection = $connection;
+		$this->_connection=$connection;
 		$this->setText($text);
 	}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->_text = $value;
+		$this->_text=$value;
 		$this->cancel();
 	}
 
@@ -112,11 +112,11 @@ 
 	 */
 	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)
 			{
@@ -130,7 +130,7 @@ 
 	 */
 	public function cancel()
 	{
-		$this->_statement = null;
+		$this->_statement=null;
 	}
 
 	/**
@@ -146,12 +146,12 @@ 
 	 * @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)
+		if($dataType===null)
 			$this->_statement->bindParam($name, $value);
-		elseif($length === null)
+		elseif($length===null)
 			$this->_statement->bindParam($name, $value, $dataType);
 		else
 			$this->_statement->bindParam($name, $value, $dataType, $length);
@@ -167,10 +167,10 @@ 
 	 * @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)
+		if($dataType===null)
 			$this->_statement->bindValue($name, $value);
 		else
 			$this->_statement->bindValue($name, $value, $dataType);
@@ -228,7 +228,7 @@ 
 			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)
@@ -245,7 +245,7 @@ 
 	 * @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
 		{
@@ -253,8 +253,8 @@ 
 			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;
 		}
@@ -279,10 +279,10 @@ 
 			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;
@@ -303,10 +303,10 @@ 
 	 */
 	public function queryColumn()
 	{
-		$rows = $this->query()->readAll();
-		$column = [];
+		$rows=$this->query()->readAll();
+		$column=[];
 		foreach($rows as $row)
-			$column[] = current($row);
+			$column[]=current($row);
 		return $column;
 	}
 }

Braces +6 added lines, -12 removed lines

@@ -117,8 +117,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());
 			}
@@ -193,11 +192,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());
 		}
@@ -230,8 +227,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());
 		}
@@ -257,8 +253,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());
 		}
@@ -286,8 +281,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());
 		}

framework/Exceptions/TErrorHandler.php

Doc Comments +11 added lines

@@ -118,6 +118,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|\Prado\TApplication $sender
 	 */
 	public function handleError($sender, $param)
 	{
@@ -187,6 +188,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)
 	{
@@ -383,6 +385,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getExactTraceAsString($exception)
 	{
 		if($exception instanceof TPhpFatalErrorException &&
@@ -410,6 +415,9 @@ 
 		return $exception->getTraceAsString();
 	}
 
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result = null;
@@ -442,6 +450,9 @@ 
 		return $source;
 	}
 
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message) {
 		if (null !== ($class = $this->getErrorClassNameSpace($message))) {
 			return str_replace($class['name'], '<a href="' . $class['url'] . '" target="_blank">' . $class['name'] . '</a>', $message);

Spacing +98 added lines, -98 removed lines

@@ -57,19 +57,19 @@ 
 	/**
 	 * error template file basename
 	 */
-	const ERROR_FILE_NAME = 'error';
+	const ERROR_FILE_NAME='error';
 	/**
 	 * exception template file basename
 	 */
-	const EXCEPTION_FILE_NAME = 'exception';
+	const EXCEPTION_FILE_NAME='exception';
 	/**
 	 * number of lines before and after the error line to be displayed in case of an exception
 	 */
-	const SOURCE_LINES = 12;
+	const SOURCE_LINES=12;
 	/**
 	 * number of prado internal function calls to be dropped from stack traces on fatal errors
 	 */
-	const FATAL_ERROR_TRACE_DROP_LINES = 5;
+	const FATAL_ERROR_TRACE_DROP_LINES=5;
 
 	/**
 	 * @var string error template directory
@@ -91,8 +91,8 @@ 
 	 */
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath === null)
-			$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
+		if($this->_templatePath===null)
+			$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
 		return $this->_templatePath;
 	}
 
@@ -104,8 +104,8 @@ 
 	 */
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
-			$this->_templatePath = $templatePath;
+		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
+			$this->_templatePath=$templatePath;
 		else
 			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
@@ -121,7 +121,7 @@ 
 	 */
 	public function handleError($sender, $param)
 	{
-		static $handling = false;
+		static $handling=false;
 		// We need to restore error and exception handlers,
 		// because within error and exception handlers, new errors and exceptions
 		// cannot be handled properly by PHP
@@ -132,14 +132,14 @@ 
 			$this->handleRecursiveError($param);
 		else
 		{
-			$handling = true;
-			if(($response = $this->getResponse()) !== null)
+			$handling=true;
+			if(($response=$this->getResponse())!==null)
 				$response->clear();
 			if(!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
 			if($param instanceof THttpException)
 				$this->handleExternalError($param->getStatusCode(), $param);
-			elseif($this->getApplication()->getMode() === TApplicationMode::Debug)
+			elseif($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->displayException($param);
 			else
 				$this->handleExternalError(500, $param);
@@ -153,30 +153,30 @@ 
 	 * @return string
 	 * @since 3.1.6
 	 */
-	protected static function hideSecurityRelated($value, $exception = null)
+	protected static function hideSecurityRelated($value, $exception=null)
 	{
-		$aRpl = [];
-		if($exception !== null && $exception instanceof \Exception)
+		$aRpl=[];
+		if($exception!==null && $exception instanceof \Exception)
 		{
 			if($exception instanceof TPhpFatalErrorException &&
 				function_exists('xdebug_get_function_stack'))
 			{
-				$aTrace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
+				$aTrace=array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
 			} else {
-				$aTrace = $exception->getTrace();
+				$aTrace=$exception->getTrace();
 			}
 
 			foreach($aTrace as $item)
 			{
 				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+					$aRpl[dirname($item['file']).DIRECTORY_SEPARATOR]='<hidden>'.DIRECTORY_SEPARATOR;
 			}
 		}
-		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
-		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
-		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
+		$aRpl[$_SERVER['DOCUMENT_ROOT']]='${DocumentRoot}';
+		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])]='${DocumentRoot}';
+		$aRpl[PRADO_DIR.DIRECTORY_SEPARATOR]='${PradoFramework}'.DIRECTORY_SEPARATOR;
 		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
-		$aRpl = array_reverse($aRpl, true);
+		$aRpl=array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
@@ -193,21 +193,21 @@ 
 		if(!($exception instanceof THttpException))
 			error_log($exception->__toString());
 
-		$content = $this->getErrorTemplate($statusCode, $exception);
+		$content=$this->getErrorTemplate($statusCode, $exception);
 
-		$serverAdmin = isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
+		$serverAdmin=isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
 
-		$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
+		$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
 
-		$errorMessage = $exception->getMessage();
+		$errorMessage=$exception->getMessage();
 		if($isDebug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 		{
-			$version = '';
-			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
+			$version='';
+			$errorMessage=self::hideSecurityRelated($errorMessage, $exception);
 		}
-		$tokens = [
+		$tokens=[
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
@@ -229,16 +229,16 @@ 
 	 */
 	protected function handleRecursiveError($exception)
 	{
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
+		if($this->getApplication()->getMode()===TApplicationMode::Debug)
 		{
 			echo "<html><head><title>Recursive Error</title></head>\n";
 			echo "<body><h1>Recursive Error</h1>\n";
-			echo "<pre>" . $exception->__toString() . "</pre>\n";
+			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
 		}
 		else
 		{
-			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
+			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
 		}
 	}
@@ -252,53 +252,53 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if(php_sapi_name() === 'cli')
+		if(php_sapi_name()==='cli')
 		{
-			echo $exception->getMessage() . "\n";
+			echo $exception->getMessage()."\n";
 			echo $this->getExactTraceAsString($exception);
 			return;
 		}
 
 		if($exception instanceof TTemplateException)
 		{
-			$fileName = $exception->getTemplateFile();
-			$lines = empty($fileName)?explode("\n", $exception->getTemplateSource()):@file($fileName);
-			$source = $this->getSourceCode($lines, $exception->getLineNumber());
-			if($fileName === '')
-				$fileName = '---embedded template---';
-			$errorLine = $exception->getLineNumber();
+			$fileName=$exception->getTemplateFile();
+			$lines=empty($fileName) ?explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source=$this->getSourceCode($lines, $exception->getLineNumber());
+			if($fileName==='')
+				$fileName='---embedded template---';
+			$errorLine=$exception->getLineNumber();
 		}
 		else
 		{
-			if(($trace = $this->getExactTrace($exception)) !== null)
+			if(($trace=$this->getExactTrace($exception))!==null)
 			{
-				$fileName = $trace['file'];
-				$errorLine = $trace['line'];
+				$fileName=$trace['file'];
+				$errorLine=$trace['line'];
 			}
 			else
 			{
-				$fileName = $exception->getFile();
-				$errorLine = $exception->getLine();
+				$fileName=$exception->getFile();
+				$errorLine=$exception->getLine();
 			}
-			$source = $this->getSourceCode(@file($fileName), $errorLine);
+			$source=$this->getSourceCode(@file($fileName), $errorLine);
 		}
 
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+		if($this->getApplication()->getMode()===TApplicationMode::Debug)
+			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
-			$version = '';
+			$version='';
 
-		$tokens = [
+		$tokens=[
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
-			'%%SourceFile%%' => htmlspecialchars($fileName) . ' (' . $errorLine . ')',
+			'%%SourceFile%%' => htmlspecialchars($fileName).' ('.$errorLine.')',
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($this->getExactTraceAsString($exception)),
 			'%%Version%%' => $version,
 			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		];
 
-		$content = $this->getExceptionTemplate($exception);
+		$content=$this->getExceptionTemplate($exception);
 
 		echo strtr($content, $tokens);
 	}
@@ -312,11 +312,11 @@ 
 	 */
 	protected function getExceptionTemplate($exception)
 	{
-		$lang = Prado::getPreferredLanguage();
-		$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '-' . $lang . '.html';
+		$lang=Prado::getPreferredLanguage();
+		$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html';
 		if(!is_file($exceptionFile))
-			$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
-		if(($content = @file_get_contents($exceptionFile)) === false)
+			$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
+		if(($content=@file_get_contents($exceptionFile))===false)
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
@@ -339,45 +339,45 @@ 
 	 */
 	protected function getErrorTemplate($statusCode, $exception)
 	{
-		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
-		$lang = Prado::getPreferredLanguage();
+		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
+		$lang=Prado::getPreferredLanguage();
 		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile = "$base$statusCode-$lang.html";
+			$errorFile="$base$statusCode-$lang.html";
 		elseif(is_file("$base$statusCode.html"))
-			$errorFile = "$base$statusCode.html";
+			$errorFile="$base$statusCode.html";
 		elseif(is_file("$base-$lang.html"))
-			$errorFile = "$base-$lang.html";
+			$errorFile="$base-$lang.html";
 		else
-			$errorFile = "$base.html";
-		if(($content = @file_get_contents($errorFile)) === false)
+			$errorFile="$base.html";
+		if(($content=@file_get_contents($errorFile))===false)
 			die("Unable to open error template file '$errorFile'.");
 		return $content;
 	}
 
 	private function getExactTrace($exception)
 	{
-		$result = null;
+		$result=null;
 		if($exception instanceof TPhpFatalErrorException &&
 			function_exists('xdebug_get_function_stack'))
 		{
-			$trace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
+			$trace=array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
 		} else {
-			$trace = $exception->getTrace();
+			$trace=$exception->getTrace();
 		}
 		
 		// if PHP exception, we want to show the 2nd stack level context
 		// because the 1st stack level is of little use (it's in error handler)
 		if($exception instanceof TPhpErrorException) {
 			if(isset($trace[0]['file']))
-				$result = $trace[0];
+				$result=$trace[0];
 			elseif(isset($trace[1]))
-				$result = $trace[1];
+				$result=$trace[1];
 		} elseif($exception instanceof TInvalidOperationException) {
 			// in case of getter or setter error, find out the exact file and row
-			if(($result = $this->getPropertyAccessTrace($trace, '__get')) === null)
-				$result = $this->getPropertyAccessTrace($trace, '__set');
+			if(($result=$this->getPropertyAccessTrace($trace, '__get'))===null)
+				$result=$this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result !== null && strpos($result['file'], ': eval()\'d code') !== false)
+		if($result!==null && strpos($result['file'], ': eval()\'d code')!==false)
 			return null;
 
 		return $result;
@@ -388,19 +388,19 @@ 
 		if($exception instanceof TPhpFatalErrorException &&
 			function_exists('xdebug_get_function_stack'))
 		{
-			$trace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
-			$txt = '';
-			$row = 0;
+			$trace=array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
+			$txt='';
+			$row=0;
 
 			// try to mimic Exception::getTraceAsString()
 			foreach($trace as $line)
 			{
 				if(array_key_exists('function', $line))
-					$func = $line['function'] . '(' . implode(',', $line['params']) . ')';
+					$func=$line['function'].'('.implode(',', $line['params']).')';
 				else
-					$func = 'unknown';
+					$func='unknown';
 
-				$txt .= '#' . $row . ' ' . $line['file'] . '(' . $line['line'] . '): ' . $func . "\n";
+				$txt.='#'.$row.' '.$line['file'].'('.$line['line'].'): '.$func."\n";
 				$row++;
 			}
 
@@ -412,11 +412,11 @@ 
 
 	private function getPropertyAccessTrace($trace, $pattern)
 	{
-		$result = null;
+		$result=null;
 		foreach($trace as $t)
 		{
-			if(isset($t['function']) && $t['function'] === $pattern)
-				$result = $t;
+			if(isset($t['function']) && $t['function']===$pattern)
+				$result=$t;
 			else
 				break;
 		}
@@ -425,44 +425,44 @@ 
 
 	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine = $errorLine - self::SOURCE_LINES >= 0?$errorLine - self::SOURCE_LINES:0;
-		$endLine = $errorLine + self::SOURCE_LINES <= count($lines)?$errorLine + self::SOURCE_LINES:count($lines);
+		$beginLine=$errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine=$errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 
-		$source = '';
-		for($i = $beginLine;$i < $endLine;++$i)
+		$source='';
+		for($i=$beginLine; $i < $endLine; ++$i)
 		{
-			if($i === $errorLine - 1)
+			if($i===$errorLine - 1)
 			{
-				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
-				$source .= "<div class=\"error\">" . $line . "</div>";
+				$line=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
+				$source.="<div class=\"error\">".$line."</div>";
 			}
 			else
-				$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
+				$source.=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
 
 	private function addLink($message) {
-		if (null !== ($class = $this->getErrorClassNameSpace($message))) {
-			return str_replace($class['name'], '<a href="' . $class['url'] . '" target="_blank">' . $class['name'] . '</a>', $message);
+		if(null!==($class=$this->getErrorClassNameSpace($message))) {
+			return str_replace($class['name'], '<a href="'.$class['url'].'" target="_blank">'.$class['name'].'</a>', $message);
 		}
 		return $message;
 	}
 
 	private function getErrorClassNameSpace($message) {
-		$matches = [];
+		$matches=[];
 		preg_match('/\b(T[A-Z]\w+)\b/', $message, $matches);
-		if (is_array($matches) && count($matches) > 0) {
-			$class = $matches[0];
+		if(is_array($matches) && count($matches) > 0) {
+			$class=$matches[0];
 			try {
-				$function = new \ReflectionClass($class);
+				$function=new \ReflectionClass($class);
 			}
-			catch (\Exception $e) {
+			catch(\Exception $e) {
 				return null;
 			}
-			$classname = $function->getNamespaceName();
+			$classname=$function->getNamespaceName();
 			return [
-				'url' => 'http://pradosoft.github.io/docs/manual/class-' . str_replace('\\', '.', (string) $classname) . '.' . $class . '.html',
+				'url' => 'http://pradosoft.github.io/docs/manual/class-'.str_replace('\\', '.', (string) $classname).'.'.$class.'.html',
 				'name' => $class,
 			];
 		}

Braces +5 added lines, -10 removed lines

@@ -235,8 +235,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');
@@ -267,15 +266,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();
@@ -435,8 +432,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;
@@ -456,8 +452,7 @@ 
 			$class = $matches[0];
 			try {
 				$function = new \ReflectionClass($class);
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				return null;
 			}
 			$classname = $function->getNamespaceName();

framework/I18N/core/DateFormat.php

Doc Comments +4 added lines

@@ -90,6 +90,7 @@ 
 	 * Initialize a new DateFormat.
 	 * @param mixed either, null, a CultureInfo instance,
 	 * a DateTimeFormatInfo instance, or a locale.
+	 * @param string $formatInfo
 	 * @return DateFormat instance
 	 */
 	public function __construct($formatInfo = null)
@@ -109,6 +110,7 @@ 
 	/**
 	 * Format a date according to the pattern.
 	 * @param mixed the time as integer or string in strtotime format.
+	 * @param string $time
 	 * @return string formatted date time.
 	 */
 	public function format($time, $pattern = 'F', $charset = 'UTF-8')
@@ -181,6 +183,7 @@ 
 	 * DateTimeFormatInfo::formatDateTime
 	 * See the tutorial documentation for futher details on the patterns.
 	 * @param mixed a pattern.
+	 * @param string $pattern
 	 * @return string a pattern.
 	 * @see DateTimeFormatInfo::formatDateTime()
 	 */
@@ -271,6 +274,7 @@ 
 	 * Any substrings, starting and ending with a single quote (')
 	 * will be treated as a single token.
 	 * @param string pattern.
+	 * @param string $pattern
 	 * @return array string tokens in an array.
 	 */
 	protected function getTokens($pattern)

Spacing +84 added lines, -84 removed lines

@@ -23,12 +23,12 @@ 
 use Exception;
 use Prado\Prado;
 
-require_once(dirname(__FILE__) . '/DateTimeFormatInfo.php');
+require_once(dirname(__FILE__).'/DateTimeFormatInfo.php');
 
 /**
  * Get the encoding utilities
  */
-require_once(dirname(__FILE__) . '/util.php');
+require_once(dirname(__FILE__).'/util.php');
 
 /**
  * DateFormat class.
@@ -54,7 +54,7 @@ 
 	 * A list of tokens and their function call.
 	 * @var array
 	 */
-	protected $tokens = [
+	protected $tokens=[
 			'G' => 'Era',
 			'y' => 'Year',
 			'M' => 'Month',
@@ -78,7 +78,7 @@ 
 	 * A list of methods, to be used by the token function calls.
 	 * @var array
 	 */
-	protected $methods = [];
+	protected $methods=[];
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
@@ -92,18 +92,18 @@ 
 	 * a DateTimeFormatInfo instance, or a locale.
 	 * @return DateFormat instance
 	 */
-	public function __construct($formatInfo = null)
+	public function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=DateTimeFormatInfo::getInvariantInfo();
 		elseif($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->DateTimeFormat;
+			$this->formatInfo=$formatInfo->DateTimeFormat;
 		elseif($formatInfo instanceof DateTimeFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
+			$this->formatInfo=DateTimeFormatInfo::getInstance($formatInfo);
 
-		$this->methods = get_class_methods($this);
+		$this->methods=get_class_methods($this);
 	}
 
 	/**
@@ -111,50 +111,50 @@ 
 	 * @param mixed the time as integer or string in strtotime format.
 	 * @return string formatted date time.
 	 */
-	public function format($time, $pattern = 'F', $charset = 'UTF-8')
+	public function format($time, $pattern='F', $charset='UTF-8')
 	{
-		if (is_numeric($time)) //assumes unix epoch
-			$time = floatval($time);
+		if(is_numeric($time)) //assumes unix epoch
+			$time=floatval($time);
 		elseif(is_string($time))
-			$time = @strtotime($time);
+			$time=@strtotime($time);
 
-		if($pattern === null)
-			$pattern = 'F';
+		if($pattern===null)
+			$pattern='F';
 
-		$date = new \DateTime;
+		$date=new \DateTime;
 		$date->setTimestamp($time);
 
-		$pattern = $this->getPattern($pattern);
+		$pattern=$this->getPattern($pattern);
 
-		$tokens = $this->getTokens($pattern);
+		$tokens=$this->getTokens($pattern);
 
-		for($i = 0, $k = count($tokens); $i < $k; ++$i)
+		for($i=0, $k=count($tokens); $i < $k; ++$i)
 		{
-			$pattern = $tokens[$i];
-			if($pattern{0} == "'"
-				&& $pattern{strlen($pattern) - 1} == "'")
+			$pattern=$tokens[$i];
+			if($pattern{0}=="'"
+				&& $pattern{strlen($pattern) - 1}=="'")
 			{
-				$sub = preg_replace('/(^\')|(\'$)/', '', $pattern);
-				$tokens[$i] = str_replace('``````', '\'', $sub);
+				$sub=preg_replace('/(^\')|(\'$)/', '', $pattern);
+				$tokens[$i]=str_replace('``````', '\'', $sub);
 			}
-			elseif($pattern == '``````')
+			elseif($pattern=='``````')
 			{
-				$tokens[$i] = '\'';
+				$tokens[$i]='\'';
 			}
 			else
 			{
-				$function = $this->getFunctionName($pattern);
-				if($function != null)
+				$function=$this->getFunctionName($pattern);
+				if($function!=null)
 				{
-					$fName = 'get' . $function;
+					$fName='get'.$function;
 					if(in_array($fName, $this->methods))
 					{
-						$rs = $this->$fName($date, $pattern);
-						$tokens[$i] = $rs;
+						$rs=$this->$fName($date, $pattern);
+						$tokens[$i]=$rs;
 					}
 					else
 						throw new
-						Exception('function ' . $function . ' not found.');
+						Exception('function '.$function.' not found.');
 				}
 			}
 		}
@@ -186,7 +186,7 @@ 
 	 */
 	protected function getPattern($pattern)
 	{
-		if(is_array($pattern) && count($pattern) == 2)
+		if(is_array($pattern) && count($pattern)==2)
 		{
 			return $this->formatInfo->formatDateTime(
 							$this->getPattern($pattern[0]),
@@ -275,36 +275,36 @@ 
 	 */
 	protected function getTokens($pattern)
 	{
-		$char = null;
-		$tokens = [];
-		$token = null;
+		$char=null;
+		$tokens=[];
+		$token=null;
 
-		$text = false;
-		$pattern = preg_replace("/''/", '``````', $pattern);
+		$text=false;
+		$pattern=preg_replace("/''/", '``````', $pattern);
 
-		for($i = 0; $i < strlen($pattern); $i++)
+		for($i=0; $i < strlen($pattern); $i++)
 		{
-			if($char == null || $pattern{$i} == $char || $text)
+			if($char==null || $pattern{$i}==$char || $text)
 			{
-				$token .= $pattern{$i};
+				$token.=$pattern{$i};
 			}
 			else
 			{
-				$tokens[] = str_replace("", "'", $token);
-				$token = $pattern{$i};
+				$tokens[]=str_replace("", "'", $token);
+				$token=$pattern{$i};
 			}
 
-			if($pattern{$i} == "'" && $text == false)
-				$text = true;
-			elseif($text && $pattern{$i} == "'" && $char == "'")
-				$text = true;
-			elseif($text && $char != "'" && $pattern{$i} == "'")
-				$text = false;
+			if($pattern{$i}=="'" && $text==false)
+				$text=true;
+			elseif($text && $pattern{$i}=="'" && $char=="'")
+				$text=true;
+			elseif($text && $char!="'" && $pattern{$i}=="'")
+				$text=false;
 
-			$char = $pattern{$i};
+			$char=$pattern{$i};
 
 		}
-		$tokens[] = $token;
+		$tokens[]=$token;
 		return $tokens;
 	}
 
@@ -316,7 +316,7 @@ 
 	 * @param string a pattern.
 	 * @return string year
 	 */
-	protected function getYear($date, $pattern = 'yyyy')
+	protected function getYear($date, $pattern='yyyy')
 	{
 		switch($pattern)
 		{
@@ -339,7 +339,7 @@ 
 	 * @param string a pattern.
 	 * @return string month name
 	 */
-	protected function getMonth($date, $pattern = 'M')
+	protected function getMonth($date, $pattern='M')
 	{
 		switch($pattern)
 		{
@@ -366,9 +366,9 @@ 
 	 * @param string a pattern.
 	 * @return string day of the week.
 	 */
-	protected function getDayInWeek($date, $pattern = 'EEEE')
+	protected function getDayInWeek($date, $pattern='EEEE')
 	{
-		$day = $date->format('w');
+		$day=$date->format('w');
 		switch($pattern)
 		{
 			case 'E':
@@ -391,7 +391,7 @@ 
 	 * @param string a pattern.
 	 * @return string day of the month
 	 */
-	protected function getDay($date, $pattern = 'd')
+	protected function getDay($date, $pattern='d')
 	{
 		switch($pattern)
 		{
@@ -412,12 +412,12 @@ 
 	 * @param string a pattern.
 	 * @return string era
 	 */
-	protected function getEra($date, $pattern = 'G')
+	protected function getEra($date, $pattern='G')
 	{
-		if($pattern != 'G')
+		if($pattern!='G')
 			throw new Exception('The pattern for era is "G".');
 
-		$year = $date->format('Y');
+		$year=$date->format('Y');
 		if($year > 0)
 			return $this->formatInfo->getEra(1);
 		else
@@ -431,7 +431,7 @@ 
 	 * @param string a pattern.
 	 * @return string hours in 24 hour format.
 	 */
-	protected function getHour24($date, $pattern = 'H')
+	protected function getHour24($date, $pattern='H')
 	{
 		switch($pattern)
 		{
@@ -450,13 +450,13 @@ 
 	 * @param string a pattern.
 	 * @return string AM or PM designator
 	 */
-	protected function getAMPM($date, $pattern = 'a')
+	protected function getAMPM($date, $pattern='a')
 	{
-		if($pattern != 'a')
+		if($pattern!='a')
 			throw new Exception('The pattern for AM/PM marker is "a".');
 
-		$hour = $date->format('G');
-		$ampm = (int)($hour / 12);
+		$hour=$date->format('G');
+		$ampm=(int) ($hour / 12);
 		return $this->formatInfo->AMPMMarkers[$ampm];
 	}
 
@@ -467,7 +467,7 @@ 
 	 * @param string a pattern.
 	 * @return string hours in 12 hour format.
 	 */
-	protected function getHour12($date, $pattern = 'h')
+	protected function getHour12($date, $pattern='h')
 	{
 		switch($pattern)
 		{
@@ -487,7 +487,7 @@ 
 	 * @param string a pattern.
 	 * @return string minutes.
 	 */
-	protected function getMinutes($date, $pattern = 'm')
+	protected function getMinutes($date, $pattern='m')
 	{
 		switch($pattern)
 		{
@@ -507,7 +507,7 @@ 
 	 * @param string a pattern.
 	 * @return string seconds
 	 */
-	protected function getSeconds($date, $pattern = 's')
+	protected function getSeconds($date, $pattern='s')
 	{
 		switch($pattern)
 		{
@@ -527,9 +527,9 @@ 
 	 * @param string a pattern.
 	 * @return string time zone
 	 */
-	protected function getTimeZone($date, $pattern = 'z')
+	protected function getTimeZone($date, $pattern='z')
 	{
-		if($pattern != 'z')
+		if($pattern!='z')
 			throw new Exception('The pattern for time zone is "z".');
 
 		return $date->format('T');
@@ -541,9 +541,9 @@ 
 	 * @param string a pattern.
 	 * @return int hours in AM/PM format.
 	 */
-	protected function getDayInYear($date, $pattern = 'D')
+	protected function getDayInYear($date, $pattern='D')
 	{
-		if($pattern != 'D')
+		if($pattern!='D')
 			throw new Exception('The pattern for day in year is "D".');
 
 		return $date->format('z');
@@ -555,9 +555,9 @@ 
 	 * @param string a pattern.
 	 * @return int day in month
 	 */
-	protected function getDayInMonth($date, $pattern = 'FF')
+	protected function getDayInMonth($date, $pattern='FF')
 	{
-		switch ($pattern) {
+		switch($pattern) {
 			case 'F':
 				return $date->format('j');
 			case 'FF':
@@ -573,9 +573,9 @@ 
 	 * @param string a pattern.
 	 * @return int week in year
 	 */
-	protected function getWeekInYear($date, $pattern = 'w')
+	protected function getWeekInYear($date, $pattern='w')
 	{
-		if($pattern != 'w')
+		if($pattern!='w')
 			throw new Exception('The pattern for week in year is "w".');
 
 		return $date->format('W');
@@ -586,12 +586,12 @@ 
 	 * @param array getdate format.
 	 * @return int week in month
 	 */
-	protected function getWeekInMonth($date, $pattern = 'W')
+	protected function getWeekInMonth($date, $pattern='W')
 	{
-		if($pattern != 'W')
+		if($pattern!='W')
 			throw new Exception('The pattern for week in month is "W".');
 
-		$firstInMonth = clone($date);
+		$firstInMonth=clone($date);
 		$firstInMonth->setDate($firstInMonth->format('Y'), $firstInMonth->format('m'), 1);
 		return $date->format('W') - $firstInMonth->format('W');
 	}
@@ -602,9 +602,9 @@ 
 	 * @param string a pattern.
 	 * @return int hours [1-24]
 	 */
-	protected function getHourInDay($date, $pattern = 'k')
+	protected function getHourInDay($date, $pattern='k')
 	{
-		if($pattern != 'k')
+		if($pattern!='k')
 			throw new Exception('The pattern for hour in day is "k".');
 
 		return $date->format('G') + 1;
@@ -616,9 +616,9 @@ 
 	 * @param string a pattern.
 	 * @return int hours in AM/PM format.
 	 */
-	protected function getHourInAMPM($date, $pattern = 'K')
+	protected function getHourInAMPM($date, $pattern='K')
 	{
-		if($pattern != 'K')
+		if($pattern!='K')
 			throw new Exception('The pattern for hour in AM/PM is "K".');
 
 		return $date->format('g') + 1;

Braces +4 added lines, -8 removed lines

@@ -136,12 +136,10 @@ 
 			{
 				$sub = preg_replace('/(^\')|(\'$)/', '', $pattern);
 				$tokens[$i] = str_replace('``````', '\'', $sub);
-			}
-			elseif($pattern == '``````')
+			} elseif($pattern == '``````')
 			{
 				$tokens[$i] = '\'';
-			}
-			else
+			} else
 			{
 				$function = $this->getFunctionName($pattern);
 				if($function != null)
@@ -151,8 +149,7 @@ 
 					{
 						$rs = $this->$fName($date, $pattern);
 						$tokens[$i] = $rs;
-					}
-					else
+					} else
 						throw new
 						Exception('function ' . $function . ' not found.');
 				}
@@ -287,8 +284,7 @@ 
 			if($char == null || $pattern{$i} == $char || $text)
 			{
 				$token .= $pattern{$i};
-			}
-			else
+			} else
 			{
 				$tokens[] = str_replace("", "'", $token);
 				$token = $pattern{$i};

framework/I18N/core/MessageCache.php

Doc Comments +1 added lines, -3 removed lines

@@ -103,9 +103,7 @@
 	 * Get the data from the cache.
 	 * @param string $catalogue The translation section.
 	 * @param string $culture The translation locale, e.g. "en_AU".
-	 * @param string $filename If the source is a file, this file's modified
-	 * time is newer than the cache's modified time, no cache hit.
-	 * @return mixed Boolean FALSE if no cache hit. Otherwise, translation
+	 * @return false|string Boolean FALSE if no cache hit. Otherwise, translation
 	 * table data for the specified section and locale.
 	 */
 	public function get($catalogue, $culture, $lastmodified = 0)

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
  */
 use Exception;
 
-require_once(dirname(__FILE__) . '/TCache_Lite.php');
+require_once(dirname(__FILE__).'/TCache_Lite.php');
 
 /**
  * Cache the translation table into the file system.
@@ -32,7 +32,7 @@ 
 	/**
 	 * Caceh life time, default is 1 year.
 	 */
-	protected $lifetime = 3153600;
+	protected $lifetime=3153600;
 
 
 	/**
@@ -41,24 +41,24 @@ 
 	 */
 	public function __construct($cacheDir)
 	{
-		$cacheDir = $cacheDir . '/';
+		$cacheDir=$cacheDir.'/';
 
 		if(!is_dir($cacheDir))
 			throw new Exception(
-				'The cache directory ' . $cacheDir . ' does not exists.' .
+				'The cache directory '.$cacheDir.' does not exists.'.
 				'The cache directory must be writable by the server.');
 		if(!is_writable($cacheDir))
 			throw new Exception(
-				'The cache directory ' . $cacheDir . ' must be writable ' .
+				'The cache directory '.$cacheDir.' must be writable '.
 				'by the server.');
 
-		$options = [
+		$options=[
 			'cacheDir' => $cacheDir,
 			'lifeTime' => $this->getLifeTime(),
 			'automaticSerialization' => true
 		];
 
-		$this->cache = new TCache_Lite($options);
+		$this->cache=new TCache_Lite($options);
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setLifeTime($time)
 	{
-		$this->lifetime = (int)$time;
+		$this->lifetime=(int) $time;
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	protected function getID($catalogue, $culture)
 	{
-		return $catalogue . ':' . $culture;
+		return $catalogue.':'.$culture;
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	protected function getGroup($catalogue, $culture)
 	{
-		return $catalogue . ':' . get_class($this);
+		return $catalogue.':'.get_class($this);
 	}
 
 	/**
@@ -108,20 +108,20 @@ 
 	 * @return mixed Boolean FALSE if no cache hit. Otherwise, translation
 	 * table data for the specified section and locale.
 	 */
-	public function get($catalogue, $culture, $lastmodified = 0)
+	public function get($catalogue, $culture, $lastmodified=0)
 	{
-		$ID = $this->getID($catalogue, $culture);
-		$group = $this->getGroup($catalogue, $culture);
+		$ID=$this->getID($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 
 		$this->cache->_setFileName($ID, $group);
 
-		$cache = $this->cache->getCacheFile();
+		$cache=$this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
+		if(is_file($cache)==false)
 			return false;
 
 
-		$lastmodified = (int)$lastmodified;
+		$lastmodified=(int) $lastmodified;
 
 		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
 			return false;
@@ -140,8 +140,8 @@ 
 	 */
 	public function save($data, $catalogue, $culture)
 	{
-		$ID = $this->getID($catalogue, $culture);
-		$group = $this->getGroup($catalogue, $culture);
+		$ID=$this->getID($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 
 		//echo '## Cache save: "'.$ID.'" : "'.$group.'"';
 		//echo "<br>\n";
@@ -156,7 +156,7 @@ 
 	 */
 	public function clean($catalogue, $culture)
 	{
-		$group = $this->getGroup($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 		$this->cache->clean($group);
 	}
 

framework/I18N/core/MessageSource_gettext.php

Doc Comments +6 added lines

@@ -199,6 +199,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $MOFile
+	 */
 	private function getPOFile($MOFile)
 	{
 		$filebase = substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
@@ -421,6 +424,9 @@ 
 		return $catalogue;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Spacing +102 added lines, -102 removed lines

@@ -25,7 +25,7 @@ 
 /**
  * Get the Gettext class.
  */
-require_once(dirname(__FILE__) . '/Gettext/TGettext.php');
+require_once(dirname(__FILE__).'/Gettext/TGettext.php');
 
 /**
  * MessageSource_gettext class.
@@ -44,23 +44,23 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.mo';
+	protected $dataExt='.mo';
 
 	/**
 	 * PO data filename extension
 	 * @var string
 	 */
-	protected $poExt = '.po';
+	protected $poExt='.po';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 
@@ -71,17 +71,17 @@ 
 	 */
 	protected function &loadData($filename)
 	{
-		$mo = TGettext::factory('MO', $filename);
+		$mo=TGettext::factory('MO', $filename);
 		$mo->load();
-		$result = $mo->toArray();
+		$result=$mo->toArray();
 
-		$results = [];
-		$count = 0;
+		$results=[];
+		$count=0;
 		foreach($result['strings'] as $source => $target)
 		{
-			$results[$source][] = $target; //target
-			$results[$source][] = $count++; //id
-			$results[$source][] = ''; //comments
+			$results[$source][]=$target; //target
+			$results[$source][]=$count++; //id
+			$results[$source][]=''; //comments
 		}
 		return $results;
 	}
@@ -104,7 +104,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source . '/' . $variant;
+		return $this->source.'/'.$variant;
 	}
 
 	/**
@@ -128,24 +128,24 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$source = $catalogue . $this->dataExt;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
 
-		$catalogues = [$source];
+		$catalogues=[$source];
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue . $this->dataSeparator .
-								$variant . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.
+								$variant.$this->dataExt;
 			}
 		}
-		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir, array_reverse($catalogues));
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
 		return $catalogues;
 	}
 
@@ -159,17 +159,17 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$catalogues = [];
+		$variants=explode('_', $this->culture);
+		$catalogues=[];
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 		return array_reverse($catalogues);
@@ -183,16 +183,16 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue = 'messages')
+	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
-			$po = $this->getPOFile($file);
+			$file=$this->getSource($variant);
+			$po=$this->getPOFile($file);
 			if(is_file($file) || is_file($po))
 				return [$variant, $file, $po];
 		}
@@ -201,8 +201,8 @@ 
 
 	private function getPOFile($MOFile)
 	{
-		$filebase = substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
-		return $filebase . $this->poExt;
+		$filebase=substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
+		return $filebase.$this->poExt;
 	}
 
 	/**
@@ -212,48 +212,48 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue = 'messages')
+	public function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
-			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+			list($variant, $MOFile, $POFile)=$this->createMessageTemplate($catalogue);
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
 
 		//set the strings as untranslated.
-		$strings = [];
+		$strings=[];
 		foreach($messages as $message)
-			$strings[$message] = '';
+			$strings[$message]='';
 
 		//load the PO
-		$po = TGettext::factory('PO', $POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
-		$existing = count($result['strings']);
+		$existing=count($result['strings']);
 
 		//add to strings to the existing message list
-		$result['strings'] = array_merge($result['strings'], $strings);
+		$result['strings']=array_merge($result['strings'], $strings);
 
-		$new = count($result['strings']);
+		$new=count($result['strings']);
 
 		if($new > $existing)
 		{
 			//change the date 2004-12-25 12:26
-			$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+			$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 			$po->fromArray($result);
-			$mo = $po->toMO();
+			$mo=$po->toMO();
 			if($po->save() && $mo->save($MOFile))
 			{
 				if(!empty($this->cache))
@@ -272,32 +272,32 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue = 'messages')
+	public function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
 
-		$po = TGettext::factory('PO', $POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $message)
+			if($string==$message)
 			{
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 				unset($result['strings'][$string]);
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 				if($po->save() && $mo->save($MOFile))
 				{
 					if(!empty($this->cache))
@@ -320,33 +320,33 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue = 'messages')
+	public function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
 
 
-		$po = TGettext::factory('PO', $POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $text)
+			if($string==$text)
 			{
-				$result['strings'][$string] = $target;
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['strings'][$string]=$target;
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 
 				if($po->save() && $mo->save($MOFile))
 				{
@@ -378,42 +378,42 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir = null, $variant = null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
 
-		$catalogue = [];
+		$catalogue=[];
 
 		foreach($files as $file)
 		{
-			if(is_dir($dir . '/' . $file)
+			if(is_dir($dir.'/'.$file)
 				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
 			{
 
-				$catalogue = array_merge($catalogue,
-								$this->getCatalogues($dir . '/' . $file, $file));
+				$catalogue=array_merge($catalogue,
+								$this->getCatalogues($dir.'/'.$file, $file));
 			}
 
-			$pos = strpos($file, $this->dataExt);
+			$pos=strpos($file, $this->dataExt);
 
 			if($pos > 0
-				&& substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
+				&& substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file, 0, $pos);
-				$dot = strrpos($name, $this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot + 1, strlen($name));
-					$cat = substr($name, 0, $dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
-				$details[0] = $cat;
-				$details[1] = $culture;
+				$details[0]=$cat;
+				$details[1]=$culture;
 
 
-				$catalogue[] = $details;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -423,15 +423,15 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$mo_file = $this->getSource($variant);
-		$po_file = $this->getPOFile($mo_file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$mo_file=$this->getSource($variant);
+		$po_file=$this->getPOFile($mo_file);
 
-		$dir = dirname($mo_file);
+		$dir=dirname($mo_file);
 		if(!is_dir($dir))
 		{
 			@mkdir($dir);
@@ -440,12 +440,12 @@ 
 		if(!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-		$po = TGettext::factory('PO', $po_file);
-		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
-		$result['strings'] = [];
+		$po=TGettext::factory('PO', $po_file);
+		$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
+		$result['strings']=[];
 
 		$po->fromArray($result);
-		$mo = $po->toMO();
+		$mo=$po->toMO();
 		if($po->save() && $mo->save($mo_file))
 			return [$variant, $mo_file, $po_file];
 		else

framework/I18N/core/NumberFormat.php

Doc Comments +4 added lines, -1 removed lines

@@ -86,6 +86,7 @@ 
 	 * a CultureInfo or NumberFormatInfo instance will instantiated a instance
 	 * for that particular culture.
 	 * @param mixed either null, a CultureInfo, a NumberFormatInfo, or string
+	 * @param string $formatInfo
 	 * @return NumberFormat
 	 */
 	public function __construct($formatInfo = null)
@@ -111,6 +112,7 @@ 
 	 * 3 decimal places.
 	 * @param string 3-letter ISO 4217 code. For example, the code
 	 * "USD" represents the US Dollar and "EUR" represents the Euro currency.
+	 * @param string $number
 	 * @return string formatted number string
 	 */
 	public function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
@@ -232,7 +234,7 @@ 
 
 	/**
 	 * Format the decimal places.
-	 * @param string the decimal number in string form.
+	 * @param string string decimal number in string form.
 	 * @return string formatted decimal places.
 	 */
 	protected function formatDecimal($string)
@@ -280,6 +282,7 @@ 
 	 * Set the pattern to format against. The default patterns
 	 * are retrieved from the NumberFormatInfo instance.
 	 * @param string the requested patterns.
+	 * @param string $pattern
 	 * @return string a number format pattern.
 	 */
 	protected function setPattern($pattern)

Spacing +64 added lines, -64 removed lines

@@ -21,13 +21,13 @@ 
 /**
  * Get the NumberFormatInfo class file.
  */
-require_once(dirname(__FILE__) . '/NumberFormatInfo.php');
+require_once(dirname(__FILE__).'/NumberFormatInfo.php');
 
 
 /**
  * Get the encoding utilities
  */
-require_once(dirname(__FILE__) . '/util.php');
+require_once(dirname(__FILE__).'/util.php');
 
 
 /**
@@ -88,16 +88,16 @@ 
 	 * @param mixed either null, a CultureInfo, a NumberFormatInfo, or string
 	 * @return NumberFormat
 	 */
-	public function __construct($formatInfo = null)
+	public function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = NumberFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=NumberFormatInfo::getInvariantInfo();
 		elseif($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->NumberFormat;
+			$this->formatInfo=$formatInfo->NumberFormat;
 		elseif($formatInfo instanceof NumberFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo =
+			$this->formatInfo=
 				NumberFormatInfo::getInstance($formatInfo);
 	}
 
@@ -113,44 +113,44 @@ 
 	 * "USD" represents the US Dollar and "EUR" represents the Euro currency.
 	 * @return string formatted number string
 	 */
-	public function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
+	public function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
-		$oldLocale = setLocale(LC_NUMERIC, '0');
+		$oldLocale=setLocale(LC_NUMERIC, '0');
 		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 
-		if(strtolower($pattern) == 'p')
-			$number = $number * 100;
+		if(strtolower($pattern)=='p')
+			$number=$number * 100;
 
-		$string = (string)$number;
+		$string=(string) $number;
 
-		$decimal = $this->formatDecimal($string);
-		$integer = $this->formatInteger(abs($number));
+		$decimal=$this->formatDecimal($string);
+		$integer=$this->formatInteger(abs($number));
 
 		if(strlen($decimal) > 0)
-			$result = $integer . $decimal;
+			$result=$integer.$decimal;
 		else
-			$result = $integer;
+			$result=$integer;
 
 		//get the suffix
 		if($number >= 0)
-			$suffix = $this->formatInfo->PositivePattern;
+			$suffix=$this->formatInfo->PositivePattern;
 		elseif($number < 0)
-			$suffix = $this->formatInfo->NegativePattern;
+			$suffix=$this->formatInfo->NegativePattern;
 		else
-			$suffix = ["",""];
+			$suffix=["", ""];
 
 		//append and prepend suffix
-		$result = $suffix[0] . $result . $suffix[1];
+		$result=$suffix[0].$result.$suffix[1];
 
 		//replace currency sign
-		$symbol = @$this->formatInfo->getCurrencySymbol($currency);
-		if($symbol === null) {
-			$symbol = $currency;
+		$symbol=@$this->formatInfo->getCurrencySymbol($currency);
+		if($symbol===null) {
+			$symbol=$currency;
 		}
 
-		$result = str_replace('¤', $symbol, $result);
+		$result=str_replace('¤', $symbol, $result);
 
 		setlocale(LC_NUMERIC, $oldLocale);
 
@@ -164,68 +164,68 @@ 
 	 */
 	protected function formatInteger($string)
 	{
-		$string = (string)$string;
+		$string=(string) $string;
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
 		//if not decimal digits, assume 0 decimal points.
 		if(is_int($decimalDigits) && $decimalDigits > 0)
-			$string = (string)round(floatval($string), $decimalDigits);
-		$dp = strpos($string, '.');
+			$string=(string) round(floatval($string), $decimalDigits);
+		$dp=strpos($string, '.');
 		if(is_int($dp))
-			$string = substr($string, 0, $dp);
-		$integer = '';
+			$string=substr($string, 0, $dp);
+		$integer='';
 
-		$digitSize = $this->formatInfo->getDigitSize();
+		$digitSize=$this->formatInfo->getDigitSize();
 
-		$string = str_pad($string, $digitSize, '0', STR_PAD_LEFT);
+		$string=str_pad($string, $digitSize, '0', STR_PAD_LEFT);
 
-		$len = strlen($string);
+		$len=strlen($string);
 
-		$groupSeparator = $this->formatInfo->GroupSeparator;
-		$groupSize = $this->formatInfo->GroupSizes;
+		$groupSeparator=$this->formatInfo->GroupSeparator;
+		$groupSize=$this->formatInfo->GroupSizes;
 
 
-		$firstGroup = true;
-		$multiGroup = is_int($groupSize[1]);
-		$count = 0;
+		$firstGroup=true;
+		$multiGroup=is_int($groupSize[1]);
+		$count=0;
 
 		if(is_int($groupSize[0]))
 		{
 			//now for the integer groupings
-			for($i = 0; $i < $len; $i++)
+			for($i=0; $i < $len; $i++)
 			{
-				$char = $string{$len - $i - 1};
+				$char=$string{$len - $i - 1};
 
-				if($multiGroup && $count == 0)
+				if($multiGroup && $count==0)
 				{
-					if($i != 0 && $i % $groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				elseif($multiGroup && $count >= 1)
 				{
-					if($i != 0 && ($i - $groupSize[0]) % $groupSize[1] == 0)
+					if($i!=0 && ($i - $groupSize[0]) % $groupSize[1]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else
 				{
-					if($i != 0 && $i % $groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 
-				$integer = $char . $integer;
+				$integer=$char.$integer;
 			}
 		}
 		else
-			$integer = $string;
+			$integer=$string;
 
 		return $integer;
 	}
@@ -237,41 +237,41 @@ 
 	 */
 	protected function formatDecimal($string)
 	{
-		$dp = strpos($string, '.');
-		$decimal = '';
+		$dp=strpos($string, '.');
+		$decimal='';
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
-		$decimalSeparator = $this->formatInfo->DecimalSeparator;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
+		$decimalSeparator=$this->formatInfo->DecimalSeparator;
 
 		//do the correct rounding here
 		//$string = round(floatval($string), $decimalDigits);
 		if(is_int($dp))
 		{
-			if($decimalDigits == -1)
+			if($decimalDigits==-1)
 			{
-				$decimal = substr($string, $dp + 1);
+				$decimal=substr($string, $dp + 1);
 			}
 			elseif(is_int($decimalDigits))
 			{
-				$float = round((float)$string, $decimalDigits);
-				if(strpos((string)$float, '.') === false)
+				$float=round((float) $string, $decimalDigits);
+				if(strpos((string) $float, '.')===false)
 				{
-					$decimal = str_pad($decimal, $decimalDigits, '0');
+					$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 				else
 				{
-					$decimal = substr($float, strpos($float, '.') + 1);
+					$decimal=substr($float, strpos($float, '.') + 1);
 					if(strlen($decimal) < $decimalDigits)
-						$decimal = str_pad($decimal, $decimalDigits, '0');
+						$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 			}
 			else
 				return $decimal;
 
-			return $decimalSeparator . $decimal;
+			return $decimalSeparator.$decimal;
 		}
-		elseif ($decimalDigits > 0)
-			return $decimalSeparator . str_pad($decimal, $decimalDigits, '0');
+		elseif($decimalDigits > 0)
+			return $decimalSeparator.str_pad($decimal, $decimalDigits, '0');
 
 		return $decimal;
 	}

Braces +7 added lines, -14 removed lines

@@ -203,16 +203,14 @@ 
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				elseif($multiGroup && $count >= 1)
+				} elseif($multiGroup && $count >= 1)
 				{
 					if($i != 0 && ($i - $groupSize[0]) % $groupSize[1] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else
+				} else
 				{
 					if($i != 0 && $i % $groupSize[0] == 0)
 					{
@@ -223,8 +221,7 @@ 
 
 				$integer = $char . $integer;
 			}
-		}
-		else
+		} else
 			$integer = $string;
 
 		return $integer;
@@ -250,27 +247,23 @@ 
 			if($decimalDigits == -1)
 			{
 				$decimal = substr($string, $dp + 1);
-			}
-			elseif(is_int($decimalDigits))
+			} elseif(is_int($decimalDigits))
 			{
 				$float = round((float)$string, $decimalDigits);
 				if(strpos((string)$float, '.') === false)
 				{
 					$decimal = str_pad($decimal, $decimalDigits, '0');
-				}
-				else
+				} else
 				{
 					$decimal = substr($float, strpos($float, '.') + 1);
 					if(strlen($decimal) < $decimalDigits)
 						$decimal = str_pad($decimal, $decimalDigits, '0');
 				}
-			}
-			else
+			} else
 				return $decimal;
 
 			return $decimalSeparator . $decimal;
-		}
-		elseif ($decimalDigits > 0)
+		} elseif ($decimalDigits > 0)
 			return $decimalSeparator . str_pad($decimal, $decimalDigits, '0');
 
 		return $decimal;