pradosoft / prado

framework/Data/SqlMap/Statements/TMappedStatement.php

Doc Comments +14 added lines, -1 removed lines

@@ -84,7 +84,7 @@ 
 	}
 
 	/**
-	 * @return TSqlMapper The SqlMap used by this MappedStatement
+	 * @return TSqlMapManager The SqlMap used by this MappedStatement
 	 */
 	public function getManager()
 	{
@@ -469,6 +469,7 @@ 
 	 * @param IDbConnection database connection
 	 * @param mixed insert statement parameter
 	 * @param TSqlMapSelectKey select key statement
+	 * @param TSqlMapSelectKey $selectKey
 	 * @return string last insert ID.
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
@@ -569,6 +570,7 @@ 
 	 * @param string result object class name
 	 * @param array a result set row retrieved from the database
 	 * @param object the result object, will create if necessary.
+	 * @param string $resultClass
 	 * @return object result object filled with data
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
@@ -591,6 +593,7 @@ 
 	 * Apply the result to a TList or an array.
 	 * @param array a result set row retrieved from the database
 	 * @param object result object, array or list
+	 * @param ArrayAccess $resultObject
 	 * @return object result filled with data.
 	 */
 	protected function fillResultArrayList($row, $resultObject)
@@ -633,6 +636,7 @@ 
 	 * @param string result map name.
 	 * @param array a result set row retrieved from the database
 	 * @param object result object to fill, will create new instances if required.
+	 * @param string $parentGroup
 	 * @return object result object filled with data.
 	 */
 	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
@@ -772,6 +776,7 @@ 
 	 * Converts the first array value to scalar value of given type.
 	 * @param array list of results
 	 * @param string scalar type.
+	 * @param string $type
 	 * @return mixed scalar value.
 	 */
 	protected function getScalarResult($result, $type)
@@ -961,6 +966,10 @@ 
 	public function setKeys($value){ $this->_keys = $value; }
 
 	public function getMethod(){ return $this->_method; }
+
+	/**
+	 * @param integer $value
+	 */
 	public function setMethod($value){ $this->_method = $value; }
 }
 
@@ -1003,6 +1012,7 @@ 
 	 * @param string parent node id
 	 * @param string new node id
 	 * @param mixed node value
