pradosoft / prado

framework/Data/Common/Mssql/TMssqlMetaData.php

Doc Comments +1 added lines

@@ -123,6 +123,7 @@
 	/**
 	 * @param TMssqlTableInfo table information.
 	 * @param array column information.
+	 * @param TMssqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Spacing +46 added lines, -46 removed lines

@@ -73,9 +73,9 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($catalogName, $schemaName, $tableName) = $this->getCatalogSchemaTableName($table);
+		list($catalogName, $schemaName, $tableName)=$this->getCatalogSchemaTableName($table);
 		$this->getDbConnection()->setActive(true);
-		$sql = <<<EOD
+		$sql=<<<EOD
 				SELECT t.*,
 												c.*,
 					columnproperty(object_id(c.table_schema + '.' + c.table_name), c.column_name,'IsIdentity') as IsIdentity
@@ -85,11 +85,11 @@ 
 										AND t.table_name = :table
 EOD;
 		if($schemaName!==null)
-			$sql .= ' AND t.table_schema = :schema';
+			$sql.=' AND t.table_schema = :schema';
 		if($catalogName!==null)
-			$sql .= ' AND t.table_catalog = :catalog';
+			$sql.=' AND t.table_catalog = :catalog';
 
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		if($schemaName!==null)
 			$command->bindValue(':schema', $schemaName);
@@ -100,7 +100,7 @@ 
 		foreach($command->query() as $col)
 		{
 			if($tableInfo===null)
-				$tableInfo = $this->createNewTableInfo($col);
+				$tableInfo=$this->createNewTableInfo($col);
 			$this->processColumn($tableInfo, $col);
 		}
 		if($tableInfo===null)
@@ -115,13 +115,13 @@ 
 	protected function getCatalogSchemaTableName($table)
 	{
 		//remove possible delimiters
-		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
+		$result=explode('.', preg_replace('/\[|\]|"/', '', $table));
 		if(count($result)===1)
-			return [null,null,$result[0]];
+			return [null, null, $result[0]];
 		if(count($result)===2)
-			return [null,$result[0],$result[1]];
-		if(count($result)>2)
-			return [$result[0],$result[1],$result[2]];
+			return [null, $result[0], $result[1]];
+		if(count($result) > 2)
+			return [$result[0], $result[1], $result[2]];
 	}
 
 	/**
@@ -130,31 +130,31 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['COLUMN_NAME'];
+		$columnId=$col['COLUMN_NAME'];
 
-		$info['ColumnName'] = "[$columnId]"; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION'])-1; //zero-based index
+		$info['ColumnName']="[$columnId]"; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=intval($col['ORDINAL_POSITION']) - 1; //zero-based index
 		if($col['IS_NULLABLE']!=='NO')
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 		if($col['COLUMN_DEFAULT']!==null)
-			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
+			$info['DefaultValue']=$col['COLUMN_DEFAULT'];
 
 		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['IsIdentity']==='1')
-			$info['AutoIncrement'] = true;
-		$info['DbType'] = $col['DATA_TYPE'];
+			$info['AutoIncrement']=true;
+		$info['DbType']=$col['DATA_TYPE'];
 		if($col['CHARACTER_MAXIMUM_LENGTH']!==null)
-			$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
-		if($col['NUMERIC_PRECISION'] !== null)
-			$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
+			$info['ColumnSize']=intval($col['CHARACTER_MAXIMUM_LENGTH']);
+		if($col['NUMERIC_PRECISION']!==null)
+			$info['NumericPrecision']=intval($col['NUMERIC_PRECISION']);
 		if($col['NUMERIC_SCALE']!==null)
-			$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
-		$tableInfo->Columns[$columnId] = new TMssqlTableColumn($info);
+			$info['NumericScale']=intval($col['NUMERIC_SCALE']);
+		$tableInfo->Columns[$columnId]=new TMssqlTableColumn($info);
 	}
 
 	/**
@@ -164,13 +164,13 @@ 
 	 */
 	protected function createNewTableInfo($col)
 	{
-		$info['CatalogName'] = $col['TABLE_CATALOG'];
-		$info['SchemaName'] = $col['TABLE_SCHEMA'];
-		$info['TableName'] = $col['TABLE_NAME'];
+		$info['CatalogName']=$col['TABLE_CATALOG'];
+		$info['SchemaName']=$col['TABLE_SCHEMA'];
+		$info['TableName']=$col['TABLE_NAME'];
 		if($col['TABLE_TYPE']==='VIEW')
-			$info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($col);
-		$class = $this->getTableInfoClass();
+			$info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($col);
+		$class=$this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
 	}
 
