pradosoft / prado

framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	protected function getErrorMessageFile()
 	{
 		$lang=Prado::getPreferredLanguage();
-		$path = dirname(__FILE__);
+		$path=dirname(__FILE__);
 		$msgFile=$path.'/messages-'.$lang.'.txt';
 		if(!is_file($msgFile))
 			$msgFile=$path.'/messages.txt';

framework/Data/SqlMap/TSqlMapManager.php

Spacing +12 added lines, -12 removed lines

@@ -88,7 +88,7 @@ 
 	public function getTypeHandlers()
 	{
 		if($this->_typeHandlers===null)
-			$this->_typeHandlers= new TSqlMapTypeHandlerRegistry();
+			$this->_typeHandlers=new TSqlMapTypeHandlerRegistry();
 		return $this->_typeHandlers;
 	}
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function configureXml($file)
 	{
-		$config = new TSqlMapXmlConfiguration($this);
+		$config=new TSqlMapXmlConfiguration($this);
 		$config->configure($file);
 	}
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function getCacheDependencies()
 	{
-		if($this->_cacheDependencies === null)
+		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];
 	}
@@ -163,8 +163,8 @@ 
 	 */
 	public function addMappedStatement(IMappedStatement $statement)
 	{
-		$key = $statement->getID();
-		if($this->_mappedStatements->contains($key) == true)
+		$key=$statement->getID();
+		if($this->_mappedStatements->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_statement', $key);
 		$this->_mappedStatements->add($key, $statement);
 	}
@@ -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];
 	}
@@ -196,8 +196,8 @@ 
 	 */
 	public function addResultMap(TResultMap $result)
 	{
-		$key = $result->getID();
-		if($this->_resultMaps->contains($key) == true)
+		$key=$result->getID();
+		if($this->_resultMaps->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_result_map', $key);
 		$this->_resultMaps->add($key, $result);
 	}
@@ -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];
 	}
@@ -228,8 +228,8 @@ 
 	 */
 	public function addParameterMap(TParameterMap $parameter)
 	{
-		$key = $parameter->getID();
-		if($this->_parameterMaps->contains($key) == true)
+		$key=$parameter->getID();
+		if($this->_parameterMaps->contains($key)==true)
 			throw new TSqlMapDuplicateException('sqlmap_already_contains_parameter_map', $key);
 		$this->_parameterMaps->add($key, $parameter);
 	}

Doc Comments +3 added lines

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

framework/Data/SqlMap/TSqlMapGateway.php

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function queryForObject($statementName, $parameter=null, $result=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForObject($this->getDbConnection(), $parameter, $result);
 	}
 
@@ -88,8 +88,8 @@ 
 	 */
 	public function queryForList($statementName, $parameter=null, $result=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return $statement->executeQueryForList($this->getDbConnection(),$parameter, $result, $skip, $max);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
+		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max);
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function queryWithRowDelegate($statementName, $delegate, $parameter=null, $result=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForList($this->getDbConnection(), $parameter, $result, $skip, $max, $delegate);
 	}
 
@@ -125,7 +125,7 @@ 
 	 */
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return new TSqlMapPagedList($statement, $parameter, $pageSize, null, $page);
 	}
 
@@ -144,10 +144,10 @@ 
 	 * @param integer The number of the page to initially load into the list.
 	 * @return TPagedList A PaginatedList of beans containing the rows.
 	 */
-	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
+	public function queryForPagedListWithRowDelegate($statementName, $delegate, $parameter=null, $pageSize=10, $page=0)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
-		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate,$page);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
+		return new TSqlMapPagedList($statement, $parameter, $pageSize, $delegate, $page);
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 */
 	public function queryForMap($statementName, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max);
 	}
 
@@ -184,7 +184,7 @@ 
 	 */
 	public function queryForMapWithRowDelegate($statementName, $delegate, $parameter=null, $keyProperty=null, $valueProperty=null, $skip=-1, $max=-1)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeQueryForMap($this->getDbConnection(), $parameter, $keyProperty, $valueProperty, $skip, $max, $delegate);
 	}
 
@@ -206,7 +206,7 @@ 
 	 */
 	public function insert($statementName, $parameter=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeInsert($this->getDbConnection(), $parameter);
 	}
 
@@ -225,7 +225,7 @@ 
 	 */
 	public function update($statementName, $parameter=null)
 	{
-		$statement = $this->getSqlMapManager()->getMappedStatement($statementName);
+		$statement=$this->getSqlMapManager()->getMappedStatement($statementName);
 		return $statement->executeUpdate($this->getDbConnection(), $parameter);
 	}
 

Doc Comments +5 added lines, -2 removed lines

@@ -36,6 +36,9 @@ 
 	 */
 	private $_manager;
 