+	 * @param string $node
 	 */
 	public function add($parent, $node, $object='')
 	{
@@ -1168,6 +1178,9 @@ 
 	private $_parameterObject;
 	private $_list;
 
+	/**
+	 * @param ArrayAccess $list
+	 */
 	public function __construct($result, $parameter, &$list)
 	{
 		$this->_resultObject = $result;

Spacing +147 added lines, -150 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * @var TPostSelectBinding[] post select statement queue.
 	 */
-	private $_selectQueue=array();
+	private $_selectQueue = array();
 
 	/**
 	 * @var boolean true when data is mapped to a particular row.
@@ -161,11 +161,11 @@ 
 	 */
 	protected function executeSQLQueryLimit($connection, $command, $max, $skip)
 	{
-		if($max>-1 || $skip > -1)
+		if ($max > -1 || $skip > -1)
 		{
-			$maxStr=$max>0?' LIMIT '.$max:'';
-			$skipStr=$skip>0?' OFFSET '.$skip:'';
-			$command->setText($command->getText().$maxStr.$skipStr);
+			$maxStr = $max > 0 ? ' LIMIT ' . $max : '';
+			$skipStr = $skip > 0 ? ' OFFSET ' . $skip : '';
+			$command->setText($command->getText() . $maxStr . $skipStr);
 		}
 		$connection->setActive(true);
 		return $command->query();
@@ -199,9 +199,9 @@ 
 	 * @param callback row delegate handler
 	 * @see executeQueryForList()
 	 */
-	public function executeQueryForList($connection, $parameter, $result=null, $skip=-1, $max=-1, $delegate=null)
+	public function executeQueryForList($connection, $parameter, $result = null, $skip = -1, $max = -1, $delegate = null)
 	{
-		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter,$skip,$max);
+		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForList($connection, $parameter, $sql, $result, $delegate);
 	}
 
@@ -221,17 +221,16 @@ 
 	 * @return array a list of result objects
 	 * @see executeQueryForList()
 	 */
-	public function runQueryForList($connection, $parameter, $sql, $result, $delegate=null)
+	public function runQueryForList($connection, $parameter, $sql, $result, $delegate = null)
 	{
-		$registry=$this->getManager()->getTypeHandlers();
-		$list = $result instanceof ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$registry = $this->getManager()->getTypeHandlers();
+		$list = $result instanceof ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
 		$reader = $sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
-		if($delegate!==null)
+		if ($delegate !== null)
 		{
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
@@ -241,14 +240,14 @@ 
 		else
 		{
 			//var_dump($sql,$parameter);
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 //				var_dump($row);
 				$list[] = $this->applyResultMap($row);
 			}
 		}
 
-		if(!$this->_groupBy->isEmpty())
+		if (!$this->_groupBy->isEmpty())
 		{
 			$list = $this->_groupBy->collect();
 			$this->initialGroupByResults();
@@ -272,7 +271,7 @@ 
 	 * @param callback row delegate handler
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 */
-	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty=null,  $skip=-1, $max=-1, $delegate=null)
+	public function executeQueryForMap($connection, $parameter, $keyProperty, $valueProperty = null, $skip = -1, $max = -1, $delegate = null)
 	{
 		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter, $skip, $max);
 		return $this->runQueryForMap($connection, $parameter, $sql, $keyProperty, $valueProperty, $delegate);
@@ -296,21 +295,20 @@ 
 	 * @return array An array of object containing the rows keyed by keyProperty.
 	 * @see executeQueryForMap()
 	 */
-	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty=null, $delegate=null)
+	public function runQueryForMap($connection, $parameter, $command, $keyProperty, $valueProperty = null, $delegate = null)
 	{
 		$map = array();
 		//$recordSet = $this->executeSQLQuery($connection, $sql);
 		$connection->setActive(true);
 		$reader = $command->query();
-		if($delegate!==null)
+		if ($delegate !== null)
 		{
 			//while($row = $recordSet->fetchRow())
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty===null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
+				$value = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
@@ -318,12 +316,11 @@ 
 		else
 		{
 			//while($row = $recordSet->fetchRow())
-			foreach($reader as $row)
+			foreach ($reader as $row)
 			{
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty===null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$map[$key] = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);
@@ -338,24 +335,24 @@ 
 	 */
 	protected function raiseRowDelegate($handler, $param)
 	{
-		if(is_string($handler))
+		if (is_string($handler))
 		{
-			call_user_func($handler,$this,$param);
+			call_user_func($handler, $this, $param);
 		}
-		else if(is_callable($handler,true))
+		else if (is_callable($handler, true))
 		{
 			// an array: 0 - object, 1 - method name/path
-			list($object,$method)=$handler;
-			if(is_string($object))	// static method call
-				call_user_func($handler,$this,$param);
+			list($object, $method) = $handler;
+			if (is_string($object))	// static method call
+				call_user_func($handler, $this, $param);
 			else
 			{
-				if(($pos=strrpos($method,'.'))!==false)
+				if (($pos = strrpos($method, '.')) !== false)
 				{
-					$object=$this->getSubProperty(substr($method,0,$pos));
-					$method=substr($method,$pos+1);
+					$object = $this->getSubProperty(substr($method, 0, $pos));
+					$method = substr($method, $pos + 1);
 				}
-				$object->$method($this,$param);
+				$object->$method($this, $param);
 			}
 		}
 		else
@@ -370,7 +367,7 @@ 
 	 * @param mixed The result object.
 	 * @return ${return}
 	 */
-	public function executeQueryForObject($connection, $parameter, $result=null)
+	public function executeQueryForObject($connection, $parameter, $result = null)
 	{
 		$sql = $this->_command->create($this->_manager, $connection, $this->_statement, $parameter);
 		return $this->runQueryForObject($connection, $sql, $result);
@@ -393,10 +390,10 @@ 
 	{
 		$object = null;
 		$connection->setActive(true);
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 			$object = $this->applyResultMap($row, $result);
 
-		if(!$this->_groupBy->isEmpty())
+		if (!$this->_groupBy->isEmpty())
 		{
 			$list = $this->_groupBy->collect();
 			$this->initialGroupByResults();
@@ -424,7 +421,7 @@ 
 //		var_dump($command,$parameter);
 		$result = $command->execute();
 
-		if($generatedKey===null)
+		if ($generatedKey === null)
 			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);
 
 		$this->executePostSelect($connection);
@@ -440,10 +437,10 @@ 
 	 */
 	protected function getPreGeneratedSelectKey($connection, $parameter)
 	{
-		if($this->_statement instanceof TSqlMapInsert)
+		if ($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey!==null) && !$selectKey->getIsAfter())
+			if (($selectKey !== null) && !$selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -456,10 +453,10 @@ 
 	 */
 	protected function getPostGeneratedSelectKey($connection, $parameter)
 	{
-		if($this->_statement instanceof TSqlMapInsert)
+		if ($this->_statement instanceof TSqlMapInsert)
 		{
 			$selectKey = $this->_statement->getSelectKey();
-			if(($selectKey!==null) && $selectKey->getIsAfter())
+			if (($selectKey !== null) && $selectKey->getIsAfter())
 				return $this->executeSelectKey($connection, $parameter, $selectKey);
 		}
 	}
@@ -476,7 +473,7 @@ 
 		$mappedStatement = $this->getManager()->getMappedStatement($selectKey->getID());
 		$generatedKey = $mappedStatement->executeQueryForObject(
 									$connection, $parameter, null);
-		if(strlen($prop = $selectKey->getProperty()) > 0)
+		if (strlen($prop = $selectKey->getProperty()) > 0)
 				TPropertyAccess::set($parameter, $prop, $generatedKey);
 		return $generatedKey;
 	}
@@ -490,7 +487,7 @@ 
 	 */
 	public function executeUpdate($connection, $parameter)
 	{
-		$sql = $this->_command->create($this->getManager(),$connection, $this->_statement, $parameter);
+		$sql = $this->_command->create($this->getManager(), $connection, $this->_statement, $parameter);
 		$affectedRows = $sql->execute();
 		//$this->executeSQLQuery($connection, $sql);
 		$this->executePostSelect($connection);
@@ -504,7 +501,7 @@ 
 	 */
 	protected function executePostSelect($connection)
 	{
-		while(count($this->_selectQueue))
+		while (count($this->_selectQueue))
 		{
 			$postSelect = array_shift($this->_selectQueue);
 			$method = $postSelect->getMethod();
@@ -513,15 +510,15 @@ 
 			$keys = $postSelect->getKeys();
 			$resultObject = $postSelect->getResultObject();
 
-			if($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
+			if ($method == self::QUERY_FOR_LIST || $method == self::QUERY_FOR_ARRAY)
 			{
 				$values = $statement->executeQueryForList($connection, $keys, null);
 
-				if($method == self::QUERY_FOR_ARRAY)
+				if ($method == self::QUERY_FOR_ARRAY)
 					$values = $values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
 			}
-			else if($method == self::QUERY_FOR_OBJECT)
+			else if ($method == self::QUERY_FOR_OBJECT)
 			{
 				$value = $statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -544,23 +541,23 @@ 
 	 * @param object the result object, will create if necessary.
 	 * @return object the result filled with data, null if not filled.
 	 */
-	protected function applyResultMap($row, &$resultObject=null)
+	protected function applyResultMap($row, &$resultObject = null)
 	{
-		if($row === false) return null;
+		if ($row === false) return null;
 
 		$resultMapName = $this->_statement->getResultMap();
 		$resultClass = $this->_statement->getResultClass();
 
-		$obj=null;
-		if($this->getManager()->getResultMaps()->contains($resultMapName))
+		$obj = null;
+		if ($this->getManager()->getResultMaps()->contains($resultMapName))
 			$obj = $this->fillResultMap($resultMapName, $row, null, $resultObject);
-		else if(strlen($resultClass) > 0)
+		else if (strlen($resultClass) > 0)
 			$obj = $this->fillResultClass($resultClass, $row, $resultObject);
 		else
 			$obj = $this->fillDefaultResultMap(null, $row, $resultObject);
-		if(class_exists('TActiveRecord',false) && $obj instanceof TActiveRecord)
+		if (class_exists('TActiveRecord', false) && $obj instanceof TActiveRecord)
 			//Create a new clean active record.
-			$obj=TActiveRecord::createRecord(get_class($obj),$obj);
+			$obj = TActiveRecord::createRecord(get_class($obj), $obj);
 		return $obj;
 	}
 
@@ -573,15 +570,15 @@ 
 	 */
 	protected function fillResultClass($resultClass, $row, $resultObject)
 	{
-		if($resultObject===null)
+		if ($resultObject === null)
 		{
 			$registry = $this->getManager()->getTypeHandlers();
-			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);
+			$resultObject = $this->_statement->createInstanceOfResultClass($registry, $row);
 		}
 
-		if($resultObject instanceOf ArrayAccess)
+		if ($resultObject instanceOf ArrayAccess)
 			return $this->fillResultArrayList($row, $resultObject);
-		else if(is_object($resultObject))
+		else if (is_object($resultObject))
 			return $this->fillResultObjectProperty($row, $resultObject);
 		else
 			return $this->fillDefaultResultMap(null, $row, $resultObject);
@@ -595,11 +592,11 @@ 
 	 */
 	protected function fillResultArrayList($row, $resultObject)
 	{
-		if($resultObject instanceof TList)
-			foreach($row as $v)
+		if ($resultObject instanceof TList)
+			foreach ($row as $v)
 				$resultObject[] = $v;
 		else
-			foreach($row as $k => $v)
+			foreach ($row as $k => $v)
 				$resultObject[$k] = $v;
 		return $resultObject;
 	}
@@ -613,17 +610,17 @@ 
 	protected function fillResultObjectProperty($row, $resultObject)
 	{
 		$index = 0;
-		$registry=$this->getManager()->getTypeHandlers();
-		foreach($row as $k=>$v)
+		$registry = $this->getManager()->getTypeHandlers();
+		foreach ($row as $k=>$v)
 		{
 			$property = new TResultProperty;
-			if(is_string($k) && strlen($k) > 0)
+			if (is_string($k) && strlen($k) > 0)
 				$property->setColumn($k);
 			$property->setColumnIndex(++$index);
-			$type = gettype(TPropertyAccess::get($resultObject,$k));
+			$type = gettype(TPropertyAccess::get($resultObject, $k));
 			$property->setType($type);
-			$value = $property->getPropertyValue($registry,$row);
-			TPropertyAccess::set($resultObject, $k,$value);
+			$value = $property->getPropertyValue($registry, $row);
+			TPropertyAccess::set($resultObject, $k, $value);
 		}
 		return $resultObject;
 	}
@@ -635,21 +632,21 @@ 
 	 * @param object result object to fill, will create new instances if required.
 	 * @return object result object filled with data.
 	 */
-	protected function fillResultMap($resultMapName, $row, $parentGroup=null, &$resultObject=null)
+	protected function fillResultMap($resultMapName, $row, $parentGroup = null, &$resultObject = null)
 	{
 		$resultMap = $this->getManager()->getResultMap($resultMapName);
 		$registry = $this->getManager()->getTypeHandlers();
-		$resultMap = $resultMap->resolveSubMap($registry,$row);
+		$resultMap = $resultMap->resolveSubMap($registry, $row);
 
-		if($resultObject===null)
+		if ($resultObject === null)
 			$resultObject = $resultMap->createInstanceOfResult($registry);
 
-		if(is_object($resultObject))
+		if (is_object($resultObject))
 		{
-			if(strlen($resultMap->getGroupBy()) > 0)
+			if (strlen($resultMap->getGroupBy()) > 0)
 				return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
 			else
-				foreach($resultMap->getColumns() as $property)
+				foreach ($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
 		}
 		else
@@ -671,26 +668,26 @@ 
 	{
 		$group = $this->getResultMapGroupKey($resultMap, $row);
 
-		if(empty($parent))
+		if (empty($parent))
 		{
 			$rootObject = array('object'=>$resultObject, 'property' => null);
 			$this->_groupBy->add(null, $group, $rootObject);
 		}
 
-		foreach($resultMap->getColumns() as $property)
+		foreach ($resultMap->getColumns() as $property)
 		{
 			//set properties.
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
 			$nested = $property->getResultMapping();
 
 			//nested property
-			if($this->getManager()->getResultMaps()->contains($nested))
+			if ($this->getManager()->getResultMaps()->contains($nested))
 			{
 				$nestedMap = $this->getManager()->getResultMap($nested);
 				$groupKey = $this->getResultMapGroupKey($nestedMap, $row);
 
 				//add the node reference first
-				if(empty($parent))
+				if (empty($parent))
 					$this->_groupBy->add($group, $groupKey, '');
 
 				//get the nested result mapping value
@@ -698,7 +695,7 @@ 
 
 				//add it to the object tree graph
 				$groupObject = array('object'=>$value, 'property' => $property->getProperty());
-				if(empty($parent))
+				if (empty($parent))
 					$this->_groupBy->add($group, $groupKey, $groupObject);
 				else
 					$this->_groupBy->add($parent, $groupKey, $groupObject);
@@ -716,10 +713,10 @@ 
 	protected function getResultMapGroupKey($resultMap, $row)
 	{
 		$groupBy = $resultMap->getGroupBy();
-		if(isset($row[$groupBy]))
-			return $resultMap->getID().$row[$groupBy];
+		if (isset($row[$groupBy]))
+			return $resultMap->getID() . $row[$groupBy];
 		else
-			return $resultMap->getID().crc32(serialize($row));
+			return $resultMap->getID() . crc32(serialize($row));
 	}
 
 	/**
@@ -732,16 +729,16 @@ 
 	 */
 	protected function fillDefaultResultMap($resultMap, $row, $resultObject)
 	{
-		if($resultObject===null)
-			$resultObject='';
+		if ($resultObject === null)
+			$resultObject = '';
 
-		if($resultMap!==null)
+		if ($resultMap !== null)
 			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);
 		else
 			$result = $row;
 
 		//if scalar result types
-		if(count($result) == 1 && ($type = gettype($resultObject))!= 'array')
+		if (count($result) == 1 && ($type = gettype($resultObject)) != 'array')
 			return $this->getScalarResult($result, $type);
 		else
 			return $result;
@@ -757,13 +754,13 @@ 
 	protected function fillArrayResultMap($resultMap, $row, $resultObject)
 	{
 		$result = array();
-		$registry=$this->getManager()->getTypeHandlers();
-		foreach($resultMap->getColumns() as $column)
+		$registry = $this->getManager()->getTypeHandlers();
+		foreach ($resultMap->getColumns() as $column)
 		{
-			if(($column->getType()===null)
-				&& ($resultObject!==null) && !is_object($resultObject))
+			if (($column->getType() === null)
+				&& ($resultObject !== null) && !is_object($resultObject))
 			$column->setType(gettype($resultObject));
-			$result[$column->getProperty()] = $column->getPropertyValue($registry,$row);
+			$result[$column->getProperty()] = $column->getPropertyValue($registry, $row);
 		}
 		return $result;
 	}
@@ -793,26 +790,26 @@ 
 		$select = $property->getSelect();
 		$key = $property->getProperty();
 		$nested = $property->getNestedResultMap();
-		$registry=$this->getManager()->getTypeHandlers();
-		if($key === '')
+		$registry = $this->getManager()->getTypeHandlers();
+		if ($key === '')
 		{
-			$resultObject = $property->getPropertyValue($registry,$row);
+			$resultObject = $property->getPropertyValue($registry, $row);
 		}
-		else if(strlen($select) == 0 && ($nested===null))
+		else if (strlen($select) == 0 && ($nested === null))
 		{
-			$value = $property->getPropertyValue($registry,$row);
+			$value = $property->getPropertyValue($registry, $row);
 
 			$this->_IsRowDataFound = $this->_IsRowDataFound || ($value != null);
-			if(is_array($resultObject) || is_object($resultObject))
+			if (is_array($resultObject) || is_object($resultObject))
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
 		}
-		else if($nested!==null)
+		else if ($nested !== null)
 		{
-			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
+			if ($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
-				if(strlen($resultMap->getGroupBy()) <= 0)
+				if (strlen($resultMap->getGroupBy()) <= 0)
 					throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
@@ -820,7 +817,7 @@ 
 			else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
-				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
+				if ($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
 					$obj = null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
@@ -849,10 +846,10 @@ 
 		$postSelect->setResultProperty($property);
 		$postSelect->setKeys($key);
 
-		if($property->instanceOfListType($resultObject))
+		if ($property->instanceOfListType($resultObject))
 		{
 			$values = null;
-			if($property->getLazyLoad())
+			if ($property->getLazyLoad())
 			{
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
@@ -861,12 +858,12 @@ 
 			else
 				$postSelect->setMethod(self::QUERY_FOR_LIST);
 		}
-		else if($property->instanceOfArrayType($resultObject))
+		else if ($property->instanceOfArrayType($resultObject))
 			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
 		else
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
 
-		if(!$property->getLazyLoad())
+		if (!$property->getLazyLoad())
 			$this->_selectQueue[] = $postSelect;
 	}
 
@@ -877,23 +874,23 @@ 
 	 * @param array current row data.
 	 * @return array list of primary key values.
 	 */
-	protected function getPostSelectKeys($resultMap, $property,$row)
+	protected function getPostSelectKeys($resultMap, $property, $row)
 	{
 		$value = $property->getColumn();
-		if(is_int(strpos($value.',',0)) || is_int(strpos($value, '=',0)))
+		if (is_int(strpos($value . ',', 0)) || is_int(strpos($value, '=', 0)))
 		{
 			$keys = array();
-			foreach(explode(',', $value) as $entry)
+			foreach (explode(',', $value) as $entry)
 			{
-				$pair =explode('=',$entry);
+				$pair = explode('=', $entry);
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
 		}
 		else
 		{
-			$registry=$this->getManager()->getTypeHandlers();
-			return $property->getPropertyValue($registry,$row);
+			$registry = $this->getManager()->getTypeHandlers();
+			return $property->getPropertyValue($registry, $row);
 		}
 	}
 
@@ -907,7 +904,7 @@ 
 	protected function fillPropertyWithResultMap($resultMap, $row, &$resultObject)
 	{
 		$dataFound = false;
-		foreach($resultMap->getColumns() as $property)
+		foreach ($resultMap->getColumns() as $property)
 		{
 			$this->_IsRowDataFound = false;
 			$this->setObjectProperty($resultMap, $property, $row, $resultObject);
@@ -929,7 +926,7 @@ 
 		if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue";
 		if (is_null($this->_groupBy)) $exprops[] = "\0$cn\0_groupBy";
 		if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound";
-		return array_diff(parent::__sleep(),$exprops);
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 
@@ -942,26 +939,26 @@ 
  */
 class TPostSelectBinding
 {
-	private $_statement=null;
-	private $_property=null;
-	private $_resultObject=null;
-	private $_keys=null;
-	private $_method=TMappedStatement::QUERY_FOR_LIST;
+	private $_statement = null;
+	private $_property = null;
+	private $_resultObject = null;
+	private $_keys = null;
+	private $_method = TMappedStatement::QUERY_FOR_LIST;
 
-	public function getStatement(){ return $this->_statement; }
-	public function setStatement($value){ $this->_statement = $value; }
+	public function getStatement() { return $this->_statement; }
+	public function setStatement($value) { $this->_statement = $value; }
 
-	public function getResultProperty(){ return $this->_property; }
-	public function setResultProperty($value){ $this->_property = $value; }
+	public function getResultProperty() { return $this->_property; }
+	public function setResultProperty($value) { $this->_property = $value; }
 
-	public function getResultObject(){ return $this->_resultObject; }
-	public function setResultObject($value){ $this->_resultObject = $value; }
+	public function getResultObject() { return $this->_resultObject; }
+	public function setResultObject($value) { $this->_resultObject = $value; }
 
-	public function getKeys(){ return $this->_keys; }
-	public function setKeys($value){ $this->_keys = $value; }
+	public function getKeys() { return $this->_keys; }
+	public function setKeys($value) { $this->_keys = $value; }
 
-	public function getMethod(){ return $this->_method; }
-	public function setMethod($value){ $this->_method = $value; }
+	public function getMethod() { return $this->_method; }
+	public function setMethod($value) { $this->_method = $value; }
 }
 
 /**
@@ -1004,26 +1001,26 @@ 
 	 * @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;
 			return;
 		}
 		$this->_entries[$node] = $object;
-		if(empty($parent))
+		if (empty($parent))
 		{
-			if(isset($this->_entries[$node]))
+			if (isset($this->_entries[$node]))
 				return;
 			$this->_tree[$node] = array();
 		}
 		$found = $this->addNode($this->_tree, $parent, $node);
-		if(!$found && !empty($parent))
+		if (!$found && !empty($parent))
 		{
 			$this->_tree[$parent] = array();
-			if(!isset($this->_entries[$parent]) || $object !== '')
+			if (!isset($this->_entries[$parent]) || $object !== '')
 				$this->_entries[$parent] = $object;
 			$this->addNode($this->_tree, $parent, $node);
 		}
@@ -1040,11 +1037,11 @@ 
 	{
 		$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);
 			next($childs);
-			if($key == $parent)
+			if ($key == $parent)
 			{
 				$found = true;
 				$childs[$key][$node] = array();
@@ -1062,7 +1059,7 @@ 
 	 */
 	public function collect()
 	{
-		while(count($this->_tree) > 0)
+		while (count($this->_tree) > 0)
 			$this->collectChildren(null, $this->_tree);
 		return $this->getCollection();
 	}
@@ -1074,8 +1071,8 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach($nodes as $node)
-			if(count($node) != 0)
+		foreach ($nodes as $node)
+			if (count($node) != 0)
 				return true;
 		return $hasChildren;
 	}
@@ -1089,10 +1086,10 @@ 
 	{
 		$noChildren = !$this->hasChildren($nodes);
 		$childs = array();
-		for(reset($nodes); $key = key($nodes);)
+		for (reset($nodes); $key = key($nodes);)
 		{
 			next($nodes);
-			if($noChildren)
+			if ($noChildren)
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
@@ -1100,7 +1097,7 @@ 
 			else
 				$this->collectChildren($key, $nodes[$key]);
 		}
-		if(count($childs) > 0)
+		if (count($childs) > 0)
 			$this->onChildNodesVisited($parent, $childs);
 	}
 
@@ -1111,7 +1108,7 @@ 
 	 */
 	protected function onChildNodesVisited($parent, $nodes)
 	{
-		if(empty($parent) || empty($this->_entries[$parent]))
+		if (empty($parent) || empty($this->_entries[$parent]))
 			return;
 
 		$parentObject = $this->_entries[$parent]['object'];
@@ -1119,21 +1116,21 @@ 
 
 		$list = TPropertyAccess::get($parentObject, $property);
 
-		foreach($nodes as $node)
+		foreach ($nodes as $node)
 		{
-			if($list instanceof TList)
+			if ($list instanceof TList)
 				$parentObject->{$property}[] = $this->_entries[$node]['object'];
-			else if(is_array($list))
+			else if (is_array($list))
 				$list[] = $this->_entries[$node]['object'];
 			else
 				throw new TSqlMapExecutionException(
 					'sqlmap_property_must_be_list');
 		}
 
-		if(is_array($list))
+		if (is_array($list))
 			TPropertyAccess::set($parentObject, $property, $list);
 
-		if($this->_entries[$parent]['property'] === null)
+		if ($this->_entries[$parent]['property'] === null)
 			$this->_list[] = $parentObject;
 	}
 
@@ -1151,7 +1148,7 @@ 
 		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);
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

Braces +33 added lines, -42 removed lines

@@ -237,8 +237,7 @@ 
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//var_dump($sql,$parameter);
 			foreach($reader as $row)
@@ -314,8 +313,7 @@ 
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
@@ -341,8 +339,7 @@ 
 		if(is_string($handler))
 		{
 			call_user_func($handler,$this,$param);
-		}
-		else if(is_callable($handler,true))
+		} else if(is_callable($handler,true))
 		{
 			// an array: 0 - object, 1 - method name/path
 			list($object,$method)=$handler;
@@ -357,8 +354,7 @@ 
 				}
 				$object->$method($this,$param);
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
@@ -393,8 +389,9 @@ 
 	{
 		$object = null;
 		$connection->setActive(true);
-		foreach($command->query() as $row)
-			$object = $this->applyResultMap($row, $result);
+		foreach($command->query() as $row) {
+					$object = $this->applyResultMap($row, $result);
+		}
 
 		if(!$this->_groupBy->isEmpty())
 		{
@@ -520,8 +517,7 @@ 
 				if($method == self::QUERY_FOR_ARRAY)
 					$values = $values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
-			}
-			else if($method == self::QUERY_FOR_OBJECT)
+			} else if($method == self::QUERY_FOR_OBJECT)
 			{
 				$value = $statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -596,11 +592,13 @@ 
 	protected function fillResultArrayList($row, $resultObject)
 	{
 		if($resultObject instanceof TList)
-			foreach($row as $v)
-				$resultObject[] = $v;
+			foreach($row as $v) {
+							$resultObject[] = $v;
+			}
 		else
-			foreach($row as $k => $v)
-				$resultObject[$k] = $v;
+			foreach($row as $k => $v) {
+							$resultObject[$k] = $v;
+			}
 		return $resultObject;
 	}
 
@@ -649,10 +647,10 @@ 
 			if(strlen($resultMap->getGroupBy()) > 0)
 				return $this->addResultMapGroupBy($resultMap, $row, $parentGroup, $resultObject);
 			else
-				foreach($resultMap->getColumns() as $property)
-					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+				foreach($resultMap->getColumns() as $property) {
+									$this->setObjectProperty($resultMap, $property, $row, $resultObject);
+				}
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -797,8 +795,7 @@ 
 		if($key === '')
 		{
 			$resultObject = $property->getPropertyValue($registry,$row);
-		}
-		else if(strlen($select) == 0 && ($nested===null))
+		} else if(strlen($select) == 0 && ($nested===null))
 		{
 			$value = $property->getPropertyValue($registry,$row);
 
@@ -807,8 +804,7 @@ 
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
-		}
-		else if($nested!==null)
+		} else if($nested!==null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
@@ -816,16 +812,14 @@ 
 					throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
-			}
-			else
+			} else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
 				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
 					$obj = null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
-		}
-		else //'select' ResultProperty
+		} else //'select' ResultProperty
 		{
 			$this->enquequePostSelect($select, $resultMap, $property, $row, $resultObject);
 		}
@@ -857,11 +851,9 @@ 
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
-			}
-			else
+			} else
 				$postSelect->setMethod(self::QUERY_FOR_LIST);
-		}
-		else if($property->instanceOfArrayType($resultObject))
+		} else if($property->instanceOfArrayType($resultObject))
 			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
 		else
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
@@ -889,8 +881,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry=$this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry,$row);
@@ -1048,8 +1039,7 @@ 
 			{
 				$found = true;
 				$childs[$key][$node] = array();
-			}
-			else
+			} else
 			{
 				$found = $found || $this->addNode($childs[$key], $parent, $node);
 			}
@@ -1062,8 +1052,9 @@ 
 	 */
 	public function collect()
 	{
-		while(count($this->_tree) > 0)
-			$this->collectChildren(null, $this->_tree);
+		while(count($this->_tree) > 0) {
+					$this->collectChildren(null, $this->_tree);
+		}
 		return $this->getCollection();
 	}
 
@@ -1074,9 +1065,10 @@ 
 	protected function hasChildren(&$nodes)
 	{
 		$hasChildren = false;
-		foreach($nodes as $node)
-			if(count($node) != 0)
+		foreach($nodes as $node) {
+					if(count($node) != 0)
 				return true;
+		}
 		return $hasChildren;
 	}
 
@@ -1096,8 +1088,7 @@ 
 			{
 				$childs[] = $key;
 				unset($nodes[$key]);
-			}
-			else
+			} else
 				$this->collectChildren($key, $nodes[$key]);
 		}
 		if(count($childs) > 0)

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
 			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);
 		}
 
-		if($resultObject instanceOf ArrayAccess)
+		if($resultObject instanceof ArrayAccess)
 			return $this->fillResultArrayList($row, $resultObject);
 		else if(is_object($resultObject))
 			return $this->fillResultObjectProperty($row, $resultObject);

framework/Data/SqlMap/TSqlMapManager.php

Doc Comments +5 added lines

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

Spacing +22 added lines, -22 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -265,8 +265,9 @@
 	 */
 	public function flushCacheModels()
 	{
-		foreach($this->_cacheModels as $cache)
-			$cache->flush();
+		foreach($this->_cacheModels as $cache) {
+					$cache->flush();
+		}
 	}
 }
 

framework/Data/TDbCommand.php

Doc Comments +1 added lines

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

Braces +9 added lines, -14 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());
 		}
@@ -298,8 +292,9 @@ 
 	{
 		$rows=$this->query()->readAll();
 		$column=array();
-		foreach($rows as $row)
-			$column[]=current($row);
+		foreach($rows as $row) {
+					$column[]=current($row);
+		}
 		return $column;
 	}
 }

Spacing +44 added lines, -44 removed lines

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

framework/Data/TDbConnection.php

Doc Comments +4 added lines

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

Spacing +67 added lines, -67 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active=true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed',$e->getMessage());
 			}
@@ -343,8 +342,7 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
-		}
-		else
+		} else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
 

