pradosoft / prado

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)

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public function registerTypeHandler(TSqlMapTypeHandler $handler)
 	{
-		$this->_typeHandlers[$handler->getType()] = $handler;
+		$this->_typeHandlers[$handler->getType()]=$handler;
 	}
 
 	/**
@@ -90,13 +90,13 @@ 
 		switch(strtolower($type))
 		{
 			case 'integer': case 'int':
-				$type = 'integer'; break;
+				$type='integer'; break;
 			case 'float': case 'double': case 'decimal':
-				$type = 'float'; break;
+				$type='float'; break;
 			case 'boolean': case 'bool':
-				$type = 'boolean'; break;
+				$type='boolean'; break;
 			case 'string' :
-				$type = 'string'; break;
+				$type='string'; break;
 			default:
 				return $value;
 		}

framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
 
 	public function __construct($cacheModel=null)
 	{
-		$this->_cacheModel = $cacheModel;
+		$this->_cacheModel=$cacheModel;
 	}
 
 	protected function getBaseKeyKeyName()
@@ -36,13 +36,13 @@ 
 
 	protected function getBaseKey()
 	{
-		$cache = $this->getCache();
-		$keyname = $this->getBaseKeyKeyName();
-		$basekey = $cache->get($keyname);
-		if (!$basekey)
+		$cache=$this->getCache();
+		$keyname=$this->getBaseKeyKeyName();
+		$basekey=$cache->get($keyname);
+		if(!$basekey)
 		{
-			$basekey = DxUtil::generateRandomHash(8);
-			$cache->set($keyname,$basekey);
+			$basekey=DxUtil::generateRandomHash(8);
+			$cache->set($keyname, $basekey);
 		}
 		return $basekey;
 	}
@@ -64,23 +64,23 @@ 
 
 	public function get($key)
 	{
-		$result = $this->getCache()->get($this->getCacheKey($key));
-		return $result === false ? null : $result;
+		$result=$this->getCache()->get($this->getCacheKey($key));
+		return $result===false ? null : $result;
 	}
 
-	public function set($key, $value,$expire=0,$dependency=null)
+	public function set($key, $value, $expire=0, $dependency=null)
 	{
-		$this->getCache()->set($this->getCacheKey($key), $value, $expire,$dependency);
+		$this->getCache()->set($this->getCacheKey($key), $value, $expire, $dependency);
 	}
 
 	protected function getCache()
 	{
-		if (!$this->_cache)
-			$this->_cache = Prado::getApplication()->getCache();
+		if(!$this->_cache)
+			$this->_cache=Prado::getApplication()->getCache();
 		return $this->_cache;
 	}
 
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
 		throw new TSqlMapException('sqlmap_use_set_to_store_cache');
 	}

framework/Data/SqlMap/Configuration/TSimpleDynamicParser.php

Spacing +7 added lines, -7 removed lines

@@ -19,8 +19,8 @@ 
  */
 class TSimpleDynamicParser
 {
-	const PARAMETER_TOKEN_REGEXP = '/\$([^\$]+)\$/';
-	const DYNAMIC_TOKEN = '`!`';
+	const PARAMETER_TOKEN_REGEXP='/\$([^\$]+)\$/';
+	const DYNAMIC_TOKEN='`!`';
 
 	/**
 	 * Parse the sql text for dynamic place holders of the form $name$.
@@ -29,13 +29,13 @@ 
 	 */
 	public function parse($sqlText)
 	{
-		$matches = array();
-		$mappings = array();
+		$matches=array();
+		$mappings=array();
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
-		for($i = 0, $k=count($matches[1]); $i<$k; $i++)
+		for($i=0, $k=count($matches[1]); $i < $k; $i++)
 		{
-			$mappings[] = $matches[1][$i];
-			$sqlText = str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);
+			$mappings[]=$matches[1][$i];
+			$sqlText=str_replace($matches[0][$i], self::DYNAMIC_TOKEN, $sqlText);
 		}
 		return array('sql'=>$sqlText, 'parameters'=>$mappings);
 	}

framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Regular expression for parsing inline parameter maps.
 	 */
-	const PARAMETER_TOKEN_REGEXP = '/#([^#]+)#/';
+	const PARAMETER_TOKEN_REGEXP='/#([^#]+)#/';
 
 	/**
 	 * Parse the sql text for inline parameters.
@@ -35,14 +35,14 @@ 
 	 */
 	public function parse($sqlText, $scope)
 	{
-		$matches = array();
-		$mappings = array();
+		$matches=array();
+		$mappings=array();
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
 
-		for($i = 0, $k=count($matches[1]); $i<$k; $i++)
+		for($i=0, $k=count($matches[1]); $i < $k; $i++)
 		{
-			$mappings[] = $this->parseMapping($matches[1][$i], $scope);
-			$sqlText = str_replace($matches[0][$i], '?', $sqlText);
+			$mappings[]=$this->parseMapping($matches[1][$i], $scope);
+			$sqlText=str_replace($matches[0][$i], '?', $sqlText);
 		}
 		return array('sql'=>$sqlText, 'parameters'=>$mappings);
 	}
