pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackEventParameter.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
 	 */
 	public function __construct($response, $parameter)
 	{
-		$this->_response = $response;
-		$this->_parameter = $parameter;
+		$this->_response=$response;
+		$this->_parameter=$parameter;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TEventTriggeredCallback.php

Spacing +4 added lines, -4 removed lines

@@ -64,10 +64,10 @@
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$name = preg_replace('/^on/', '', $this->getEventName());
-		$options['EventName'] = strtolower($name);
-		$options['StopEvent'] = $this->getPreventDefaultAction();
+		$options=parent::getTriggerOptions();
+		$name=preg_replace('/^on/', '', $this->getEventName());
+		$options['EventName']=strtolower($name);
+		$options['StopEvent']=$this->getPreventDefaultAction();
 		return $options;
 	}
 

framework/Web/UI/WebControls/THtmlElement.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	public function getTagName()
 	{
-		return ($this->_tagName !== null) ? $this->_tagName : ($this->_tagName = $this->getDefaultTagName());
+		return ($this->_tagName!==null) ? $this->_tagName : ($this->_tagName=$this->getDefaultTagName());
 	}
 
 	/**
@@ -61,6 +61,6 @@ 
 	 * @return boolean true if TagName has deviated from the default.
 	 */
 	public function getIsMutated() {
-		return $this->_tagName !== null && $this->_tagName != $this->getDefaultTagName();
+		return $this->_tagName!==null && $this->_tagName!=$this->getDefaultTagName();
 	}
 }

framework/Web/UI/WebControls/TBaseValidator.php

Braces +2 added lines, -4 removed lines

@@ -518,16 +518,14 @@
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
 					if($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);

Doc Comments +5 added lines, -2 removed lines

@@ -185,6 +185,7 @@ 
 	 * TBaseValidator::$_clientClass, be sure to update the corresponding
 	 * "Javascript/validation3.js" file as well.
 	 * @param TControl control to validate.
+	 * @param \Prado\Web\UI\TControl $control
 	 * @return string control type for client-side validation.
 	 */
 	private function getClientControlClass($control)