framework/Exceptions/TErrorHandler.php

Doc Comments +7 added lines

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

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 +104 added lines, -104 removed lines

@@ -52,20 +52,20 @@ 
 	/**
 	 * error template file basename
 	 */
-	const ERROR_FILE_NAME='error';
+	const ERROR_FILE_NAME = 'error';
 	/**
 	 * exception template file basename
 	 */
-	const EXCEPTION_FILE_NAME='exception';
+	const EXCEPTION_FILE_NAME = 'exception';
 	/**
 	 * number of lines before and after the error line to be displayed in case of an exception
 	 */
-	const SOURCE_LINES=12;
+	const SOURCE_LINES = 12;
 
 	/**
 	 * @var string error template directory
 	 */
-	private $_templatePath=null;
+	private $_templatePath = null;
 
 	/**
 	 * Initializes the module.
@@ -82,8 +82,8 @@ 
 	 */
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath===null)
-			$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
+		if ($this->_templatePath === null)
+			$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
 		return $this->_templatePath;
 	}
 
@@ -95,10 +95,10 @@ 
 	 */
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
-			$this->_templatePath=$templatePath;
+		if (($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
+			$this->_templatePath = $templatePath;
 		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
 
 	/**
@@ -110,30 +110,30 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter (if the event is raised by TApplication, it refers to the exception instance)
 	 */
-	public function handleError($sender,$param)
+	public function handleError($sender, $param)
 	{
-		static $handling=false;
+		static $handling = false;
 		// We need to restore error and exception handlers,
 		// because within error and exception handlers, new errors and exceptions
 		// cannot be handled properly by PHP
 		restore_error_handler();
 		restore_exception_handler();
 		// ensure that we do not enter infinite loop of error handling
-		if($handling)
+		if ($handling)
 			$this->handleRecursiveError($param);
 		else
 		{
-			$handling=true;
-			if(($response=$this->getResponse())!==null)
+			$handling = true;
+			if (($response = $this->getResponse()) !== null)
 				$response->clear();
-			if(!headers_sent())
+			if (!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
-			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
-			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
+			if ($param instanceof THttpException)
+				$this->handleExternalError($param->getStatusCode(), $param);
+			else if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
 
@@ -144,22 +144,22 @@ 
 	 * @return string
 	 * @since 3.1.6
 	 */
-	protected static function hideSecurityRelated($value, $exception=null)
+	protected static function hideSecurityRelated($value, $exception = null)
 	{
 		$aRpl = array();
-		if($exception !== null && $exception instanceof Exception)
+		if ($exception !== null && $exception instanceof Exception)
 		{
 			$aTrace = $exception->getTrace();
-			foreach($aTrace as $item)
+			foreach ($aTrace as $item)
 			{
-				if(isset($item['file']))
+				if (isset($item['file']))
 					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
 			}
 		}
 		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
 		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
 		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
-		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
+		if (isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
 		$aRpl = array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
@@ -172,36 +172,36 @@ 
 	 * @param integer response status code
 	 * @param Exception exception instance
 	 */
-	protected function handleExternalError($statusCode,$exception)
+	protected function handleExternalError($statusCode, $exception)
 	{
-		if(!($exception instanceof THttpException))
+		if (!($exception instanceof THttpException))
 			error_log($exception->__toString());
 
-		$content=$this->getErrorTemplate($statusCode,$exception);
+		$content = $this->getErrorTemplate($statusCode, $exception);
 
-		$serverAdmin=isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
+		$serverAdmin = isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
 
-		$isDebug = $this->getApplication()->getMode()===TApplicationMode::Debug;
+		$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
 
 		$errorMessage = $exception->getMessage();
-		if($isDebug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		if ($isDebug)
+			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
 		else
 		{
-			$version='';
+			$version = '';
 			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
 		}
-		$tokens=array(
+		$tokens = array(
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
 		$this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -213,16 +213,16 @@ 
 	 */
 	protected function handleRecursiveError($exception)
 	{
-		if($this->getApplication()->getMode()===TApplicationMode::Debug)
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 		{
 			echo "<html><head><title>Recursive Error</title></head>\n";
 			echo "<body><h1>Recursive Error</h1>\n";
-			echo "<pre>".$exception->__toString()."</pre>\n";
+			echo "<pre>" . $exception->__toString() . "</pre>\n";
 			echo "</body></html>";
 		}
 		else
 		{
-			error_log("Error happened while processing an existing error:\n".$exception->__toString());
+			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
 		}
 	}
@@ -236,55 +236,55 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if(php_sapi_name()==='cli')
+		if (php_sapi_name() === 'cli')
 		{
-			echo $exception->getMessage()."\n";
+			echo $exception->getMessage() . "\n";
 			echo $exception->getTraceAsString();
 			return;
 		}
 
-		if($exception instanceof TTemplateException)
+		if ($exception instanceof TTemplateException)
 		{
-			$fileName=$exception->getTemplateFile();
-			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
-			$source=$this->getSourceCode($lines,$exception->getLineNumber());
-			if($fileName==='')
-				$fileName='---embedded template---';
-			$errorLine=$exception->getLineNumber();
+			$fileName = $exception->getTemplateFile();
+			$lines = empty($fileName) ?explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source = $this->getSourceCode($lines, $exception->getLineNumber());
+			if ($fileName === '')
+				$fileName = '---embedded template---';
+			$errorLine = $exception->getLineNumber();
 		}
 		else
 		{
-			if(($trace=$this->getExactTrace($exception))!==null)
+			if (($trace = $this->getExactTrace($exception)) !== null)
 			{
-				$fileName=$trace['file'];
-				$errorLine=$trace['line'];
+				$fileName = $trace['file'];
+				$errorLine = $trace['line'];
 			}
 			else
 			{
-				$fileName=$exception->getFile();
-				$errorLine=$exception->getLine();
+				$fileName = $exception->getFile();
+				$errorLine = $exception->getLine();
 			}
-			$source=$this->getSourceCode(@file($fileName),$errorLine);
+			$source = $this->getSourceCode(@file($fileName), $errorLine);
 		}
 
-		if($this->getApplication()->getMode()===TApplicationMode::Debug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
+			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
 		else
-			$version='';
+			$version = '';
 
-		$tokens=array(
+		$tokens = array(
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
-			'%%SourceFile%%' => htmlspecialchars($fileName).' ('.$errorLine.')',
+			'%%SourceFile%%' => htmlspecialchars($fileName) . ' (' . $errorLine . ')',
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($exception->getTraceAsString()),
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 
-		$content=$this->getExceptionTemplate($exception);
+		$content = $this->getExceptionTemplate($exception);
 
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 
 	/**
@@ -296,11 +296,11 @@ 
 	 */
 	protected function getExceptionTemplate($exception)
 	{
-		$lang=Prado::getPreferredLanguage();
-		$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html';
-		if(!is_file($exceptionFile))
-			$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
-		if(($content=@file_get_contents($exceptionFile))===false)
+		$lang = Prado::getPreferredLanguage();
+		$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '-' . $lang . '.html';
+		if (!is_file($exceptionFile))
+			$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
+		if (($content = @file_get_contents($exceptionFile)) === false)
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
@@ -321,84 +321,84 @@ 
 	 * @param Exception the exception to be displayed
 	 * @return string the template content
 	 */
-	protected function getErrorTemplate($statusCode,$exception)
+	protected function getErrorTemplate($statusCode, $exception)
 	{
-		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
-		$lang=Prado::getPreferredLanguage();
-		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile="$base$statusCode-$lang.html";
-		else if(is_file("$base$statusCode.html"))
-			$errorFile="$base$statusCode.html";
-		else if(is_file("$base-$lang.html"))
-			$errorFile="$base-$lang.html";
+		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
+		$lang = Prado::getPreferredLanguage();
+		if (is_file("$base$statusCode-$lang.html"))
+			$errorFile = "$base$statusCode-$lang.html";
+		else if (is_file("$base$statusCode.html"))
+			$errorFile = "$base$statusCode.html";
+		else if (is_file("$base-$lang.html"))
+			$errorFile = "$base-$lang.html";
 		else
-			$errorFile="$base.html";
-		if(($content=@file_get_contents($errorFile))===false)
+			$errorFile = "$base.html";
+		if (($content = @file_get_contents($errorFile)) === false)
 			die("Unable to open error template file '$errorFile'.");
 		return $content;
 	}
 
 	private function getExactTrace($exception)
 	{
-		$trace=$exception->getTrace();
-		$result=null;
+		$trace = $exception->getTrace();
+		$result = null;
 		// if PHP exception, we want to show the 2nd stack level context
 		// because the 1st stack level is of little use (it's in error handler)
-		if($exception instanceof TPhpErrorException)
+		if ($exception instanceof TPhpErrorException)
 		{
-			if(isset($trace[0]['file']))
-				$result=$trace[0];
-			elseif(isset($trace[1]))
-				$result=$trace[1];
+			if (isset($trace[0]['file']))
+				$result = $trace[0];
+			elseif (isset($trace[1]))
+				$result = $trace[1];
 		}
-		else if($exception instanceof TInvalidOperationException)
+		else if ($exception instanceof TInvalidOperationException)
 		{
 			// in case of getter or setter error, find out the exact file and row
-			if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
-				$result=$this->getPropertyAccessTrace($trace,'__set');
+			if (($result = $this->getPropertyAccessTrace($trace, '__get')) === null)
+				$result = $this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
+		if ($result !== null && strpos($result['file'], ': eval()\'d code') !== false)
 			return null;
 
 		return $result;
 	}
 
-	private function getPropertyAccessTrace($trace,$pattern)
+	private function getPropertyAccessTrace($trace, $pattern)
 	{
-		$result=null;
-		foreach($trace as $t)
+		$result = null;
+		foreach ($trace as $t)
 		{
-			if(isset($t['function']) && $t['function']===$pattern)
-				$result=$t;
+			if (isset($t['function']) && $t['function'] === $pattern)
+				$result = $t;
 			else
 				break;
 		}
 		return $result;
 	}
 
-	private function getSourceCode($lines,$errorLine)
+	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine=$errorLine-self::SOURCE_LINES>=0?$errorLine-self::SOURCE_LINES:0;
-		$endLine=$errorLine+self::SOURCE_LINES<=count($lines)?$errorLine+self::SOURCE_LINES:count($lines);
+		$beginLine = $errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine = $errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 
-		$source='';
-		for($i=$beginLine;$i<$endLine;++$i)
+		$source = '';
+		for ($i = $beginLine; $i < $endLine; ++$i)
 		{
-			if($i===$errorLine-1)
+			if ($i === $errorLine - 1)
 			{
-				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
-				$source.="<div class=\"error\">".$line."</div>";
+				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
+				$source .= "<div class=\"error\">" . $line . "</div>";
 			}
 			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
 
 	private function addLink($message)
 	{
-		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
-		return preg_replace('/\b(T[A-Z]\w+)\b/',"<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>",$message);
+		$baseUrl = 'http://pradosoft.github.io/docs/manual/class-';
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
 

framework/Exceptions/TException.php

Doc Comments +1 added lines

@@ -393,6 +393,7 @@
 	 * 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 string $errorMessage
 	 */
 	public function __construct($statusCode,$errorMessage)
 	{

Spacing +39 added lines, -39 removed lines

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

Braces +6 added lines, -4 removed lines

@@ -50,8 +50,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
-			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
+		for($i=0;$i<$n;++$i) {
+					$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
+		}
 		parent::__construct(strtr($errorMessage,$tokens));
 	}
 
@@ -404,8 +405,9 @@ 
 		array_shift($args);
 		$n=count($args);
 		$tokens=array();
-		for($i=0;$i<$n;++$i)
-			$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
+		for($i=0;$i<$n;++$i) {
+					$tokens['{'.$i.'}']=TPropertyValue::ensureString($args[$i]);
+		}
 		parent::__construct(strtr($errorMessage,$tokens));
 	}
 

framework/I18N/core/CultureInfo.php

Doc Comments +6 added lines

@@ -200,6 +200,7 @@ 
 
 	/**
 	* Gets the CultureInfo that for this culture string
+	* @param string $culture
 	* @return CultureInfo invariant culture info is "en".
 	*/
 	public static function getInstance($culture)
@@ -228,6 +229,7 @@ 
 	 * Set the culture for the current instance. The culture indentifier
 	 * must be of the form "<language>_(country/region)".
 	 * @param string culture identifier, e.g. "fr_FR_EURO".
+	 * @param string $culture
 	 */
 	protected function setCulture($culture)
 	{
@@ -243,6 +245,7 @@ 
 	/**
 	 * Load the ICU culture data for the specific culture identifier.
 	 * @param string the culture identifier.
+	 * @param string $culture
 	 */
 	protected function loadCultureData($culture)
 	{
@@ -283,6 +286,7 @@ 
 	 * The data files are cached in a static variable inside
 	 * this function.
 	 * @param string the ICU data filename
+	 * @param string $filename
 	 * @return array ICU data
 	 */
 	protected function &getData($filename)
@@ -386,6 +390,7 @@ 
 	/**
 	 * Set the date time format information.
 	 * @param DateTimeFormatInfo the new date time format info.
+	 * @param DateTimeFormatInfo $dateTimeFormat
 	 */
 	function setDateTimeFormat($dateTimeFormat)
 	{
@@ -493,6 +498,7 @@ 
 	/**
 	 * Set the number format information.
 	 * @param NumberFormatInfo the new number format info.
+	 * @param NumberFormatInfo $numberFormat
 	 */
 	function setNumberFormat($numberFormat)
 	{

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();

Spacing +63 added lines, -63 removed lines

@@ -134,11 +134,11 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
+		$getProperty = 'get' . $name;
+		if (in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property '.$name.' does not exists.');
+			throw new Exception('Property ' . $name . ' does not exists.');
 	}
 
 	/**
@@ -147,11 +147,11 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
+		$setProperty = 'set' . $name;
+		if (in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property '.$name.' can not be set.');
+			throw new Exception('Property ' . $name . ' can not be set.');
 	}
 
 
@@ -163,11 +163,11 @@ 
 	 * @param string a culture name, e.g. "en_AU".
 	 * @return return new CultureInfo.
 	 */
-	function __construct($culture='en')
+	function __construct($culture = 'en')
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($culture))
+		if (empty($culture))
 			$culture = 'en';
 
 		$this->dataDir = $this->dataDir();
@@ -186,7 +186,7 @@ 
 	 */
 	protected static function dataDir()
 	{
-		return dirname(__FILE__).'/data/';
+		return dirname(__FILE__) . '/data/';
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	public static function getInstance($culture)
 	{
 		static $instances = array();
-		if(!isset($instances[$culture]))
+		if (!isset($instances[$culture]))
 			$instances[$culture] = new CultureInfo($culture);
 		return $instances[$culture];
 	}
@@ -218,8 +218,8 @@ 
 	 */
 	public static function validCulture($culture)
 	{
-		if(preg_match('/^[_\\w]+$/', $culture))
-			return is_file(self::dataDir().$culture.self::fileExt());
+		if (preg_match('/^[_\\w]+$/', $culture))
+			return is_file(self::dataDir() . $culture . self::fileExt());
 
 		return false;
 	}
@@ -231,7 +231,7 @@ 
 	 */
 	protected function setCulture($culture)
 	{
-		if(!empty($culture))
+		if (!empty($culture))
 		{
 			if (!preg_match('/^[_\\w]+$/', $culture))
 				throw new Exception('Invalid culture supplied: ' . $culture);
@@ -246,32 +246,32 @@ 
 	 */
 	protected function loadCultureData($culture)
 	{
-		$file_parts = explode('_',$culture);
+		$file_parts = explode('_', $culture);
 		$current_part = $file_parts[0];
 
 		$files = array($current_part);
 
-		for($i = 1, $k = count($file_parts); $i < $k; ++$i)
+		for ($i = 1, $k = count($file_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$file_parts[$i];
+			$current_part .= '_' . $file_parts[$i];
 			$files[] = $current_part;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			$filename = $this->dataDir.$file.$this->dataFileExt;
+			$filename = $this->dataDir . $file . $this->dataFileExt;
 
-			if(is_file($filename) == false)
-				throw new Exception('Data file for "'.$file.'" was not found.');
+			if (is_file($filename) == false)
+				throw new Exception('Data file for "' . $file . '" was not found.');
 
-			if(in_array($filename, $this->dataFiles) === false)
+			if (in_array($filename, $this->dataFiles) === false)
 			{
 				array_unshift($this->dataFiles, $file);
 
 				$data = &$this->getData($filename);
 				$this->data[$file] = &$data;
 
-				if(isset($data['__ALIAS']))
+				if (isset($data['__ALIAS']))
 					$this->loadCultureData($data['__ALIAS'][0]);
 				unset($data);
 			}
@@ -290,7 +290,7 @@ 
 		static $data = array();
 		static $files = array();
 
-		if(!in_array($filename, $files))
+		if (!in_array($filename, $files))
 		{
 			$data[$filename] = unserialize(file_get_contents($filename));
 			$files[] = $filename;
@@ -313,17 +313,17 @@ 
 	 * @param boolean merge the data from its parents.
 	 * @return mixed the specific ICU data.
 	 */
-	protected function findInfo($path='/', $merge=false)
+	protected function findInfo($path = '/', $merge = false)
 	{
 		$result = array();
-		foreach($this->dataFiles as $section)
+		foreach ($this->dataFiles as $section)
 		{
 			$info = $this->searchArray($this->data[$section], $path);
 
-			if($info)
+			if ($info)
 			{
-				if($merge)
-					$result = array_merge($info,$result);
+				if ($merge)
+					$result = array_merge($info, $result);
 				else
 					return $info;
 			}
@@ -340,18 +340,18 @@ 
 	 * @param string slash "/" separated array path.
 	 * @return mixed the value array using the path
 	 */
-	private function searchArray($info, $path='/')
+	private function searchArray($info, $path = '/')
 	{
-		$index = explode('/',$path);
+		$index = explode('/', $path);
 
 		$array = $info;
 
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for ($i = 0, $k = count($index); $i < $k; ++$i)
 		{
 			$value = $index[$i];
-			if($i < $k-1 && isset($array[$value]))
+			if ($i < $k - 1 && isset($array[$value]))
 				$array = $array[$value];
-			else if ($i == $k-1 && isset($array[$value]))
+			else if ($i == $k - 1 && isset($array[$value]))
 				return $array[$value];
 		}
 	}
@@ -373,7 +373,7 @@ 
 	 */
 	function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if ($this->dateTimeFormat === null)
 		{
 			$calendar = $this->getCalendar();
 			$info = $this->findInfo("calendar/{$calendar}", true);
@@ -410,12 +410,12 @@ 
 	 */
 	function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
+		$lang = substr($this->culture, 0, 2);
+		$reg = substr($this->culture, 3, 2);
 		$language = $this->findInfo("Languages/{$lang}");
 		$region = $this->findInfo("Countries/{$reg}");
-		if($region)
-			return $language[0].' ('.$region[0].')';
+		if ($region)
+			return $language[0] . ' (' . $region[0] . ')';
 		else
 			return $language[0];
 	}
@@ -428,17 +428,17 @@ 
 	 */
 	function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
+		$lang = substr($this->culture, 0, 2);
+		$reg = substr($this->culture, 3, 2);
 		$culture = $this->getInvariantCulture();
 
 		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		if (count($language) == 0)
 			return $this->culture;
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language[0].' ('.$region[0].')';
+		if ($region)
+			return $language[0] . ' (' . $region[0] . ')';
 		else
 			return $language[0];
 	}
@@ -453,7 +453,7 @@ 
 	static function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
 			$invariant = new CultureInfo();
 		return $invariant;
 	}
@@ -476,12 +476,12 @@ 
 	 */
 	function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if ($this->numberFormat === null)
 		{
 			$elements = $this->findInfo('NumberElements');
 			$patterns = $this->findInfo('NumberPatterns');
 			$currencies = $this->getCurrencies();
-			$data = array(	'NumberElements'=>$elements,
+			$data = array('NumberElements'=>$elements,
 							'NumberPatterns'=>$patterns,
 							'Currencies' => $currencies);
 
@@ -506,10 +506,10 @@ 
 	 */
 	function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if (strlen($this->culture) == 2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture,0,2);
+		$lang = substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -522,7 +522,7 @@ 
 	 * or CultureInfo::SPECIFIC.
 	 * @return array list of culture information available.
 	 */
-	static function getCultures($type=CultureInfo::ALL)
+	static function getCultures($type = CultureInfo::ALL)
 	{
 		$dataDir = CultureInfo::dataDir();
 		$dataExt = CultureInfo::fileExt();
@@ -533,12 +533,12 @@ 
 
 		while (false !== ($entry = $dir->read()))
 		{
-			if(is_file($dataDir.$entry)
-				&& substr($entry,-4) == $dataExt
-				&& $entry != 'root'.$dataExt)
+			if (is_file($dataDir . $entry)
+				&& substr($entry, -4) == $dataExt
+				&& $entry != 'root' . $dataExt)
 			{
-				$culture = substr($entry,0,-4);
-				if(strlen($culture) == 2)
+				$culture = substr($entry, 0, -4);
+				if (strlen($culture) == 2)
 					$neutral[] = $culture;
 				else
 					$specific[] = $culture;
@@ -546,10 +546,10 @@ 
 		}
 		$dir->close();
 
-		switch($type)
+		switch ($type)
 		{
 			case CultureInfo::ALL :
-				$all = 	array_merge($neutral, $specific);
+				$all = array_merge($neutral, $specific);
 				sort($all);
 				return $all;
 				break;
@@ -571,10 +571,10 @@ 
 	 */
 	private function simplify($array)
 	{
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for ($i = 0, $k = count($array); $i < $k; ++$i)
 		{
 			$key = key($array);
-			if(is_array($array[$key])
+			if (is_array($array[$key])
 				&& count($array[$key]) == 1)
 				$array[$key] = $array[$key][0];
 			next($array);
@@ -588,7 +588,7 @@ 
 	 */
 	function getCountries()
 	{
-		return $this->simplify($this->findInfo('Countries',true));
+		return $this->simplify($this->findInfo('Countries', true));
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 */
 	function getCurrencies()
 	{
-		return $this->findInfo('Currencies',true);
+		return $this->findInfo('Currencies', true);
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	function getLanguages()
 	{
-		return $this->simplify($this->findInfo('Languages',true));
+		return $this->simplify($this->findInfo('Languages', true));
 	}
 
 	/**
@@ -615,7 +615,7 @@ 
 	 */
 	function getScripts()
 	{
-		return $this->simplify($this->findInfo('Scripts',true));
+		return $this->simplify($this->findInfo('Scripts', true));
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	function getTimeZones()
 	{
-		return $this->simplify($this->findInfo('zoneStrings',true));
+		return $this->simplify($this->findInfo('zoneStrings', true));
 	}
 }
 

framework/I18N/core/DateTimeFormatInfo.php

Doc Comments +1 added lines

@@ -340,6 +340,7 @@
 	/**
 	 * A string containing the name of the era.
 	 * @param int era The integer representing the era.
+	 * @param integer $era
 	 * @return string the era name.
 	 */
 	function getEra($era)

Indentation +157 added lines, -157 removed lines

@@ -149,46 +149,46 @@ 
 	 * (invariant).
 	 * @return DateTimeFormatInfo default DateTimeFormatInfo.
 	 */
-    static function getInvariantInfo()
-    {
-        static $invariant;
+	static function getInvariantInfo()
+	{
+		static $invariant;
 		if($invariant === null)
-        {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->getDateTimeFormat();
-        }
+		{
+			$culture = CultureInfo::getInvariantCulture();
+			$invariant = $culture->getDateTimeFormat();
+		}
 		return $invariant;
-    }
-
-    /**
-     * Returns the DateTimeFormatInfo associated with the specified culture.
-     * @param CultureInfo the culture that gets the DateTimeFormat property.
-     * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
-     * culture.
-     */
-    static function getInstance($culture=null)
-    {
-
-        if ($culture instanceof CultureInfo)
-            return $culture->getDateTimeFormat();
-       	else if(is_string($culture))
-       	{
-       		$cultureInfo = CultureInfo::getInstance($culture);
-       		return $cultureInfo->getDateTimeFormat();
-       	}
-       	else
-       	{
+	}
+
+	/**
+	 * Returns the DateTimeFormatInfo associated with the specified culture.
+	 * @param CultureInfo the culture that gets the DateTimeFormat property.
+	 * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
+	 * culture.
+	 */
+	static function getInstance($culture=null)
+	{
+
+		if ($culture instanceof CultureInfo)
+			return $culture->getDateTimeFormat();
+	   	else if(is_string($culture))
+	   	{
+	   		$cultureInfo = CultureInfo::getInstance($culture);
+	   		return $cultureInfo->getDateTimeFormat();
+	   	}
+	   	else
+	   	{
 			$cultureInfo = CultureInfo::getInvariantCulture();
-            return $cultureInfo->getDateTimeFormat();
-       	}
-    }
+			return $cultureInfo->getDateTimeFormat();
+	   	}
+	}
 
 	/**
 	 * A one-dimensional array of type String containing
 	 * the culture-specific abbreviated names of the days
 	 * of the week. The array for InvariantInfo contains
 	 * "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", and "Sat".
-     * @return array abbreviated day names
+	 * @return array abbreviated day names
 	 */
 	function getAbbreviatedDayNames()
 	{
@@ -196,37 +196,37 @@ 
 		//return $this->data['dayNames/format/abbreviated'];
 	}
 
-    /**
-     * Set the abbreviated day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
-     * @param array abbreviated day names.
-     */
-    function setAbbreviatedDayNames($value)
-    {
-    	$this->data['dayNames']['format']['abbreviated'] = $value;
-    }
+	/**
+	 * Set the abbreviated day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
+	 * @param array abbreviated day names.
+	 */
+	function setAbbreviatedDayNames($value)
+	{
+		$this->data['dayNames']['format']['abbreviated'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing
 	 * the culture-specific narrow names of the days
 	 * of the week. The array for InvariantInfo contains
 	 * "S", "M", "T", "W", "T", "F", and "S".
-     * @return array narrow day names
+	 * @return array narrow day names
 	 */
 	function getNarrowDayNames()
 	{
 		return $this->data['dayNames']['format']['narrow'];
 	}
 
-    /**
-     * Set the narrow day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
-     * @param array narrow day names.
-     */
+	/**
+	 * Set the narrow day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
+	 * @param array narrow day names.
+	 */
 	function setNarrowDayNames($value)
 	{
 		$this->data['dayNames']['format']['narrow'] = $value;
@@ -237,7 +237,7 @@ 
 	 * culture-specific full names of the days of the week.
 	 * The array for InvariantInfo contains "Sunday", "Monday",
 	 * "Tuesday", "Wednesday", "Thursday", "Friday", and "Saturday".
-     * @return array day names
+	 * @return array day names
 	 */
 	function getDayNames()
 	{
@@ -245,14 +245,14 @@ 
 	}
 
 
-    /**
-     * Set the day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-     * "Friday", "Saturday".);</code>
-     * @param array day names.
-     */
+	/**
+	 * Set the day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+	 * "Friday", "Saturday".);</code>
+	 * @param array day names.
+	 */
 	function setDayNames($value)
 	{
 		$this->data['dayNames']['format']['wide'] = $value;
@@ -270,17 +270,17 @@ 
 		return $this->data['monthNames']['format']['narrow'];
 	}
 
-    /**
-     * Set the narrow month names. The value should be
-     * an array of string starting with J and ends in D.
-     * For example,
-     * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
-     * @param array month names.
-     */
-    function setNarrowMonthNames($value)
-    {
-        $this->data['monthNames']['format']['narrow'] = $value;
-    }
+	/**
+	 * Set the narrow month names. The value should be
+	 * an array of string starting with J and ends in D.
+	 * For example,
+	 * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
+	 * @param array month names.
+	 */
+	function setNarrowMonthNames($value)
+	{
+		$this->data['monthNames']['format']['narrow'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing the
@@ -298,18 +298,18 @@ 
 			return $this->data['monthNames']['format']['wide'];
 	}
 
-    /**
-     * Set the abbreviated month names. The value should be
-     * an array of string starting with Jan and ends in Dec.
-     * For example,
-     * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
-     * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
-     * @param array month names.
-     */
-    function setAbbreviatedMonthNames($value)
-    {
-        $this->data['monthNames']['format']['abbreviated'] = $value;
-    }
+	/**
+	 * Set the abbreviated month names. The value should be
+	 * an array of string starting with Jan and ends in Dec.
+	 * For example,
+	 * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	 * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
+	 * @param array month names.
+	 */
+	function setAbbreviatedMonthNames($value)
+	{
+		$this->data['monthNames']['format']['abbreviated'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing the
@@ -324,18 +324,18 @@ 
 		return $this->data['monthNames']['format']['wide'];
 	}
 
-    /**
-     * Set the month names. The value should be
-     * an array of string starting with Janurary and ends in December.
-     * For example,
-     * <code>array("January", "February", "March", "April", "May", "June",
-     * "July", "August", "September","October","November","December");</code>
-     * @param array month names.
-     */
-    function setMonthNames($value)
-    {
-    	$this->data['monthNames']['format']['wide'] = $value;
-    }
+	/**
+	 * Set the month names. The value should be
+	 * an array of string starting with Janurary and ends in December.
+	 * For example,
+	 * <code>array("January", "February", "March", "April", "May", "June",
+	 * "July", "August", "September","October","November","December");</code>
+	 * @param array month names.
+	 */
+	function setMonthNames($value)
+	{
+		$this->data['monthNames']['format']['wide'] = $value;
+	}
 
 	/**
 	 * A string containing the name of the era.
@@ -359,16 +359,16 @@ 
 		return $result[0];
 	}
 
-    /**
-     * Set the AM Designator. For example, 'AM'.
-     * @param string AM designator.
-     */
-    function setAMDesignator($value)
-    {
-        $markers = $this->getAMPMMarkers();
-        $markers[0] = $value;
-        $this->setAMPMMarkers($markers);
-    }
+	/**
+	 * Set the AM Designator. For example, 'AM'.
+	 * @param string AM designator.
+	 */
+	function setAMDesignator($value)
+	{
+		$markers = $this->getAMPMMarkers();
+		$markers[0] = $value;
+		$this->setAMPMMarkers($markers);
+	}
 
 	/**
 	 * The string designator for hours that are "post meridiem" (after noon).
@@ -381,41 +381,41 @@ 
 		return $result[1];
 	}
 
-    /**
-     * Set the PM Designator. For example, 'PM'.
-     * @param string PM designator.
-     */
-    function setPMDesignator($value)
-    {
-        $markers = $this->getAMPMMarkers();
-        $markers[1] = $value;
-        $this->setAMPMMarkers($markers);
-    }
-
-    /**
-     * Get the AM and PM markers array.
-     * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
-     * @return array AM and PM markers
-     */
-    function getAMPMMarkers()
+	/**
+	 * Set the PM Designator. For example, 'PM'.
+	 * @param string PM designator.
+	 */
+	function setPMDesignator($value)
+	{
+		$markers = $this->getAMPMMarkers();
+		$markers[1] = $value;
+		$this->setAMPMMarkers($markers);
+	}
+
+	/**
+	 * Get the AM and PM markers array.
+	 * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
+	 * @return array AM and PM markers
+	 */
+	function getAMPMMarkers()
 	{
 		return $this->data['AmPmMarkers'];
 	}
 
-    /**
-     * Set the AM and PM markers array.
-     * For example <code>array('AM','PM');</code>
-     * @param array AM and PM markers
-     */
-    function setAMPMMarkers($value)
-    {
-        $this->data['AmPmMarkers'] = $value;
-    }
+	/**
+	 * Set the AM and PM markers array.
+	 * For example <code>array('AM','PM');</code>
+	 * @param array AM and PM markers
+	 */
+	function setAMPMMarkers($value)
+	{
+		$this->data['AmPmMarkers'] = $value;
+	}
 
 	/**
 	 * Returns the full time pattern "HH:mm:ss z" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss z".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss z".
 	 */
 	function getFullTimePattern()
 	{
@@ -424,8 +424,8 @@ 
 
 	/**
 	 * Returns the long time pattern "HH:mm:ss z" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss z".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss z".
 	 */
 	function getLongTimePattern()
 	{
@@ -434,8 +434,8 @@ 
 
 	/**
 	 * Returns the medium time pattern "HH:mm:ss" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss".
 	 */
 	function getMediumTimePattern()
 	{
@@ -444,8 +444,8 @@ 
 
 	/**
 	 * Returns the short time pattern "HH:mm" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm".
 	 */
 	function getShortTimePattern()
 	{
@@ -454,8 +454,8 @@ 
 
 	/**
 	 * Returns the full date pattern "EEEE, yyyy MMMM dd" (default).
-     * This is culture sensitive.
-     * @return string pattern "EEEE, yyyy MMMM dd".
+	 * This is culture sensitive.
+	 * @return string pattern "EEEE, yyyy MMMM dd".
 	 */
 	function getFullDatePattern()
 	{
@@ -464,8 +464,8 @@ 
 
 	/**
 	 * Returns the long date pattern "yyyy MMMM d" (default).
-     * This is culture sensitive.
-     * @return string pattern "yyyy MMMM d".
+	 * This is culture sensitive.
+	 * @return string pattern "yyyy MMMM d".
 	 */
 	function getLongDatePattern()
 	{
@@ -474,8 +474,8 @@ 
 
 	/**
 	 * Returns the medium date pattern "yyyy MMMM d" (default).
-     * This is culture sensitive.
-     * @return string pattern "yyyy MMM d".
+	 * This is culture sensitive.
+	 * @return string pattern "yyyy MMM d".
 	 */
 	function getMediumDatePattern()
 	{
@@ -484,28 +484,28 @@ 
 
 	/**
 	 * Returns the short date pattern "yy/MM/dd" (default).
-     * This is culture sensitive.
-     * @return string pattern "yy/MM/dd".
+	 * This is culture sensitive.
+	 * @return string pattern "yy/MM/dd".
 	 */
 	function getShortDatePattern()
 	{
 		return $this->data['DateTimePatterns'][7];
 	}
 
-    /**
-     * Returns the date time order pattern, "{1} {0}" (default).
-     * This is culture sensitive.
-     * @return string pattern "{1} {0}".
-     */
-    function getDateTimeOrderPattern()
-    {
-        return $this->data['DateTimePatterns'][8];
-    }
+	/**
+	 * Returns the date time order pattern, "{1} {0}" (default).
+	 * This is culture sensitive.
+	 * @return string pattern "{1} {0}".
+	 */
+	function getDateTimeOrderPattern()
+	{
+		return $this->data['DateTimePatterns'][8];
+	}
 
 	/**
 	 * Formats the date and time in a culture sensitive paterrn.
-     * The default is "Date Time".
-     * @return string date and time formated
+	 * The default is "Date Time".
+	 * @return string date and time formated
 	 */
 	function formatDateTime($date, $time)
 	{

Spacing +13 added lines, -13 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Get the CultureInfo class.
  */
-require_once(dirname(__FILE__).'/CultureInfo.php');
+require_once(dirname(__FILE__) . '/CultureInfo.php');
 
 
 /**
@@ -96,11 +96,11 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
+		$getProperty = 'get' . $name;
+		if (in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property '.$name.' does not exists.');
+			throw new Exception('Property ' . $name . ' does not exists.');
 	}
 
 	/**
@@ -109,11 +109,11 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
+		$setProperty = 'set' . $name;
+		if (in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property '.$name.' can not be set.');
+			throw new Exception('Property ' . $name . ' can not be set.');
 	}
 
 	/**
@@ -125,11 +125,11 @@ 
 	 * @param array ICU data for date time formatting.
 	 * @see getInstance()
 	 */
-	function __construct($data=array())
+	function __construct($data = array())
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
+		if (empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
 		$this->data = $data;
@@ -152,7 +152,7 @@ 
     static function getInvariantInfo()
     {
         static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
         {
             $culture = CultureInfo::getInvariantCulture();
             $invariant = $culture->getDateTimeFormat();
@@ -166,12 +166,12 @@ 
      * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
      * culture.
      */
-    static function getInstance($culture=null)
+    static function getInstance($culture = null)
     {
 
         if ($culture instanceof CultureInfo)
             return $culture->getDateTimeFormat();
-       	else if(is_string($culture))
+       	else if (is_string($culture))
        	{
        		$cultureInfo = CultureInfo::getInstance($culture);
        		return $cultureInfo->getDateTimeFormat();
@@ -510,7 +510,7 @@ 
 	function formatDateTime($date, $time)
 	{
 		$pattern = $this->getDateTimeOrderPattern();
-		return str_replace(array('{0}','{1}'), array($time, $date), $pattern);
+		return str_replace(array('{0}', '{1}'), array($time, $date), $pattern);
 	}
 
 }

Braces +1 added lines, -2 removed lines

@@ -175,8 +175,7 @@
        	{
        		$cultureInfo = CultureInfo::getInstance($culture);
        		return $cultureInfo->getDateTimeFormat();
-       	}
-       	else
+       	} else
        	{
 			$cultureInfo = CultureInfo::getInvariantCulture();
             return $cultureInfo->getDateTimeFormat();

framework/I18N/core/Gettext/MO.php

Doc Comments +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
      * _read
      *
      * @access  private
-     * @return  mixed
+     * @return  string|null
      * @param   int     $bytes
      */
     function _read($bytes = 1)
@@ -165,7 +165,7 @@ 
      * Load MO file
      *
      * @access   public
-     * @return   mixed   Returns true on success or PEAR_Error on failure.
+     * @return   boolean   Returns true on success or PEAR_Error on failure.
      * @param    string  $file
      */
     function load($file = null)
@@ -261,7 +261,7 @@ 
      * Save MO file
      *
      * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @return  boolean   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
     function save($file = null)

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
  * @license     PHP License
  */
 
-require_once dirname(__FILE__).'/TGettext.php';
+require_once dirname(__FILE__) . '/TGettext.php';
 
 /**
  * File_Gettext_MO
@@ -349,7 +349,7 @@ 
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
-        chmod($file,PRADO_CHMOD);
+        chmod($file, PRADO_CHMOD);
         return true;
     }
 }

Indentation +295 added lines, -295 removed lines

@@ -52,304 +52,304 @@
  */
 class TGettext_MO extends TGettext
 {
-    /**
-     * file handle
-     *
-     * @access  private
-     * @var     resource
-     */
-    protected $_handle = null;
-
-    /**
-     * big endianess
-     *
-     * Whether to write with big endian byte order.
-     *
-     * @access  public
-     * @var     bool
-     */
-    protected $writeBigEndian = false;
-
-    /**
-     * Constructor
-     *
-     * @access  public
-     * @return  object      File_Gettext_MO
-     * @param   string      $file   path to GNU MO file
-     */
-    function __construct($file = '')
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * _read
-     *
-     * @access  private
-     * @return  mixed
-     * @param   int     $bytes
-     */
-    function _read($bytes = 1)
-    {
-        if (0 < $bytes = abs($bytes)) {
-            return fread($this->_handle, $bytes);
-        }
-        return null;
-    }
-
-    /**
-     * _readInt
-     *
-     * @access  private
-     * @return  int
-     * @param   bool    $bigendian
-     */
-    function _readInt($bigendian = false)
-    {
+	/**
+	 * file handle
+	 *
+	 * @access  private
+	 * @var     resource
+	 */
+	protected $_handle = null;
+
+	/**
+	 * big endianess
+	 *
+	 * Whether to write with big endian byte order.
+	 *
+	 * @access  public
+	 * @var     bool
+	 */
+	protected $writeBigEndian = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_MO
+	 * @param   string      $file   path to GNU MO file
+	 */
+	function __construct($file = '')
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * _read
+	 *
+	 * @access  private
+	 * @return  mixed
+	 * @param   int     $bytes
+	 */
+	function _read($bytes = 1)
+	{
+		if (0 < $bytes = abs($bytes)) {
+			return fread($this->_handle, $bytes);
+		}
+		return null;
+	}
+
+	/**
+	 * _readInt
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   bool    $bigendian
+	 */
+	function _readInt($bigendian = false)
+	{
 		//unpack returns a reference????
 		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
-        return array_shift($unpacked);
-    }
-
-    /**
-     * _writeInt
-     *
-     * @access  private
-     * @return  int
-     * @param   int     $int
-     */
-    function _writeInt($int)
-    {
-        return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
-    }
-
-    /**
-     * _write
-     *
-     * @access  private
-     * @return  int
-     * @param   string  $data
-     */
-    function _write($data)
-    {
-        return fwrite($this->_handle, $data);
-    }
-
-    /**
-     * _writeStr
-     *
-     * @access  private
-     * @return  int
-     * @param   string  $string
-     */
-    function _writeStr($string)
-    {
-        return $this->_write($string . "\0");
-    }
-
-    /**
-     * _readStr
-     *
-     * @access  private
-     * @return  string
-     * @param   array   $params     associative array with offset and length
-     *                              of the string
-     */
-    function _readStr($params)
-    {
-        fseek($this->_handle, $params['offset']);
-        return $this->_read($params['length']);
-    }
-
-    /**
-     * Load MO file
-     *
-     * @access   public
-     * @return   mixed   Returns true on success or PEAR_Error on failure.
-     * @param    string  $file
-     */
-    function load($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
-
-        // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
-            return false;
-        }
-        // lock MO file shared
-        if (!@flock($this->_handle, LOCK_SH)) {
-            @fclose($this->_handle);
-            return false;
-        }
-
-        // read (part of) magic number from MO file header and define endianess
+		return array_shift($unpacked);
+	}
+
+	/**
+	 * _writeInt
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   int     $int
+	 */
+	function _writeInt($int)
+	{
+		return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
+	}
+
+	/**
+	 * _write
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   string  $data
+	 */
+	function _write($data)
+	{
+		return fwrite($this->_handle, $data);
+	}
+
+	/**
+	 * _writeStr
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   string  $string
+	 */
+	function _writeStr($string)
+	{
+		return $this->_write($string . "\0");
+	}
+
+	/**
+	 * _readStr
+	 *
+	 * @access  private
+	 * @return  string
+	 * @param   array   $params     associative array with offset and length
+	 *                              of the string
+	 */
+	function _readStr($params)
+	{
+		fseek($this->_handle, $params['offset']);
+		return $this->_read($params['length']);
+	}
+
+	/**
+	 * Load MO file
+	 *
+	 * @access   public
+	 * @return   mixed   Returns true on success or PEAR_Error on failure.
+	 * @param    string  $file
+	 */
+	function load($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
+
+		// open MO file
+		if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
+			return false;
+		}
+		// lock MO file shared
+		if (!@flock($this->_handle, LOCK_SH)) {
+			@fclose($this->_handle);
+			return false;
+		}
+
+		// read (part of) magic number from MO file header and define endianess
 
 		//unpack returns a reference????
 		$unpacked = unpack('c', $this->_read(4));
-        switch ($magic = array_shift($unpacked))
-        {
-            case -34:
-                $be = false;
-            break;
-
-            case -107:
-                $be = true;
-            break;
-
-            default:
-                return false;
-        }
-
-        // check file format revision - we currently only support 0
-        if (0 !== ($_rev = $this->_readInt($be))) {
-            return false;
-        }
-
-        // count of strings in this file
-        $count = $this->_readInt($be);
-
-        // offset of hashing table of the msgids
-        $offset_original = $this->_readInt($be);
-        // offset of hashing table of the msgstrs
-        $offset_translat = $this->_readInt($be);
-
-        // move to msgid hash table
-        fseek($this->_handle, $offset_original);
-        // read lengths and offsets of msgids
-        $original = array();
-        for ($i = 0; $i < $count; $i++) {
-            $original[$i] = array(
-                'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
-            );
-        }
-
-        // move to msgstr hash table
-        fseek($this->_handle, $offset_translat);
-        // read lengths and offsets of msgstrs
-        $translat = array();
-        for ($i = 0; $i < $count; $i++) {
-            $translat[$i] = array(
-                'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
-            );
-        }
-
-        // read all
-        for ($i = 0; $i < $count; $i++) {
-            $this->strings[$this->_readStr($original[$i])] =
-                $this->_readStr($translat[$i]);
-        }
-
-        // done
-        @flock($this->_handle, LOCK_UN);
-        @fclose($this->_handle);
-        $this->_handle = null;
-
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
-
-        return true;
-    }
-
-    /**
-     * Save MO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function save($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
-
-        // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
-            return false;
-        }
-        // lock MO file exclusively
-        if (!@flock($this->_handle, LOCK_EX)) {
-            @fclose($this->_handle);
-            return false;
-        }
-
-        // write magic number
-        if ($this->writeBigEndian) {
-            $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
-        } else {
-            $this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
-        }
-
-        // write file format revision
-        $this->_writeInt(0);
-
-        $count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
-        // write count of strings
-        $this->_writeInt($count);
-
-        $offset = 28;
-        // write offset of orig. strings hash table
-        $this->_writeInt($offset);
-
-        $offset += ($count * 8);
-        // write offset transl. strings hash table
-        $this->_writeInt($offset);
-
-        // write size of hash table (we currently ommit the hash table)
-        $this->_writeInt(0);
-
-        $offset += ($count * 8);
-        // write offset of hash table
-        $this->_writeInt($offset);
-
-        // unshift meta info
-        if ($this->meta) {
-            $meta = '';
-            foreach ($this->meta as $key => $val) {
-                $meta .= $key . ': ' . $val . "\n";
-            }
-            $strings = array('' => $meta) + $this->strings;
-        } else {
-            $strings = $this->strings;
-        }
-
-        // write offsets for original strings
-        foreach (array_keys($strings) as $o) {
-            $len = strlen($o);
-            $this->_writeInt($len);
-            $this->_writeInt($offset);
-            $offset += $len + 1;
-        }
-
-        // write offsets for translated strings
-        foreach ($strings as $t) {
-            $len = strlen($t);
-            $this->_writeInt($len);
-            $this->_writeInt($offset);
-            $offset += $len + 1;
-        }
-
-        // write original strings
-        foreach (array_keys($strings) as $o) {
-            $this->_writeStr($o);
-        }
-
-        // write translated strings
-        foreach ($strings as $t) {
-            $this->_writeStr($t);
-        }
-
-        // done
-        @flock($this->_handle, LOCK_UN);
-        @fclose($this->_handle);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+		switch ($magic = array_shift($unpacked))
+		{
+			case -34:
+				$be = false;
+			break;
+
+			case -107:
+				$be = true;
+			break;
+
+			default:
+				return false;
+		}
+
+		// check file format revision - we currently only support 0
+		if (0 !== ($_rev = $this->_readInt($be))) {
+			return false;
+		}
+
+		// count of strings in this file
+		$count = $this->_readInt($be);
+
+		// offset of hashing table of the msgids
+		$offset_original = $this->_readInt($be);
+		// offset of hashing table of the msgstrs
+		$offset_translat = $this->_readInt($be);
+
+		// move to msgid hash table
+		fseek($this->_handle, $offset_original);
+		// read lengths and offsets of msgids
+		$original = array();
+		for ($i = 0; $i < $count; $i++) {
+			$original[$i] = array(
+				'length' => $this->_readInt($be),
+				'offset' => $this->_readInt($be)
+			);
+		}
+
+		// move to msgstr hash table
+		fseek($this->_handle, $offset_translat);
+		// read lengths and offsets of msgstrs
+		$translat = array();
+		for ($i = 0; $i < $count; $i++) {
+			$translat[$i] = array(
+				'length' => $this->_readInt($be),
+				'offset' => $this->_readInt($be)
+			);
+		}
+
+		// read all
+		for ($i = 0; $i < $count; $i++) {
+			$this->strings[$this->_readStr($original[$i])] =
+				$this->_readStr($translat[$i]);
+		}
+
+		// done
+		@flock($this->_handle, LOCK_UN);
+		@fclose($this->_handle);
+		$this->_handle = null;
+
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Save MO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function save($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
+
+		// open MO file
+		if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
+			return false;
+		}
+		// lock MO file exclusively
+		if (!@flock($this->_handle, LOCK_EX)) {
+			@fclose($this->_handle);
+			return false;
+		}
+
+		// write magic number
+		if ($this->writeBigEndian) {
+			$this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
+		} else {
+			$this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
+		}
+
+		// write file format revision
+		$this->_writeInt(0);
+
+		$count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
+		// write count of strings
+		$this->_writeInt($count);
+
+		$offset = 28;
+		// write offset of orig. strings hash table
+		$this->_writeInt($offset);
+
+		$offset += ($count * 8);
+		// write offset transl. strings hash table
+		$this->_writeInt($offset);
+
+		// write size of hash table (we currently ommit the hash table)
+		$this->_writeInt(0);
+
+		$offset += ($count * 8);
+		// write offset of hash table
+		$this->_writeInt($offset);
+
+		// unshift meta info
+		if ($this->meta) {
+			$meta = '';
+			foreach ($this->meta as $key => $val) {
+				$meta .= $key . ': ' . $val . "\n";
+			}
+			$strings = array('' => $meta) + $this->strings;
+		} else {
+			$strings = $this->strings;
+		}
+
+		// write offsets for original strings
+		foreach (array_keys($strings) as $o) {
+			$len = strlen($o);
+			$this->_writeInt($len);
+			$this->_writeInt($offset);
+			$offset += $len + 1;
+		}
+
+		// write offsets for translated strings
+		foreach ($strings as $t) {
+			$len = strlen($t);
+			$this->_writeInt($len);
+			$this->_writeInt($offset);
+			$offset += $len + 1;
+		}
+
+		// write original strings
+		foreach (array_keys($strings) as $o) {
+			$this->_writeStr($o);
+		}
+
+		// write translated strings
+		foreach ($strings as $t) {
+			$this->_writeStr($t);
+		}
+
+		// done
+		@flock($this->_handle, LOCK_UN);
+		@fclose($this->_handle);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }