pradosoft / prado

framework/Data/ActiveRecord/Scaffold/TScaffoldView.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 * Handle the "edit" and "new" commands by displaying the edit view.
 	 * Default command shows the list view.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		switch(strtolower($param->getCommandName()))
 		{

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  * the Active Record class to be displayed/edited/added.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.0
  */
 class TScaffoldView extends TScaffoldBase

framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 			case 'char': case 'varchar':
 				return $this->createMultiLineControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 			case 'timestamp':
 				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 }

framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 			case 'datetime': case 'smalldatetime':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				$control = $this->createDefaultControl($container,$column, $record);
+				$control=$this->createDefaultControl($container, $column, $record);
 				if($column->getIsExcluded())
 					$control->setEnabled(false);
 				return $control;
@@ -40,9 +40,9 @@ 
 			case 'boolean':
 				return $container->findControl(self::DEFAULT_ID)->getChecked();
 			case 'datetime': case 'smalldatetime':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				$value = $this->getDefaultControlValue($container,$column, $record);
+				$value=$this->getDefaultControlValue($container, $column, $record);
 				if(trim($value)==='' && $column->getAllowNull())
 					return null;
 				else

framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 			case 'timestamp without time zone':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -45,9 +45,9 @@ 
 			case 'time without time zone':
 				return $this->getTimeValue($container, $column, $record);
 			case 'timestamp without time zone':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 }

framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php

Spacing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 {
 	protected function createControl($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($column->getDbType())));
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($column->getDbType())));
 		switch($dbtype)
 		{
 			case 'date':
@@ -42,7 +42,7 @@ 
 
 	protected function getControlValue($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($column->getDbType())));
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($column->getDbType())));
 		switch($dbtype)
 		{
 			case 'date':
@@ -52,15 +52,15 @@ 
 			case 'time':
 				return $this->getTimeValue($container, $column, $record);
 			case 'datetime': case 'timestamp':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			case 'tinyint':
-				return $this->getIntBooleanValue($container,$column, $record);
+				return $this->getIntBooleanValue($container, $column, $record);
 			case 'set':
 				return $this->getSetValue($container, $column, $record);
 			case 'enum':
 				return $this->getEnumValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 
@@ -72,12 +72,12 @@ 
 			parent::createIntegerControl($container, $column, $record);
 	}
 
-	protected function getIntBooleanValue($container,$column, $record)
+	protected function getIntBooleanValue($container, $column, $record)
 	{
 		if($column->getColumnSize()==1)
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
+			return (int) $container->findControl(self::DEFAULT_ID)->getChecked();
 		else
-			return $this->getDefaultControlValue($container,$column, $record);
+			return $this->getDefaultControlValue($container, $column, $record);
 	}
 }
 

framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php

Spacing +10 added lines, -10 removed lines

@@ -45,10 +45,10 @@ 
 	 */
 	protected function getListView()
 	{
-		if($this->_list===null && ($id = $this->getListViewID()) !== null)
+		if($this->_list===null && ($id=$this->getListViewID())!==null)
 		{
-			$this->_list = $this->getParent()->findControl($id);
-			if($this->_list ===null)
+			$this->_list=$this->getParent()->findControl($id);
+			if($this->_list===null)
 				throw new TConfigurationException('scaffold_unable_to_find_list_view', $id);
 		}
 		return $this->_list;
@@ -78,7 +78,7 @@ 
 	{
 		if(strtolower($param->getCommandName())==='search')
 		{
-			if(($list = $this->getListView()) !== null)
+			if(($list=$this->getListView())!==null)
 			{
 				$list->setSearchCondition($this->createSearchCondition());
 				return false;
@@ -93,10 +93,10 @@ 
 	 */
 	protected function createSearchCondition()
 	{
-		$table = $this->getTableInfo();
+		$table=$this->getTableInfo();
 		if(strlen($str=$this->getSearchText()->getText()) > 0)
 		{
-			$builder = $table->createCommandBuilder($this->getRecordFinder()->getDbConnection());
+			$builder=$table->createCommandBuilder($this->getRecordFinder()->getDbConnection());
 			return $builder->getSearchExpression($this->getFields(), $str);
 		}
 	}
@@ -106,10 +106,10 @@ 
 	 */
 	protected function getFields()
 	{
-		if(strlen(trim($str=$this->getSearchableFields()))>0)
-			$fields = preg_split('/\s*,\s*/', $str);
+		if(strlen(trim($str=$this->getSearchableFields())) > 0)
+			$fields=preg_split('/\s*,\s*/', $str);
 		else
-			$fields = $this->getTableInfo()->getColumns()->getKeys();
+			$fields=$this->getTableInfo()->getColumns()->getKeys();
 		return $fields;
 	}
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function getSearchableFields()
 	{
-		return $this->getViewState('SearchableFields','');
+		return $this->getViewState('SearchableFields', '');
 	}
 
 	/**

Indentation +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @link https://github.com/pradosoft/prado
  * @copyright Copyright © 2005-2016 The PRADO Group
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  */
 
 namespace Prado\Data\ActiveRecord\Scaffold;
@@ -32,7 +32,7 @@ 
  * are database dependent).
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldSearch extends TScaffoldBase

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)
 	{