@@ -263,7 +264,7 @@ 
 	/**
 	 * Update the ControlToValidate component's css class depending
 	 * if the ControlCssClass property is set, and whether this is valid.
-	 * @return boolean true if change, false otherwise.
+	 * @return boolean|null true if change, false otherwise.
 	 */
 	protected function updateControlCssClass()
 	{
@@ -388,6 +389,7 @@ 
 	 * The ID path is the dot-connected IDs of the controls reaching from
 	 * the validator's naming container to the target control.
 	 * @param string the ID path
+	 * @param string $value
 	 */
 	public function setControlToValidate($value)
 	{
@@ -476,7 +478,7 @@ 
 	}
 
 	/**
-	 * @return TControl control to be validated. Null if no control is found.
+	 * @return \Prado\Web\UI\TControl control to be validated. Null if no control is found.
 	 * @throws TConfigurationException if {@link getControlToValidate
 	 * ControlToValidate} is empty or does not point to a valid control
 	 */
@@ -553,6 +555,7 @@ 
 
 	/**
 	 * @param string the css class that is applied to the control being validated in case the validation fails
+	 * @param string $value
 	 */
 	public function setControlCssClass($value)
 	{

Spacing +31 added lines, -31 removed lines

@@ -95,7 +95,7 @@ 
 	 * them specially.
 	 * @var array list of control class names
 	 */
-	private static $_clientClass = ['THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList'];
+	private static $_clientClass=['THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList'];
 
 	/**
 	 * Constructor.
@@ -154,29 +154,29 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$control = $this->getValidationTarget();
-		$options['ID'] = $this->getClientID();
-		$options['FormID'] = $this->getPage()->getForm()->getClientID();
-		$options['Display'] = $this->getDisplay();
-		$options['ErrorMessage'] = $this->getErrorMessage();
+		$control=$this->getValidationTarget();
+		$options['ID']=$this->getClientID();
+		$options['FormID']=$this->getPage()->getForm()->getClientID();
+		$options['Display']=$this->getDisplay();
+		$options['ErrorMessage']=$this->getErrorMessage();
 		if($this->getFocusOnError())
 		{
-			$options['FocusOnError'] = $this->getFocusOnError();
-			$options['FocusElementID'] = $this->getFocusElementID();
+			$options['FocusOnError']=$this->getFocusOnError();
+			$options['FocusElementID']=$this->getFocusElementID();
 		}
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		if($control)
-			$options['ControlToValidate'] = $control->getClientID();
-		$options['ControlCssClass'] = $this->getControlCssClass();
+			$options['ControlToValidate']=$control->getClientID();
+		$options['ControlCssClass']=$this->getControlCssClass();
 
-		$options['ControlType'] = $this->getClientControlClass($control);
-		$options['Enabled'] = $this->getEnabled(true);
+		$options['ControlType']=$this->getClientControlClass($control);
+		$options['Enabled']=$this->getEnabled(true);
 
 		//get date format from date picker target control
 		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
+			$options['DateFormat']=$control->getDateFormat();
 
-		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
+		$options=array_merge($options, $this->getClientSide()->getOptions()->toArray());
 
 		return $options;
 	}
@@ -193,7 +193,7 @@ 
 		foreach(self::$_clientClass as $type)
 			if($control instanceof $type)
 				return $type;
-		$reflectionClass = new \ReflectionClass($control);
+		$reflectionClass=new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
 	}
 
@@ -216,7 +216,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientSide===null)
-			$this->_clientSide = $this->createClientSide();
+			$this->_clientSide=$this->createClientSide();
 		return $this->_clientSide;
 	}
 
@@ -236,15 +236,15 @@ 
 	 */
 	public function renderClientControlScript($writer)
 	{
-		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
+		$scripts=$this->getPage()->getClientScript();
+		if($this->getEnableClientScript())
 			$scripts->registerPradoScript('validator');
 		$formID=$this->getPage()->getForm()->getClientID();
-		$scriptKey = "TBaseValidator:$formID";
+		$scriptKey="TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
-			$manager['FormID'] = $formID;
-			$options = TJavaScript::encode($manager);
+			$manager['FormID']=$formID;
+			$options=TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
 		if($this->getEnableClientScript())
@@ -255,7 +255,7 @@ 
 	 * Override parent implementation to update the control CSS Class before
 	 * the validated control is rendered
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->updateControlCssClass();
@@ -273,12 +273,12 @@ 
 			$control=$this->getValidationTarget();
 			if($control instanceof TWebControl)
 			{
-				$class = preg_replace('/ ' . preg_quote($cssClass) . '/', '', $control->getCssClass());
+				$class=preg_replace('/ '.preg_quote($cssClass).'/', '', $control->getCssClass());
 				if(!$this->getIsValid())
 				{
-					$class .= ' ' . $cssClass;
+					$class.=' '.$cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
+				} elseif($control->getIsValid())
 					$control->setCssClass($class);
 			}
 		}
@@ -289,11 +289,11 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		$key = 'prado:' . $this->getClientID();
+		$key='prado:'.$this->getClientID();
 		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
 		{
-			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new ' . $this->getClientClassName() . '(' . $options . ');';
+			$options=TJavaScript::encode($this->getClientScriptOptions());
+			$script='new '.$this->getClientClassName().'('.$options.');';
 			$this->getPage()->getClientScript()->registerEndScript($key, $script);
 		}
 	}
@@ -424,9 +424,9 @@ 
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
-			if($target instanceof TCheckBoxList && $target->getItemCount()>0)
+			if($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
-				$id=$target->getClientID() . '_c0';
+				$id=$target->getClientID().'_c0';
 			} else {
 				$id=$target->getClientID();
 			}

framework/Web/UI/WebControls/TClientScript.php

Spacing +5 added lines, -5 removed lines

@@ -105,11 +105,11 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$scripts = preg_split('/,|\s+/', $this->getPradoScripts());
-		$cs = $this->getPage()->getClientScript();
+		$scripts=preg_split('/,|\s+/', $this->getPradoScripts());
+		$cs=$this->getPage()->getClientScript();
 		foreach($scripts as $script)
 		{
-			if(($script = trim($script))!=='')
+			if(($script=trim($script))!=='')
 				$cs->registerPradoScript($script);
 		}
 	}
@@ -122,7 +122,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getFlushScriptFiles())
+		if($this->getFlushScriptFiles())
 			$this->getPage()->getClientScript()->flushScriptFiles($writer, $this);
 		$this->renderCustomScriptFile($writer);
 		$this->renderCustomScript($writer);