@@ -55,13 +55,13 @@ 
 	 */
 	protected function parseMapping($token, $scope)
 	{
-		$mapping = new TParameterProperty;
-		$properties = explode(',', $token);
+		$mapping=new TParameterProperty;
+		$properties=explode(',', $token);
 		$mapping->setProperty(trim(array_shift($properties)));
 		foreach($properties as $property)
 		{
-			$prop = explode('=',$property);
-			$name = trim($prop[0]); $value=trim($prop[1]);
+			$prop=explode('=', $property);
+			$name=trim($prop[0]); $value=trim($prop[1]);
 			if($mapping->canSetProperty($name))
 				$mapping->{'set'.$name}($value);
 			else

framework/Data/TDbDataReader.php

Spacing +6 added lines, -6 removed lines

@@ -63,9 +63,9 @@ 
 	public function bindColumn($column, &$value, $dataType=null)
 	{
 		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
-	public function readObject($className,$fields)
+	public function readObject($className, $fields)
 	{
-		return $this->_statement->fetchObject($className,$fields);
+		return $this->_statement->fetchObject($className, $fields);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if($this->_index < 0)
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;

Braces +1 added lines, -2 removed lines

@@ -179,8 +179,7 @@
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;
-		}
-		else
+		} else
 			throw new TDbException('dbdatareader_rewind_invalid');
 	}
 

framework/Data/TDbCommand.php

Braces +6 added lines, -12 removed lines

@@ -109,8 +109,7 @@ 
 			try
 			{
 				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
 			}
@@ -186,11 +185,9 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
-			}
-			else
+			} else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -223,8 +220,7 @@ 
 			else
 				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -250,8 +246,7 @@ 
 			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -279,8 +274,7 @@ 
 				return stream_get_contents($result);
 			else
 				return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}

Spacing +12 added lines, -12 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param TDbConnection the database connection
 	 * @param string the SQL statement to be executed
 	 */
-	public function __construct(TDbConnection $connection,$text)
+	public function __construct(TDbConnection $connection, $text)
 	{
 		$this->_connection=$connection;
 		$this->setText($text);
@@ -56,7 +56,7 @@ 
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0TDbCommand\0_statement"));
+		return array_diff(parent::__sleep(), array("\0TDbCommand\0_statement"));
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 			}
 			catch(Exception $e)
 			{
-				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
+				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
 		}
 	}
@@ -142,11 +142,11 @@ 
 	{
 		$this->prepare();
 		if($dataType===null)
-			$this->_statement->bindParam($name,$value);
+			$this->_statement->bindParam($name, $value);
 		else if($length===null)
-			$this->_statement->bindParam($name,$value,$dataType);
+			$this->_statement->bindParam($name, $value, $dataType);
 		else
-			$this->_statement->bindParam($name,$value,$dataType,$length);
+			$this->_statement->bindParam($name, $value, $dataType, $length);
 	}
 
 	/**
@@ -163,9 +163,9 @@ 
 	{
 		$this->prepare();
 		if($dataType===null)
-			$this->_statement->bindValue($name,$value);
+			$this->_statement->bindValue($name, $value);
 		else
-			$this->_statement->bindValue($name,$value,$dataType);
+			$this->_statement->bindValue($name, $value, $dataType);
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -226,7 +226,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -253,7 +253,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 
@@ -282,7 +282,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
+			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
 	}
 

Doc Comments +2 added lines, -1 removed lines

@@ -165,6 +165,7 @@ 
 	 * placeholders, this will be the 1-indexed position of the parameter.
 	 * @param mixed The value to bind to the parameter
 	 * @param int SQL data type of the parameter
+	 * @param string $name
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
 	 */
 	public function bindValue($name, $value, $dataType=null)
@@ -269,7 +270,7 @@ 
 	 * Executes the SQL statement and returns the value of the first column in the first row of data.
 	 * This is a convenient method of {@link query} when only a single scalar
 	 * value is needed (e.g. obtaining the count of the records).
-	 * @return mixed the value of the first column in the first row of the query result. False is returned if there is no value.
+	 * @return string the value of the first column in the first row of the query result. False is returned if there is no value.
 	 * @throws TDbException execution failed
 	 */
 	public function queryScalar()

framework/Caching/TAPCCache.php

Spacing +6 added lines, -6 removed lines

@@ -56,10 +56,10 @@ 
 		if(!extension_loaded('apc'))
 			throw new TConfigurationException('apccache_extension_required');
 
-		if(ini_get('apc.enabled') == false)
+		if(ini_get('apc.enabled')==false)
 			throw new TConfigurationException('apccache_extension_not_enabled');
 
-		if(substr(php_sapi_name(), 0, 3) === 'cli' and ini_get('apc.enable_cli') == false)
+		if(substr(php_sapi_name(), 0, 3)==='cli' and ini_get('apc.enable_cli')==false)
 			throw new TConfigurationException('apccache_extension_not_enabled_cli');
 
 		parent::init($config);
@@ -85,9 +85,9 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
-		return apc_store($key,$value,$expire);
+		return apc_store($key, $value, $expire);
 	}
 
 	/**
@@ -99,9 +99,9 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
-		return apc_add($key,$value,$expire);
+		return apc_add($key, $value, $expire);
 	}
 
 	/**