pradosoft / prado

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Doc Comments +2 added lines, -1 removed lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * Fetch results for current relationship.
+	 * @param TActiveRecord $obj
 	 * @return boolean always true.
 	 */
 	public function fetchResultsInto($obj)
@@ -104,7 +105,6 @@ 
 	 * Returns foreign keys in $fromRecord with source column names as key
 	 * and foreign column names in the corresponding $matchesRecord as value.
 	 * The method returns the first matching foreign key between these 2 records.
-	 * @param TActiveRecord $fromRecord
 	 * @param TActiveRecord $matchesRecord
 	 * @return array foreign keys with source column names as key and foreign column names as value.
 	 */
@@ -212,6 +212,7 @@ 
 	 * @param array source property names
 	 * @param array foreign objects
 	 * @param array foreign object field names.
+	 * @param TActiveRecord[] $fkObjects
 	 */
 	protected function populateResult(&$results,$properties,&$fkObjects,$fields)
 	{

Braces +5 added lines, -6 removed lines

@@ -83,10 +83,10 @@ 
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
-		}
-		else if($results instanceof TActiveRecordRelation)
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} else if($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
 		else if($results === null || !$validArray)
 			$stack = array();
@@ -236,8 +236,7 @@ 
 		{
 			for($i=0,$k=count($results);$i<$k;$i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
-		}
-		else
+		} else
 			$this->setObjectProperty($results, $properties, $collections);
 	}
 

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

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 		return $control;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getDefaultControlValue($container,$column, $record)
 	{
 		$control = $container->findControl(self::DEFAULT_ID);

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

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

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

Braces +2 added lines, -4 removed lines

@@ -154,8 +154,7 @@ 
 					$info['NumericPrecision'] = intval($pscale[1]);
 					if(count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
-				}
-				else
+				} else
 					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
@@ -254,8 +253,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/Oracle/TOracleMetaData.php

Doc Comments +3 added lines, -1 removed lines

@@ -145,7 +145,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)
 	{
@@ -167,6 +167,7 @@ 
 	/**
 	 * @param TOracleTableInfo table information.
 	 * @param array column information.
+	 * @param TOracleTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
@@ -322,6 +323,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)

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

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

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)

framework/Data/Common/TDbTableColumn.php

Doc Comments +1 added lines

@@ -34,6 +34,7 @@
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
 	 * @return mixed information array value.
 	 */
 	protected function getInfo($name,$default=null)