@@ -134,7 +134,7 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl())!=='')
+		if(($scriptUrl=$this->getScriptUrl())!=='')
 			$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
 	}
 

framework/Web/UI/TControlAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 */
 	public function getPage()
 	{
-		return $this->_control?$this->_control->getPage():null;
+		return $this->_control ? $this->_control->getPage() : null;
 	}
 
 	/**

framework/Data/Common/Oracle/TOracleMetaData.php

Braces +3 added lines, -6 removed lines

@@ -203,11 +203,9 @@ 
 				$info['NumericPrecision'] = intval($matches[1]);
 				if(count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
-			}
-			else
+			} else
 				$info['ColumnSize'] = intval($matches[1]);
-		}
-		else
+		} else
 			$info['DbType'] = $col['type'];
 		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
 	}
@@ -349,8 +347,7 @@ 
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
 			$command=$this->getDbConnection()->createCommand($sql);
-		}
-		else
+		} else
 		{
 			$sql=<<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects

Doc Comments +3 added lines, -1 removed lines

@@ -149,7 +149,7 @@ 
 	/**
 	 * @param string table schema name
 	 * @param string table name.
-	 * @return boolean true if the table is a view.
+	 * @return integer true if the table is a view.
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
@@ -171,6 +171,7 @@ 
 	/**
 	 * @param TOracleTableInfo table information.
 	 * @param array column information.
+	 * @param TOracleTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
@@ -326,6 +327,7 @@ 
 	/**
 	 * @param string column name.
 	 * @param TOracleTableInfo table information.
+	 * @param string $columnId
 	 * @return boolean true if column is a foreign key.
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)

Spacing +52 added lines, -52 removed lines

@@ -29,7 +29,7 @@ 
  */
 class TOracleMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'system';
+	private $_defaultSchema='system';
 
 
 	/**
@@ -62,10 +62,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"', '', $table))) > 1)
+		if(count($parts=explode('.', str_replace('"', '', $table))) > 1)
 			return [$parts[0], $parts[1]];
 		else
-			return [$this->getDefaultSchema(),$parts[0]];
+			return [$this->getDefaultSchema(), $parts[0]];
 	}
 
 	/**
@@ -75,12 +75,12 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName, $tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
 		// sequence on the field.
-		$sql =
+		$sql=
 <<<EOD
 		SELECT
 			a.COLUMN_ID,
@@ -100,14 +100,14 @@ 
 EOD;
 		$this->getDbConnection()->setActive(true);
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
-		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
+		$tableInfo=$this->createNewTableInfo($schemaName, $tableName);
 		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
+			$col['index']=$index++;
 			$this->processColumn($tableInfo, $col);
 		}
 		if($index===0)
@@ -122,12 +122,12 @@ 
 	 */
 	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName']	= $this->assertIdentifier($tableName);
-		$info['IsView'] 	= false;
-		if($this->getIsView($schemaName, $tableName)) $info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
+		$info['SchemaName']=$this->assertIdentifier($schemaName);
+		$info['TableName']=$this->assertIdentifier($tableName);
+		$info['IsView']=false;
+		if($this->getIsView($schemaName, $tableName)) $info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
 	}
 
@@ -140,7 +140,7 @@ 
 	{
 		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.oracle.com';
+			$ref='http://www.oracle.com';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -154,7 +154,7 @@ 
 	protected function getIsView($schemaName, $tableName)
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$sql =
+		$sql=
 <<<EOD
 		select	OBJECT_TYPE
 		from 	ALL_OBJECTS
@@ -162,10 +162,10 @@ 
 		and 	OWNER = '{$schemaName}'
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':schema',$schemaName);
 		//$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar() === 'VIEW');
+		return intval($command->queryScalar()==='VIEW');
 	}
 
 	/**
@@ -174,17 +174,17 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = strtolower($col['attname']); //use column name as column Id
+		$columnId=strtolower($col['attname']); //use column name as column Id
 
 		//$info['ColumnName'] 	= '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnName'] 	= $columnId; //NOT quote the column names!
-		$info['ColumnId'] 		= $columnId;
-		$info['ColumnIndex'] 	= $col['index'];
-		if(! (bool)$col['attnotnull']) $info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if((int)$col['atttypmod'] > 0) $info['ColumnSize'] =  $col['atttypmod']; // - 4;
-		if((bool)$col['atthasdef']) $info['DefaultValue'] = $col['adsrc'];
+		$info['ColumnName']=$columnId; //NOT quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
+		if(!(bool) $col['attnotnull']) $info['AllowNull']=true;
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey']=true;
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey']=true;
+		if((int) $col['atttypmod'] > 0) $info['ColumnSize']=$col['atttypmod']; // - 4;
+		if((bool) $col['atthasdef']) $info['DefaultValue']=$col['adsrc'];
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -198,22 +198,22 @@ 
 			}
 		}
 		*/