+	/**
+	 * @param TSqlMapManager $manager
+	 */
 	public function __construct($manager)
 	{
 		$this->_manager=$manager;
@@ -125,7 +128,7 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param integer The maximum number of objects to store in each page.
 	 * @param integer The number of the page to initially load into the list.
-	 * @return TPagedList A PaginatedList of beans containing the rows.
+	 * @return TSqlMapPagedList A PaginatedList of beans containing the rows.
 	 */
 	public function queryForPagedList($statementName, $parameter=null, $pageSize=10, $page=0)
 	{
@@ -146,7 +149,7 @@ 
 	 * @param mixed The object used to set the parameters in the SQL.
 	 * @param integer The maximum number of objects to store in each page.
 	 * @param integer The number of the page to initially load into the list.
-	 * @return TPagedList A PaginatedList of beans containing the rows.
+	 * @return TSqlMapPagedList A PaginatedList of beans containing the rows.
 	 */
 	public function queryForPagedListWithRowDelegate($statementName,$delegate, $parameter=null, $pageSize=10, $page=0)
 	{

framework/Data/SqlMap/Statements/IMappedStatement.php

Spacing +1 added lines, -1 removed lines

@@ -75,6 +75,6 @@
 	 * @param object The result object.
 	 * @return object result.
 	 */
-	public function executeQueryForObject($connection,$parameter, $result=null);
+	public function executeQueryForObject($connection, $parameter, $result=null);
 }
 

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	public function getID();
 
 	/**
-	 * @return TSqlMapStatement The SQL statment used by this TMappedStatement.
+	 * @return \Prado\Data\SqlMap\Configuration\TSqlMapStatement The SQL statment used by this TMappedStatement.
 	 */
 	public function getStatement();
 

framework/Data/SqlMap/Statements/TSimpleDynamicSql.php

Spacing +3 added lines, -3 removed lines

@@ -22,15 +22,15 @@
 
 	public function __construct($mappings)
 	{
-		$this->_mappings = $mappings;
+		$this->_mappings=$mappings;
 	}
 
 	public function replaceDynamicParameter($sql, $parameter)
 	{
 		foreach($this->_mappings as $property)
 		{
-			$value = TPropertyAccess::get($parameter, $property);
-			$sql = preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', str_replace('$', '\$', $value), $sql, 1);
+			$value=TPropertyAccess::get($parameter, $property);
+			$sql=preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', str_replace('$', '\$', $value), $sql, 1);
 		}
 		return $sql;
 	}

framework/Data/SqlMap/Statements/TPreparedStatementFactory.php

Spacing +4 added lines, -4 removed lines

@@ -20,18 +20,18 @@
 {
 	private $_statement;
 	private $_preparedStatement;
-	private $_parameterPrefix = 'param';
+	private $_parameterPrefix='param';
 	private $_commandText;
 
 	public function __construct($statement, $sqlString)
 	{
-		$this->_statement = $statement;
-		$this->_commandText = $sqlString;
+		$this->_statement=$statement;
+		$this->_commandText=$sqlString;
 	}
 
 	public function prepare()
 	{
-		$this->_preparedStatement = new TPreparedStatement();
+		$this->_preparedStatement=new TPreparedStatement();
 		$this->_preparedStatement->setPreparedSql($this->_commandText);
 		if($this->_statement->parameterMap()!==null)
 			$this->createParametersForTextCommand();

framework/Data/SqlMap/Statements/TPreparedStatement.php

Spacing +13 added lines, -13 removed lines

@@ -22,33 +22,33 @@
 	private $_parameterNames;
 	private $_parameterValues;
 
-	public function getPreparedSql(){ return $this->_sqlString; }
-	public function setPreparedSql($value){ $this->_sqlString = $value; }
+	public function getPreparedSql() { return $this->_sqlString; }
+	public function setPreparedSql($value) { $this->_sqlString=$value; }
 
-	public function getParameterNames($needed = true)
+	public function getParameterNames($needed=true)
 	{
-		if (!$this->_parameterNames and $needed)
-			$this->_parameterNames = new TList;
+		if(!$this->_parameterNames and $needed)
+			$this->_parameterNames=new TList;
 		return $this->_parameterNames;
 	}
 
-	public function setParameterNames($value){ $this->_parameterNames = $value; }
+	public function setParameterNames($value) { $this->_parameterNames=$value; }
 
-	public function getParameterValues($needed = true)
+	public function getParameterValues($needed=true)
 	{
-		if (!$this->_parameterValues and $needed)
+		if(!$this->_parameterValues and $needed)
 			$this->_parameterValues=new TMap;
 		return $this->_parameterValues;
 	}
 
-	public function setParameterValues($value){ $this->_parameterValues = $value; }
+	public function setParameterValues($value) { $this->_parameterValues=$value; }
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = __CLASS__;
-		if (!$this->_parameterNames or !$this->_parameterNames->getCount()) $exprops[] = "\0$cn\0_parameterNames";
-		if (!$this->_parameterValues or !$this->_parameterValues->getCount()) $exprops[] = "\0$cn\0_parameterValues";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn=__CLASS__;
+		if(!$this->_parameterNames or !$this->_parameterNames->getCount()) $exprops[]="\0$cn\0_parameterNames";
+		if(!$this->_parameterValues or !$this->_parameterValues->getCount()) $exprops[]="\0$cn\0_parameterValues";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

framework/Data/SqlMap/Statements/TPreparedCommand.php

Spacing +18 added lines, -18 removed lines

@@ -21,45 +21,45 @@
  */
 class TPreparedCommand
 {
-	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject,$skip=null,$max=null)
+	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject, $skip=null, $max=null)
 	{
-		$sqlText = $statement->getSQLText();
+		$sqlText=$statement->getSQLText();
 
-		$prepared = $sqlText->getPreparedStatement($parameterObject);
+		$prepared=$sqlText->getPreparedStatement($parameterObject);
 		$connection->setActive(true);
-		$sql = $prepared->getPreparedSql();
+		$sql=$prepared->getPreparedSql();
 
 		if($sqlText instanceof TSimpleDynamicSql)
-			$sql = $sqlText->replaceDynamicParameter($sql, $parameterObject);
+			$sql=$sqlText->replaceDynamicParameter($sql, $parameterObject);
 
 		if($max!==null || $skip!==null)
 		{
-			$builder = TDbMetaData::getInstance($connection)->createCommandBuilder();
-			$sql = $builder->applyLimitOffset($sql,$max,$skip);
+			$builder=TDbMetaData::getInstance($connection)->createCommandBuilder();
+			$sql=$builder->applyLimitOffset($sql, $max, $skip);
 		}
-		$command = $connection->createCommand($sql);
+		$command=$connection->createCommand($sql);
 		$this->applyParameterMap($manager, $command, $prepared, $statement, $parameterObject);
 
 		return $command;
 	}
 
-	protected function applyParameterMap($manager,$command,$prepared, $statement, $parameterObject)
+	protected function applyParameterMap($manager, $command, $prepared, $statement, $parameterObject)
 	{
-		$properties = $prepared->getParameterNames(false);
+		$properties=$prepared->getParameterNames(false);
 		//$parameters = $prepared->getParameterValues();
 		$registry=$manager->getTypeHandlers();
-		if ($properties)
-		for($i = 0, $k=$properties->getCount(); $i<$k; $i++)
+		if($properties)
+		for($i=0, $k=$properties->getCount(); $i < $k; $i++)
 		{
-			$property = $statement->parameterMap()->getProperty($i);
-			$value = $statement->parameterMap()->getPropertyValue($registry,$property, $parameterObject);
-			$dbType = $property->getDbType();
+			$property=$statement->parameterMap()->getProperty($i);
+			$value=$statement->parameterMap()->getPropertyValue($registry, $property, $parameterObject);
+			$dbType=$property->getDbType();
 			if($dbType=='') //relies on PHP lax comparison
-				$command->bindValue($i+1,$value, TDbCommandBuilder::getPdoType($value));
+				$command->bindValue($i + 1, $value, TDbCommandBuilder::getPdoType($value));
 			else if(strpos($dbType, 'PDO::')===0)
-				$command->bindValue($i+1,$value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
+				$command->bindValue($i + 1, $value, constant($property->getDbType())); //assumes PDO types, e.g. PDO::PARAM_INT
 			else
-				$command->bindValue($i+1,$value);
+				$command->bindValue($i + 1, $value);
 		}
 	}
 }

Doc Comments +6 added lines

@@ -26,6 +26,9 @@ 
  */
 class TPreparedCommand
 {
+	/**
+	 * @param \Prado\Data\SqlMap\Configuration\TSqlMapStatement $statement
+	 */
 	public function create(TSqlMapManager $manager, $connection, $statement, $parameterObject,$skip=null,$max=null)
 	{
 		$sqlText = $statement->getSQLText();
@@ -48,6 +51,9 @@ 
 		return $command;
 	}
 
+	/**
+	 * @param TSqlMapManager $manager
+	 */
 	protected function applyParameterMap($manager,$command,$prepared, $statement, $parameterObject)
 	{
 		$properties = $prepared->getParameterNames(false);

framework/Data/SqlMap/Statements/TStaticSql.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
 
 	public function buildPreparedStatement($statement, $sqlString)
 	{
-		$factory = new TPreparedStatementFactory($statement, $sqlString);
-		$this->_preparedStatement = $factory->prepare();
+		$factory=new TPreparedStatementFactory($statement, $sqlString);
+		$this->_preparedStatement=$factory->prepare();
 	}
 
 	public function getPreparedStatement($parameter=null)