@@ -182,7 +182,7 @@ 
 	 */
 	protected function getConstraintKeys($col)
 	{
-		$sql = <<<EOD
+		$sql=<<<EOD
 		SELECT k.column_name field_name
 				FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE k
 				LEFT JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS c
@@ -193,13 +193,13 @@ 
 			c.constraint_type ='PRIMARY KEY'
 				AND k.table_name = :table
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
-		$primary = [];
+		$primary=[];
 		foreach($command->query()->readAll() as $field)
-			$primary[] = $field['field_name'];
-		$foreign = $this->getForeignConstraints($col);
-		return [$primary,$foreign];
+			$primary[]=$field['field_name'];
+		$foreign=$this->getForeignConstraints($col);
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -211,7 +211,7 @@ 
 	protected function getForeignConstraints($col)
 	{
 		//From http://msdn2.microsoft.com/en-us/library/aa175805(SQL.80).aspx
-		$sql = <<<EOD
+		$sql=<<<EOD
 		SELECT
 				KCU1.CONSTRAINT_NAME AS 'FK_CONSTRAINT_NAME'
 			, KCU1.TABLE_NAME AS 'FK_TABLE_NAME'
@@ -236,14 +236,14 @@ 
 			AND KCU2.ORDINAL_POSITION = KCU1.ORDINAL_POSITION
 		WHERE KCU1.TABLE_NAME = :table
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$fkeys=[];
-		$catalogSchema = "[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
+		$catalogSchema="[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
 		foreach($command->query() as $info)
 		{
-			$fkeys[$info['FK_CONSTRAINT_NAME']]['keys'][$info['FK_COLUMN_NAME']] = $info['UQ_COLUMN_NAME'];
-			$fkeys[$info['FK_CONSTRAINT_NAME']]['table'] = $info['UQ_TABLE_NAME'];
+			$fkeys[$info['FK_CONSTRAINT_NAME']]['keys'][$info['FK_COLUMN_NAME']]=$info['UQ_COLUMN_NAME'];
+			$fkeys[$info['FK_CONSTRAINT_NAME']]['table']=$info['UQ_TABLE_NAME'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}
@@ -280,12 +280,12 @@ 
 		$command->bindParam(":schema", $schema);
 		$rows=$command->queryAll();
 		$names=[];
-		foreach ($rows as $row)
+		foreach($rows as $row)
 		{
-			if ($schema == self::DEFAULT_SCHEMA)
+			if($schema==self::DEFAULT_SCHEMA)
 				$names[]=$row['TABLE_NAME'];
 			else
-				$names[]=$schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
+				$names[]=$schema.'.'.$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
 		}
 
 		return $names;

framework/Data/Common/Mssql/TMssqlTableColumn.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
-	 * @return boolean derived PHP primitive type from the column db type.
+	 * @return string derived PHP primitive type from the column db type.
 	 */
 	public function getPHPType()
 	{

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
  */
 class TMssqlTableColumn extends TDbTableColumn
 {
-	private static $types = [];
+	private static $types=[];
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.

framework/Data/Common/Mysql/TMysqlMetaData.php

Doc Comments +1 added lines

@@ -114,6 +114,7 @@
 	/**
 	 * @param TMysqlTableInfo table information.
 	 * @param array column information.
+	 * @param TMysqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Spacing +70 added lines, -70 removed lines

@@ -80,24 +80,24 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName, $tableName) = $this->getSchemaTableName($table);
-		$find = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
-		$colCase = $this->getDbConnection()->getColumnCase();
-		if($colCase != TDbColumnCaseMode::Preserved)
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
+		$find=$schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
+		$colCase=$this->getDbConnection()->getColumnCase();
+		if($colCase!=TDbColumnCaseMode::Preserved)
 			$this->getDbConnection()->setColumnCase('Preserved');
 		$this->getDbConnection()->setActive(true);
-		$sql = "SHOW FULL FIELDS FROM {$find}";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$tableInfo = $this->createNewTableInfo($table);
+		$sql="SHOW FULL FIELDS FROM {$find}";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$tableInfo=$this->createNewTableInfo($table);
 		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
+			$col['index']=$index++;
 			$this->processColumn($tableInfo, $col);
 		}
 		if($index===0)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
-		if($colCase != TDbColumnCaseMode::Preserved)
+		if($colCase!=TDbColumnCaseMode::Preserved)
 			$this->getDbConnection()->setColumnCase($colCase);
 		return $tableInfo;
 	}
@@ -109,10 +109,10 @@ 
 	{
 		if(!$this->_serverVersion)
 		{
-			$version = $this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
+			$version=$this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
 			$digits=[];
 			preg_match('/(\d+)\.(\d+)\.(\d+)/', $version, $digits);
-			$this->_serverVersion=floatval($digits[1] . '.' . $digits[2] . $digits[3]);
+			$this->_serverVersion=floatval($digits[1].'.'.$digits[2].$digits[3]);
 		}
 		return $this->_serverVersion;
 	}
@@ -123,50 +123,50 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['Field'];
+		$columnId=$col['Field'];
 
-		$info['ColumnName'] = "`$columnId`"; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
+		$info['ColumnName']="`$columnId`"; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
 		if($col['Null']==='YES')
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
 			$info['AutoIncrement']=true;
 		if($col['Default']!=="")
-			$info['DefaultValue'] = $col['Default'];
+			$info['DefaultValue']=$col['Default'];
 
 		if($col['Key']==='PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
-		$info['DbType'] = $col['Type'];
+		$info['DbType']=$col['Type'];
 		$match=[];
 		//find SET/ENUM values, column size, precision, and scale
 		if(preg_match('/\((.*)\)/', $col['Type'], $match))
 		{
-			$info['DbType']= preg_replace('/\(.*\)/', '', $col['Type']);
+			$info['DbType']=preg_replace('/\(.*\)/', '', $col['Type']);
 
 			//find SET/ENUM values
 			if($this->isEnumSetType($info['DbType']))
-				$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
+				$info['DbTypeValues']=preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
 
 			//find column size, precision and scale
-			$pscale = [];
+			$pscale=[];
 			if(preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale))
 			{
 				if($this->isPrecisionType($info['DbType']))
 				{
-					$info['NumericPrecision'] = intval($pscale[1]);
+					$info['NumericPrecision']=intval($pscale[1]);
 					if(count($pscale) > 2)
-						$info['NumericScale'] = intval($pscale[2]);
+						$info['NumericScale']=intval($pscale[2]);
 				}
 				else
-					$info['ColumnSize'] = intval($pscale[1]);
+					$info['ColumnSize']=intval($pscale[1]);
 			}
 		}
 
-		$tableInfo->Columns[$columnId] = new TMysqlTableColumn($info);
+		$tableInfo->Columns[$columnId]=new TMysqlTableColumn($info);
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='decimal' || $type==='dec'
 				|| $type==='float' || $type==='double'
 				|| $type==='double precision' || $type==='real';
@@ -185,7 +185,7 @@ 
 	 */
 	protected function isEnumSetType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='set' || $type==='enum';
 	}
 
@@ -197,12 +197,12 @@ 
 	protected function getSchemaTableName($table)
 	{
 		//remove the back ticks and separate out the "database.table"
-		$result = explode('.', str_replace('`', '', $table));
+		$result=explode('.', str_replace('`', '', $table));
 		foreach($result as $name)
 		{
 			if(!$this->isValidIdentifier($name))
 			{
-				$ref = 'http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
+				$ref='http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
 				throw new TDbException('dbcommon_invalid_identifier_name', $table, $ref);
 			}
 		}
@@ -226,13 +226,13 @@ 
 	 */
 	protected function createNewTableInfo($table)
 	{
-		list($schemaName, $tableName) = $this->getSchemaTableName($table);
-		$info['SchemaName'] = $schemaName;
-		$info['TableName'] = $tableName;
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
+		$info['SchemaName']=$schemaName;
+		$info['TableName']=$tableName;
 		if($this->getIsView($schemaName, $tableName))
-			$info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
+			$info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
 	}
 
@@ -248,22 +248,22 @@ 
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
-		if($this->getServerVersion()<5.01)
+		if($this->getServerVersion() < 5.01)
 			return false;
 		if($schemaName!==null)
-			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
+			$sql="SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
 		else
-			$sql = "SHOW FULL TABLES LIKE :table";
+			$sql="SHOW FULL TABLES LIKE :table";
 
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		try
 		{
-			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
+			return count($result=$command->queryRow()) > 0 && $result['Table_type']==='VIEW';
 		}
 		catch(TDbException $e)
 		{
-			$table = $schemaName===null?$tableName:$schemaName . '.' . $tableName;
+			$table=$schemaName===null ? $tableName : $schemaName.'.'.$tableName;
 			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
 		}
 	}
@@ -276,22 +276,22 @@ 
 	 */
 	protected function getConstraintKeys($schemaName, $tableName)
 	{
-		$table = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
-		$sql = "SHOW INDEX FROM {$table}";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$primary = [];
+		$table=$schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
+		$sql="SHOW INDEX FROM {$table}";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$primary=[];
 		foreach($command->query() as $row)
 		{
 			if($row['Key_name']==='PRIMARY')
-				$primary[] = $row['Column_name'];
+				$primary[]=$row['Column_name'];
 		}
 				// MySQL version was increased to >=5.1.21 instead of 5.x
 				// due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588)
 		if($this->getServerVersion() >= 5.121)
-			$foreign = $this->getForeignConstraints($schemaName, $tableName);
+			$foreign=$this->getForeignConstraints($schemaName, $tableName);
 		else
-			$foreign = $this->findForeignConstraints($schemaName, $tableName);
-		return [$primary,$foreign];
+			$foreign=$this->findForeignConstraints($schemaName, $tableName);
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 */
 	protected function getForeignConstraints($schemaName, $tableName)
 	{
-		$andSchema = $schemaName !== null ? 'AND TABLE_SCHEMA LIKE :schema' : 'AND TABLE_SCHEMA LIKE DATABASE()';
-		$sql = <<<EOD
+		$andSchema=$schemaName!==null ? 'AND TABLE_SCHEMA LIKE :schema' : 'AND TABLE_SCHEMA LIKE DATABASE()';
+		$sql=<<<EOD
 			SELECT
 				CONSTRAINT_NAME as con,
 				COLUMN_NAME as col,
@@ -317,15 +317,15 @@ 
 				AND TABLE_NAME LIKE :table
 				$andSchema
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		if($schemaName!==null)
 			$command->bindValue(':schema', $schemaName);
 		$fkeys=[];
 		foreach($command->query() as $col)
 		{
-			$fkeys[$col['con']]['keys'][$col['col']] = $col['fkcol'];
-			$fkeys[$col['con']]['table'] = $col['fktable'];
+			$fkeys[$col['con']]['keys'][$col['col']]=$col['fkcol'];
+			$fkeys[$col['con']]['table']=$col['fktable'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}
@@ -344,11 +344,11 @@ 
 		//See http://netevil.org/node.php?nid=795&SC=1
 		$this->getDbConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 		if($schemaName!==null)
-			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
+			$sql="SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
 		else
-			$sql = "SHOW CREATE TABLE `{$tableName}`";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$result = $command->queryRow();
+			$sql="SHOW CREATE TABLE `{$tableName}`";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$result=$command->queryRow();
 		return isset($result['Create Table']) ? $result['Create Table'] : (isset($result['Create View']) ? $result['Create View'] : '');
 	}
 
@@ -360,19 +360,19 @@ 
 	 */
 	protected function findForeignConstraints($schemaName, $tableName)
 	{
-		$sql = $this->getShowCreateTable($schemaName, $tableName);
-		$matches =[];
-		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
+		$sql=$this->getShowCreateTable($schemaName, $tableName);
+		$matches=[];
+		$regexp='/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
 		preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER);
-		$foreign = [];
+		$foreign=[];
 		foreach($matches as $match)
 		{
-			$fields = array_map('trim', explode(',', str_replace('`', '', $match[1])));
-			$fk_fields = array_map('trim', explode(',', str_replace('`', '', $match[3])));
+			$fields=array_map('trim', explode(',', str_replace('`', '', $match[1])));
+			$fk_fields=array_map('trim', explode(',', str_replace('`', '', $match[3])));
 			$keys=[];
 			foreach($fields as $k=>$v)
-				$keys[$v] = $fk_fields[$k];
-			$foreign[] = ['keys' => $keys, 'table' => trim($match[2])];
+				$keys[$v]=$fk_fields[$k];
+			$foreign[]=['keys' => $keys, 'table' => trim($match[2])];
 		}
 		return $foreign;
 	}
@@ -402,9 +402,9 @@ 
 	{
 		if($schema==='')
 			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
-		$names=$this->getDbConnection()->createCommand('SHOW TABLES FROM ' . $this->quoteTableName($schema))->queryColumn();
+		$names=$this->getDbConnection()->createCommand('SHOW TABLES FROM '.$this->quoteTableName($schema))->queryColumn();
 		foreach($names as &$name)
-			$name=$schema . '.' . $name;
+			$name=$schema.'.'.$name;
 		return $names;
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 					$info['NumericPrecision'] = intval($pscale[1]);
 					if(count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
-				}
-				else
+				} else
 					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
@@ -260,8 +259,7 @@ 
 		try
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$table = $schemaName===null?$tableName:$schemaName . '.' . $tableName;
 			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Doc Comments +1 added lines

@@ -204,6 +204,7 @@
 	/**
 	 * @param TPgsqlTableInfo table information.
 	 * @param array column information.
+	 * @param TPgsqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Braces +2 added lines, -4 removed lines

@@ -244,11 +244,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 TPgsqlTableColumn($info);

Spacing +59 added lines, -59 removed lines

@@ -28,7 +28,7 @@ 
  */
 class TPgsqlMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'public';
+	private $_defaultSchema='public';
 
 	/**
 	 * @return string TDbTableInfo class name.
@@ -90,10 +90,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]];
 	}
 
 	/**
@@ -103,12 +103,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.attname,
@@ -139,14 +139,14 @@ 
 		ORDER BY a.attnum
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$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)
@@ -161,12 +161,12 @@ 
 	 */
 	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName'] = $this->assertIdentifier($tableName);
+		$info['SchemaName']=$this->assertIdentifier($schemaName);
+		$info['TableName']=$this->assertIdentifier($tableName);
 		if($this->getIsView($schemaName, $tableName))
-			$info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
+			$info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
 	}
 
@@ -179,7 +179,7 @@ 
 	{
 		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
+			$ref='http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -192,17 +192,17 @@ 
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
-		$sql =
+		$sql=
 <<<EOD
 		SELECT count(c.relname) FROM pg_catalog.pg_class c
 		LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
 		WHERE (n.nspname=:schema) AND (c.relkind = 'v'::"char") AND c.relname = :table
 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()) === 1;
+		return intval($command->queryScalar())===1;
 	}
 
 	/**
@@ -211,47 +211,47 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['attname']; //use column name as column Id
+		$columnId=$col['attname']; //use column name as column Id
 
-		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
+		$info['ColumnName']='"'.$columnId.'"'; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
 		if(!$col['attnotnull'])
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['atttypmod'] > 0)
-			$info['ColumnSize'] =  $col['atttypmod'] - 4;
+			$info['ColumnSize']=$col['atttypmod'] - 4;
 		if($col['atthasdef'])
-			$info['DefaultValue'] = $col['adsrc'];
-		if($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(')
+			$info['DefaultValue']=$col['adsrc'];
+		if($col['attisserial'] || substr($col['adsrc'], 0, 8)==='nextval(')
 		{
-			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc']))!==null)
+			if(($sequence=$this->getSequenceName($tableInfo, $col['adsrc']))!==null)
 			{
-				$info['SequenceName'] = $sequence;
+				$info['SequenceName']=$sequence;
 				unset($info['DefaultValue']);
 			}
 		}
-		$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'];
+			$info['DbType']=$col['type'];
 
-		$tableInfo->Columns[$columnId] = new TPgsqlTableColumn($info);
+		$tableInfo->Columns[$columnId]=new TPgsqlTableColumn($info);
 	}
 
 	/**
@@ -259,13 +259,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];
 		}
 	}
 
@@ -274,7 +274,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='numeric' || $type==='interval' || strpos($type, 'time')===0;
 	}
 
@@ -286,7 +286,7 @@ 
 	 */
 	protected function getConstraintKeys($schemaName, $tableName)
 	{
-		$sql =
+		$sql=
 <<<EOD
 	SELECT conname, consrc, contype, indkey, indisclustered FROM (
 			SELECT
@@ -334,25 +334,25 @@ 
 			1
 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($row['contype'])
 			{
 				case 'p':
-					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
+					$primary=$this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
-						$foreign[] = $fkey;
+					if(($fkey=$this->getForeignKeys($row['consrc']))!==null)
+						$foreign[]=$fkey;
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -362,8 +362,8 @@ 
 	 */
 	protected function getPrimaryKeys($tableName, $schemaName, $columnIndex)
 	{
-		$index = implode(', ', explode(' ', $columnIndex));
-		$sql =
+		$index=implode(', ', explode(' ', $columnIndex));
+		$sql=
 <<<EOD
 		SELECT attnum, attname FROM pg_catalog.pg_attribute WHERE
 		attrelid=(
@@ -373,14 +373,14 @@ 
 		)
 				AND attnum IN ({$index})
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
 //		$command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex)));
-		$primary = [];
+		$primary=[];
 		foreach($command->query() as $row)
 		{
-						$primary[] = $row['attname'];
+						$primary[]=$row['attname'];
 		}
 
 		return $primary;
@@ -393,15 +393,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];
 		}
 	}
@@ -444,7 +444,7 @@ 
 			if($schema===self::DEFAULT_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/TDbMetaData.php

Doc Comments -6 removed lines

@@ -127,8 +127,6 @@ 
 	/**
 	 * Quotes a table name for use in a query.
 	 * @param string $name table name
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted table name
 	 */
 	public function quoteTableName($name)
@@ -150,8 +148,6 @@ 
 	/**
 	 * Quotes a column name for use in a query.
 	 * @param string $name column name
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column name
 	 */
 	public function quoteColumnName($name)
@@ -166,8 +162,6 @@ 
 	/**
 	 * Quotes a column alias for use in a query.
 	 * @param string $name column alias
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column alias
 	 */
 	public function quoteColumnAlias($name)

Spacing +20 added lines, -20 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var array
 	 */
-	protected static $delimiterIdentifier = ['[', ']', '"', '`', "'"];
+	protected static $delimiterIdentifier=['[', ']', '"', '`', "'"];
 
 	/**
 	 * @param TDbConnection database connection.
@@ -63,7 +63,7 @@ 
 	public static function getInstance($conn)
 	{
 		$conn->setActive(true); //must be connected before retrieving driver name
-		$driver = $conn->getDriverName();
+		$driver=$conn->getDriverName();
 		switch(strtolower($driver))
 		{
 			case 'pgsql':
@@ -94,12 +94,12 @@ 
 	 */
 	public function getTableInfo($tableName=null)
 	{
-		$key = $tableName===null?$this->getDbConnection()->getConnectionString():$tableName;
+		$key=$tableName===null ? $this->getDbConnection()->getConnectionString() : $tableName;
 		if(!isset($this->_tableInfoCache[$key]))
 		{
-			$class = $this->getTableInfoClass();
-			$tableInfo = $tableName===null ? new $class : $this->createTableInfo($tableName);
-			$this->_tableInfoCache[$key] = $tableInfo;
+			$class=$this->getTableInfoClass();
+			$tableInfo=$tableName===null ? new $class : $this->createTableInfo($tableName);
+			$this->_tableInfoCache[$key]=$tableInfo;
 		}
 		return $this->_tableInfoCache[$key];
 	}
@@ -137,17 +137,17 @@ 
 	 */
 	public function quoteTableName($name)
 	{
-		$name = str_replace(self::$delimiterIdentifier, '', $name);
+		$name=str_replace(self::$delimiterIdentifier, '', $name);
 
-		$args = func_get_args();
-		$rgt = $lft = isset($args[1]) ? $args[1] : '';
-		$rgt = isset($args[2]) ? $args[2] : $rgt;
+		$args=func_get_args();
+		$rgt=$lft=isset($args[1]) ? $args[1] : '';
+		$rgt=isset($args[2]) ? $args[2] : $rgt;
 
 		if(strpos($name, '.')===false)
-			return $lft . $name . $rgt;
+			return $lft.$name.$rgt;
 		$names=explode('.', $name);
 		foreach($names as &$n)
-			$n = $lft . $n . $rgt;
+			$n=$lft.$n.$rgt;
 		return implode('.', $names);
 	}
 
@@ -160,11 +160,11 @@ 
 	 */
 	public function quoteColumnName($name)
 	{
-		$args = func_get_args();
-		$rgt = $lft = isset($args[1]) ? $args[1] : '';
-		$rgt = isset($args[2]) ? $args[2] : $rgt;
+		$args=func_get_args();
+		$rgt=$lft=isset($args[1]) ? $args[1] : '';
+		$rgt=isset($args[2]) ? $args[2] : $rgt;
 
-		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
+		return $lft.str_replace(self::$delimiterIdentifier, '', $name).$rgt;
 	}
 
 	/**
@@ -176,11 +176,11 @@ 
 	 */
 	public function quoteColumnAlias($name)
 	{
-		$args = func_get_args();
-		$rgt = $lft = isset($args[1]) ? $args[1] : '';
-		$rgt = isset($args[2]) ? $args[2] : $rgt;
+		$args=func_get_args();
+		$rgt=$lft=isset($args[1]) ? $args[1] : '';
+		$rgt=isset($args[2]) ? $args[2] : $rgt;
 
-		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
+		return $lft.str_replace(self::$delimiterIdentifier, '', $name).$rgt;
 	}
 
 		/**

framework/Data/DataGateway/TSqlCriteria.php

Doc Comments +3 added lines, -1 removed lines

@@ -188,7 +188,7 @@ 
 	}
 
 	/**
-	 * @return boolean true if the parameter index are string base, false otherwise.
+	 * @return boolean|null true if the parameter index are string base, false otherwise.
 	 */
 	public function getIsNamedParameters()
 	{
@@ -206,6 +206,7 @@ 
 
 	/**
 	 * @param mixed ordering clause.
+	 * @param string $value
 	 */
 	public function setOrdersBy($value)
 	{
@@ -250,6 +251,7 @@ 
 
 	/**
 	 * @param int record offset.
+	 * @param double $value
 	 */
 	public function setOffset($value)
 	{

Spacing +28 added lines, -28 removed lines

@@ -54,10 +54,10 @@ 
 	public function __construct($condition=null, $parameters=[])
 	{
 		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(), 1);
+			$parameters=array_slice(func_get_args(), 1);
 		$this->_parameters=new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy=new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -115,7 +115,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	{
 		if(empty($value)) {
 			// reset the condition
-			$this->_condition = null;
+			$this->_condition=null;
 			return;
 		}
 
@@ -146,7 +146,7 @@ 
 
 		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
 			// condition contains ORDER BY
-			$value = str_replace($matches[0], '', $value);
+			$value=str_replace($matches[0], '', $value);
 			if(strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
 			} elseif(strlen($matches[2]) > 0) {
@@ -156,23 +156,23 @@ 
 
 		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
-			$value = str_replace($matches[0], '', $value); // remove limit from query
+			$value=str_replace($matches[0], '', $value); // remove limit from query
 			if(strpos($matches[1], ',')) { // both offset and limit given
-				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				list($offset, $limit)=explode(',', $matches[1]);
+				$this->_limit=(int) $limit;
+				$this->_offset=(int) $offset;
 			} else { // only limit given
-				$this->_limit = (int)$matches[1];
+				$this->_limit=(int) $matches[1];
 			}
 		}
 
 		if(preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
 			// condition contains offset
-			$value = str_replace($matches[0], '', $value); // remove offset from query
-			$this->_offset = (int)$matches[1]; // set offset in criteria
+			$value=str_replace($matches[0], '', $value); // remove offset from query
+			$this->_offset=(int) $matches[1]; // set offset in criteria
 		}
 
-		$this->_condition = trim($value);
+		$this->_condition=trim($value);
 	}
 
 	/**
@@ -219,12 +219,12 @@ 
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value=trim(preg_replace('/\s+/', ' ', (string)$value));
+			$value=trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys=[];
 			foreach(explode(',', $value) as $orderBy)
 			{
 				$vs=explode(' ', trim($orderBy));
-				$orderBys[$vs[0]]=isset($vs[1])?$vs[1]:'asc';
+				$orderBys[$vs[0]]=isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -267,23 +267,23 @@ 
 	 */
 	public function __toString()
 	{
-		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"' . (string)$this->getCondition() . '"';
-		$params = [];
+		$str='';
+		if(strlen((string) $this->getCondition()) > 0)
+			$str.='"'.(string) $this->getCondition().'"';
+		$params=[];
 		foreach($this->getParameters() as $k=>$v)
-			$params[] = "{$k} => ${v}";
+			$params[]="{$k} => ${v}";
 		if(count($params) > 0)
-			$str .= ', "' . implode(', ', $params) . '"';
-		$orders = [];
+			$str.=', "'.implode(', ', $params).'"';
+		$orders=[];
 		foreach($this->getOrdersBy() as $k=>$v)
-			$orders[] = "{$k} => ${v}";
+			$orders[]="{$k} => ${v}";
 		if(count($orders) > 0)
-			$str .= ', "' . implode(', ', $orders) . '"';
-		if($this->_limit !==null)
-			$str .= ', ' . $this->_limit;
-		if($this->_offset !== null)
-			$str .= ', ' . $this->_offset;
+			$str.=', "'.implode(', ', $orders).'"';
+		if($this->_limit!==null)
+			$str.=', '.$this->_limit;
+		if($this->_offset!==null)
+			$str.=', '.$this->_offset;
 		return $str;
 	}
 }

framework/Data/SqlMap/Configuration/TDiscriminator.php

Doc Comments +3 added lines

@@ -132,6 +132,7 @@ 
 
 	/**
 	 * @param TSubMap add new sub mapping.
+	 * @param TSubMap $subMap
 	 */
 	public function addSubMap($subMap)
 	{
@@ -140,6 +141,7 @@ 
 
 	/**
 	 * @param string database value
+	 * @param string $value
 	 * @return TResultMap result mapping.
 	 */
 	public function getSubMap($value)
@@ -151,6 +153,7 @@ 
 	/**
 	 * Copies the discriminator properties to a new TResultProperty.
 	 * @param TResultMap result map holding the discriminator.
+	 * @param TResultMap $resultMap
 	 */
 	public function initMapping($resultMap)
 	{

Spacing +8 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_column = $value;
+		$this->_column=$value;
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = $value;
+		$this->_type=$value;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function setColumnIndex($value)
 	{
-		$this->_columnIndex = TPropertyValue::ensureInteger($value);
+		$this->_columnIndex=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function addSubMap($subMap)
 	{
-		$this->_subMaps[] = $subMap;
+		$this->_subMaps[]=$subMap;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function initMapping($resultMap)
 	{
-		$this->_mapping = new TResultProperty($resultMap);
+		$this->_mapping=new TResultProperty($resultMap);
 		$this->_mapping->setColumn($this->getColumn());
 		$this->_mapping->setColumnIndex($this->getColumnIndex());
 		$this->_mapping->setType($this->getType());
@@ -173,7 +173,7 @@ 
 	{
 		foreach($this->_subMaps as $subMap)
 		{
-			$this->_resultMaps[$subMap->getValue()] =
+			$this->_resultMaps[$subMap->getValue()]=
 				$manager->getResultMap($subMap->getResultMapping());
 		}
 	}

framework/Data/SqlMap/Configuration/TParameterMap.php

Doc Comments +3 added lines, -1 removed lines

@@ -55,6 +55,7 @@ 
 
 	/**
 	 * @param string a unique identifier for the <parameterMap>.
+	 * @param string $value
 	 */
 	public function setID($value)
 	{
@@ -62,7 +63,7 @@ 
 	}
 
 	/**
-	 * @return TParameterProperty[] list of properties for the parameter map.
+	 * @return TList list of properties for the parameter map.
 	 */
 	public function getProperties()
 	{
@@ -112,6 +113,7 @@ 
 	/**
 	 * @param int parameter property index
 	 * @param TParameterProperty new parameter property.
+	 * @param integer $index
 	 */
 	public function insertProperty($index, TParameterProperty $property)
 	{

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
-		}
-		catch (TInvalidPropertyException $e)
+		} catch (TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',

Spacing +13 added lines, -13 removed lines

@@ -50,8 +50,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_properties = new TList;
-		$this->_propertyMap = new TMap;
+		$this->_properties=new TList;
+		$this->_propertyMap=new TMap;
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extend = $value;
+		$this->_extend=$value;
 	}
 
 	/**
@@ -145,15 +145,15 @@ 
 	 */
 	public function getPropertyValue($registry, $property, $parameterValue)
 	{
-		$value = $this->getObjectValue($parameterValue, $property);
+		$value=$this->getObjectValue($parameterValue, $property);
 
 		if(($handler=$this->createTypeHandler($property, $registry))!==null)
-			$value = $handler->getParameter($value);
+			$value=$handler->getParameter($value);
 
-		$value = $this->nullifyDefaultValue($property, $value);
+		$value=$this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType())!==null)
-			$value = $registry->convertToType($type, $value);
+		if(($type=$property->getType())!==null)
+			$value=$registry->convertToType($type, $value);
 
 		return $value;
 	}
@@ -170,7 +170,7 @@ 
 		$type=$property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler=$registry->getTypeHandler($type);
 		if($handler===null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -187,7 +187,7 @@ 
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
 		}
-		catch (TInvalidPropertyException $e)
+		catch(TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -207,10 +207,10 @@ 
 	 */
 	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue())!==null)
+		if(($nullValue=$property->getNullValue())!==null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue===$value)
+				$value=null;
 		}
 		return $value;
 	}

framework/Data/SqlMap/Configuration/TParameterProperty.php

Doc Comments +1 added lines

@@ -110,6 +110,7 @@
 
 	/**
 	 * @param string name of a property of the parameter object.
+	 * @param string $value
 	 */
 	public function setProperty($value)
 	{

Spacing +13 added lines, -13 removed lines

@@ -51,7 +51,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = $value;
+		$this->_type=$value;
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_column = $value;
+		$this->_column=$value;
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setDbType($value)
 	{
-		$this->_dbType = $value;
+		$this->_dbType=$value;
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_property = $value;
+		$this->_property=$value;
 	}
 
 	/**
@@ -132,18 +132,18 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	public function __sleep()
 	{
-		$exprops = []; $cn = 'TParameterProperty';
-		if ($this->_typeHandler===null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_type===null) $exprops[] = "\0$cn\0_type";
-		if ($this->_column===null) $exprops[] = "\0$cn\0_column";
-		if ($this->_dbType===null) $exprops[] = "\0$cn\0_dbType";
-		if ($this->_property===null) $exprops[] = "\0$cn\0_property";
-		if ($this->_nullValue===null) $exprops[] = "\0$cn\0_nullValue";
+		$exprops=[]; $cn='TParameterProperty';
+		if($this->_typeHandler===null) $exprops[]="\0$cn\0_typeHandler";
+		if($this->_type===null) $exprops[]="\0$cn\0_type";
+		if($this->_column===null) $exprops[]="\0$cn\0_column";
+		if($this->_dbType===null) $exprops[]="\0$cn\0_dbType";
+		if($this->_property===null) $exprops[]="\0$cn\0_property";
+		if($this->_nullValue===null) $exprops[]="\0$cn\0_nullValue";
 		return array_diff(parent::__sleep(), $exprops);
 	}
 }