-		$matches = [];
+		$matches=[];
 		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
+			$info['DbType']=preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
 			if($this->isPrecisionType($info['DbType']))
 			{
-				$info['NumericPrecision'] = intval($matches[1]);
+				$info['NumericPrecision']=intval($matches[1]);
 				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+					$info['NumericScale']=intval($matches[2]);
 			}
 			else
-				$info['ColumnSize'] = intval($matches[1]);
+				$info['ColumnSize']=intval($matches[1]);
 		}
 		else
-			$info['DbType'] = $col['type'];
-		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
+			$info['DbType']=$col['type'];
+		$tableInfo->Columns[$columnId]=new TOracleTableColumn($info);
 	}
 
 	/**
@@ -221,13 +221,13 @@ 
 	 */
 	protected function getSequenceName($tableInfo, $src)
 	{
-		$matches = [];
+		$matches=[];
 		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
 			if(is_int(strpos($matches[1], '.')))
 				return $matches[1];
 			else
-				return $tableInfo->getSchemaName() . '.' . $matches[1];
+				return $tableInfo->getSchemaName().'.'.$matches[1];
 		}
 	}
 
@@ -236,7 +236,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='number'; // || $type==='interval' || strpos($type, 'time')===0;
 	}
 
@@ -250,7 +250,7 @@ 
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 //		select decode( a.CONSTRAINT_TYPE, 'P', 'PRIMARY KEY (', 'FOREIGN KEY (' )||b.COLUMN_NAME||')' as consrc,
-		$sql =
+		$sql=
 <<<EOD
 		select b.COLUMN_NAME as consrc,
 			   a.CONSTRAINT_TYPE as contype
@@ -261,24 +261,24 @@ 
 		and   a.CONSTRAINT_TYPE in ('P','R')
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
-		$primary = [];
-		$foreign = [];
+		$primary=[];
+		$foreign=[];
 		foreach($command->query() as $row)
 		{
 			switch(strtolower($row['contype']))
 			{
 				case 'p':
-					$primary = array_merge($primary, [strtolower($row['consrc'])]);
+					$primary=array_merge($primary, [strtolower($row['consrc'])]);
 					/*
 					$arr = $this->getPrimaryKeys($row['consrc']);
 					$primary = array_merge( $primary, array(strtolower( $arr[0] )) );
 					*/
 					break;
 				case 'r':
-					$foreign = array_merge($foreign, [strtolower($row['consrc'])]);
+					$foreign=array_merge($foreign, [strtolower($row['consrc'])]);
 					/*
 					// if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
 					$fkey = $this->getForeignKeys( $row['consrc'] );
@@ -287,7 +287,7 @@ 
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	protected function getPrimaryKeys($src)
 	{
-		$matches = [];
+		$matches=[];
 		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
 			return preg_split('/,\s+/', $matches[1]);
 		return [];
@@ -310,15 +310,15 @@ 
 	 */
 	protected function getForeignKeys($src)
 	{
-		$matches = [];
-		$brackets = '\(([^\)]+)\)';
-		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
+		$matches=[];
+		$brackets='\(([^\)]+)\)';
+		$find="/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
 		if(preg_match($find, $src, $matches))
 		{
-			$keys = preg_split('/,\s+/', $matches[1]);
-			$fkeys = [];
+			$keys=preg_split('/,\s+/', $matches[1]);
+			$fkeys=[];
 			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
+				$fkeys[$keys[$i]]=$fkey;
 			return ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
 		}
 	}
@@ -371,7 +371,7 @@ 
 			if($schema===$this->getDefaultSchema() || $schema==='')
 				$names[]=$row['TABLE_NAME'];
 			else
-				$names[]=$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
+				$names[]=$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
 		}
 		return $names;
 	}

framework/Data/Common/Pgsql/TPgsqlTableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

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