Commit a727cabd authored by Alexander Miehe's avatar Alexander Miehe

changed some phpdoc's, set correct namespaces and types

parent 8fe368ea
...@@ -105,7 +105,7 @@ class Connection implements DriverConnection ...@@ -105,7 +105,7 @@ class Connection implements DriverConnection
protected $_eventManager; protected $_eventManager;
/** /**
* @var \Doctrine\DBAL\Query\ExpressionBuilder * @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder
*/ */
protected $_expr; protected $_expr;
......
...@@ -80,7 +80,7 @@ class DB2Driver implements Driver ...@@ -80,7 +80,7 @@ class DB2Driver implements Driver
* database schema of the platform this driver connects to. * database schema of the platform this driver connects to.
* *
* @param \Doctrine\DBAL\Connection $conn * @param \Doctrine\DBAL\Connection $conn
* @return \Doctrine\DBAL\SchemaManager * @return \Doctrine\DBAL\Schema\DB2SchemaManager
*/ */
public function getSchemaManager(Connection $conn) public function getSchemaManager(Connection $conn)
{ {
......
...@@ -51,7 +51,7 @@ class MysqliConnection implements Connection ...@@ -51,7 +51,7 @@ class MysqliConnection implements Connection
* *
* Could be used if part of your application is not using DBAL * Could be used if part of your application is not using DBAL
* *
* @return mysqli * @return \mysqli
*/ */
public function getWrappedResourceHandle() public function getWrappedResourceHandle()
{ {
......
...@@ -196,7 +196,7 @@ class MysqliStatement implements \IteratorAggregate, Statement ...@@ -196,7 +196,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
} }
/** /**
* @return null|false|array * @return boolean|array
*/ */
private function _fetch() private function _fetch()
{ {
......
...@@ -95,7 +95,7 @@ class Driver implements \Doctrine\DBAL\Driver ...@@ -95,7 +95,7 @@ class Driver implements \Doctrine\DBAL\Driver
* database schema of the platform this driver connects to. * database schema of the platform this driver connects to.
* *
* @param \Doctrine\DBAL\Connection $conn * @param \Doctrine\DBAL\Connection $conn
* @return \Doctrine\DBAL\SchemaManager * @return \Doctrine\DBAL\Schema\DB2SchemaManager
*/ */
public function getSchemaManager(Connection $conn) public function getSchemaManager(Connection $conn)
{ {
......
...@@ -42,7 +42,7 @@ class Driver implements \Doctrine\DBAL\Driver ...@@ -42,7 +42,7 @@ class Driver implements \Doctrine\DBAL\Driver
* @param string $username * @param string $username
* @param string $password * @param string $password
* @param array $driverOptions * @param array $driverOptions
* @return Connection * @return \Doctrine\DBAL\Driver\PDOConnection
*/ */
public function connect(array $params, $username = null, $password = null, array $driverOptions = array()) public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{ {
......
...@@ -2678,7 +2678,7 @@ abstract class AbstractPlatform ...@@ -2678,7 +2678,7 @@ abstract class AbstractPlatform
* Throws exception if no keyword list is specified. * Throws exception if no keyword list is specified.
* *
* @throws DBALException * @throws DBALException
* @return KeywordList * @return \Doctrine\DBAL\Platforms\Keywords\KeywordList
*/ */
final public function getReservedKeywordsList() final public function getReservedKeywordsList()
{ {
......
...@@ -397,7 +397,7 @@ class DB2Platform extends AbstractPlatform ...@@ -397,7 +397,7 @@ class DB2Platform extends AbstractPlatform
continue; continue;
} }
/* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column; $column = $columnDiff->column;
$queryParts[] = 'ALTER ' . ($columnDiff->oldColumnName) . ' ' $queryParts[] = 'ALTER ' . ($columnDiff->oldColumnName) . ' '
. $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray()); . $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
......
...@@ -291,7 +291,7 @@ class DrizzlePlatform extends AbstractPlatform ...@@ -291,7 +291,7 @@ class DrizzlePlatform extends AbstractPlatform
* C/P from mysql platform * C/P from mysql platform
* *
* @param TableDiff $diff * @param TableDiff $diff
* @return type * @return string
*/ */
public function getAlterTableSQL(TableDiff $diff) public function getAlterTableSQL(TableDiff $diff)
{ {
...@@ -325,7 +325,7 @@ class DrizzlePlatform extends AbstractPlatform ...@@ -325,7 +325,7 @@ class DrizzlePlatform extends AbstractPlatform
continue; continue;
} }
/* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column; $column = $columnDiff->column;
$columnArray = $column->toArray(); $columnArray = $column->toArray();
$columnArray['comment'] = $this->getColumnComment($column); $columnArray['comment'] = $this->getColumnComment($column);
...@@ -386,7 +386,6 @@ class DrizzlePlatform extends AbstractPlatform ...@@ -386,7 +386,6 @@ class DrizzlePlatform extends AbstractPlatform
} }
} }
return $item; return $item;
return $item;
} }
public function getLocateExpression($str, $substr, $startPos = false) public function getLocateExpression($str, $substr, $startPos = false)
......
...@@ -380,7 +380,7 @@ class MySqlPlatform extends AbstractPlatform ...@@ -380,7 +380,7 @@ class MySqlPlatform extends AbstractPlatform
* ) * )
* ); * );
* *
* @return void * @return string
* @override * @override
*/ */
protected function _getCreateTableSQL($tableName, array $columns, array $options = array()) protected function _getCreateTableSQL($tableName, array $columns, array $options = array())
...@@ -480,7 +480,7 @@ class MySqlPlatform extends AbstractPlatform ...@@ -480,7 +480,7 @@ class MySqlPlatform extends AbstractPlatform
continue; continue;
} }
/* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column; $column = $columnDiff->column;
$columnArray = $column->toArray(); $columnArray = $column->toArray();
$columnArray['comment'] = $this->getColumnComment($column); $columnArray['comment'] = $this->getColumnComment($column);
...@@ -633,7 +633,7 @@ class MySqlPlatform extends AbstractPlatform ...@@ -633,7 +633,7 @@ class MySqlPlatform extends AbstractPlatform
* Return the FOREIGN KEY query section dealing with non-standard options * Return the FOREIGN KEY query section dealing with non-standard options
* as MATCH, INITIALLY DEFERRED, ON UPDATE, ... * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
* *
* @param ForeignKeyConstraint $foreignKey * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint $foreignKey
* @return string * @return string
* @override * @override
*/ */
......
...@@ -107,9 +107,9 @@ class OraclePlatform extends AbstractPlatform ...@@ -107,9 +107,9 @@ class OraclePlatform extends AbstractPlatform
* them to the difference in days. This is obviously a restriction of the original functionality, but we * them to the difference in days. This is obviously a restriction of the original functionality, but we
* need to make this a portable function. * need to make this a portable function.
* *
* @param type $date1 * @param string $date1
* @param type $date2 * @param string $date2
* @return type * @return string
*/ */
public function getDateDiffExpression($date1, $date2) public function getDateDiffExpression($date1, $date2)
{ {
...@@ -527,8 +527,8 @@ LEFT JOIN user_cons_columns r_cols ...@@ -527,8 +527,8 @@ LEFT JOIN user_cons_columns r_cols
} }
/** /**
* @param ForeignKeyConstraint|string $foreignKey * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint|string $foreignKey
* @param Table|string $table * @param \Doctrine\DBAL\Schema\Table|string $table
* @return string * @return string
*/ */
public function getDropForeignKeySQL($foreignKey, $table) public function getDropForeignKeySQL($foreignKey, $table)
......
...@@ -316,8 +316,7 @@ class PostgreSqlPlatform extends AbstractPlatform ...@@ -316,8 +316,7 @@ class PostgreSqlPlatform extends AbstractPlatform
* create a new database * create a new database
* *
* @param string $name name of the database that should be created * @param string $name name of the database that should be created
* @throws PDOException * @return string
* @return void
* @override * @override
*/ */
public function getCreateDatabaseSQL($name) public function getCreateDatabaseSQL($name)
...@@ -329,7 +328,6 @@ class PostgreSqlPlatform extends AbstractPlatform ...@@ -329,7 +328,6 @@ class PostgreSqlPlatform extends AbstractPlatform
* drop an existing database * drop an existing database
* *
* @param string $name name of the database that should be dropped * @param string $name name of the database that should be dropped
* @throws PDOException
* @access public * @access public
*/ */
public function getDropDatabaseSQL($name) public function getDropDatabaseSQL($name)
...@@ -502,7 +500,7 @@ class PostgreSqlPlatform extends AbstractPlatform ...@@ -502,7 +500,7 @@ class PostgreSqlPlatform extends AbstractPlatform
} }
/** /**
* @param ForeignKeyConstraint|string $foreignKey * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint|string $foreignKey
* @param Table|string $table * @param Table|string $table
* @return string * @return string
*/ */
...@@ -514,10 +512,10 @@ class PostgreSqlPlatform extends AbstractPlatform ...@@ -514,10 +512,10 @@ class PostgreSqlPlatform extends AbstractPlatform
/** /**
* Gets the SQL used to create a table. * Gets the SQL used to create a table.
* *
* @param unknown_type $tableName * @param string $tableName
* @param array $columns * @param array $columns
* @param array $options * @param array $options
* @return unknown * @return string
*/ */
protected function _getCreateTableSQL($tableName, array $columns, array $options = array()) protected function _getCreateTableSQL($tableName, array $columns, array $options = array())
{ {
......
...@@ -342,7 +342,7 @@ class SQLServerPlatform extends AbstractPlatform ...@@ -342,7 +342,7 @@ class SQLServerPlatform extends AbstractPlatform
continue; continue;
} }
/* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column; $column = $columnDiff->column;
$queryParts[] = 'ALTER COLUMN ' . $queryParts[] = 'ALTER COLUMN ' .
$this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray()); $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
......
...@@ -283,7 +283,7 @@ class SqlitePlatform extends AbstractPlatform ...@@ -283,7 +283,7 @@ class SqlitePlatform extends AbstractPlatform
* ); * );
* @param array $options An associative array of table options: * @param array $options An associative array of table options:
* *
* @return void * @return string
* @override * @override
*/ */
protected function _getCreateTableSQL($name, array $columns, array $options = array()) protected function _getCreateTableSQL($name, array $columns, array $options = array())
......
...@@ -39,7 +39,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement ...@@ -39,7 +39,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
private $portability; private $portability;
/** /**
* @var Doctrine\DBAL\Driver\Statement * @var \Doctrine\DBAL\Driver\Statement
*/ */
private $stmt; private $stmt;
......
...@@ -403,7 +403,7 @@ abstract class AbstractSchemaManager ...@@ -403,7 +403,7 @@ abstract class AbstractSchemaManager
* Create a new sequence * Create a new sequence
* *
* @param Sequence $sequence * @param Sequence $sequence
* @throws Doctrine\DBAL\ConnectionException if something fails at database level * @throws \Doctrine\DBAL\ConnectionException if something fails at database level
*/ */
public function createSequence($sequence) public function createSequence($sequence)
{ {
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
namespace Doctrine\DBAL\Schema; namespace Doctrine\DBAL\Schema;
use Doctrine\DBAL\Event\SchemaIndexDefinitionEventArgs; use Doctrine\DBAL\Event\SchemaIndexDefinitionEventArgs;
use Doctrine\DBAL\Events;
/** /**
* IBM Db2 Schema Manager * IBM Db2 Schema Manager
......
...@@ -84,7 +84,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager ...@@ -84,7 +84,7 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
* *
* This is a PostgreSQL only function. * This is a PostgreSQL only function.
* *
* @return type * @return void
*/ */
public function determineExistingSchemaSearchPaths() public function determineExistingSchemaSearchPaths()
{ {
......
...@@ -293,7 +293,7 @@ class Schema extends AbstractAsset ...@@ -293,7 +293,7 @@ class Schema extends AbstractAsset
/** /**
* Return an array of necessary sql queries to create the schema on the given platform. * Return an array of necessary sql queries to create the schema on the given platform.
* *
* @param AbstractPlatform $platform * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
* @return array * @return array
*/ */
public function toSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform) public function toSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
...@@ -307,7 +307,7 @@ class Schema extends AbstractAsset ...@@ -307,7 +307,7 @@ class Schema extends AbstractAsset
/** /**
* Return an array of necessary sql queries to drop the schema on the given platform. * Return an array of necessary sql queries to drop the schema on the given platform.
* *
* @param AbstractPlatform $platform * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
* @return array * @return array
*/ */
public function toDropSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform) public function toDropSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
...@@ -320,7 +320,7 @@ class Schema extends AbstractAsset ...@@ -320,7 +320,7 @@ class Schema extends AbstractAsset
/** /**
* @param Schema $toSchema * @param Schema $toSchema
* @param AbstractPlatform $platform * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
*/ */
public function getMigrateToSql(Schema $toSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform) public function getMigrateToSql(Schema $toSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
{ {
...@@ -331,7 +331,7 @@ class Schema extends AbstractAsset ...@@ -331,7 +331,7 @@ class Schema extends AbstractAsset
/** /**
* @param Schema $fromSchema * @param Schema $fromSchema
* @param AbstractPlatform $platform * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
*/ */
public function getMigrateFromSql(Schema $fromSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform) public function getMigrateFromSql(Schema $fromSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
{ {
......
...@@ -94,7 +94,7 @@ class SchemaConfig ...@@ -94,7 +94,7 @@ class SchemaConfig
/** /**
* set default namespace name of schema objects. * set default namespace name of schema objects.
* *
* @param _name the value to set. * @param string $name the value to set.
*/ */
public function setName($name) public function setName($name)
{ {
......
...@@ -28,6 +28,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform, ...@@ -28,6 +28,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform,
Doctrine\DBAL\Schema\ForeignKeyConstraint, Doctrine\DBAL\Schema\ForeignKeyConstraint,
Doctrine\DBAL\Schema\Constraint, Doctrine\DBAL\Schema\Constraint,
Doctrine\DBAL\Schema\Sequence, Doctrine\DBAL\Schema\Sequence,
Doctrine\DBAL\Schema\SchemaException,
Doctrine\DBAL\Schema\Index; Doctrine\DBAL\Schema\Index;
/** /**
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
namespace Doctrine\DBAL\Tools\Console\Command; namespace Doctrine\DBAL\Tools\Console\Command;
use Symfony\Component\Console\Input\InputArgument, use Symfony\Component\Console\Input\nputArgument,
Symfony\Component\Console; Symfony\Component\Console;
/** /**
......
...@@ -93,7 +93,7 @@ EOT ...@@ -93,7 +93,7 @@ EOT
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
/* @var $conn Doctrine\DBAL\Connection */ /* @var $conn \Doctrine\DBAL\Connection */
$conn = $this->getHelper('db')->getConnection(); $conn = $this->getHelper('db')->getConnection();
$keywordLists = (array)$input->getOption('list'); $keywordLists = (array)$input->getOption('list');
......
...@@ -43,7 +43,7 @@ class VarDateTimeType extends DateTimeType ...@@ -43,7 +43,7 @@ class VarDateTimeType extends DateTimeType
* @throws ConversionException * @throws ConversionException
* @param string $value * @param string $value
* @param AbstractPlatform $platform * @param AbstractPlatform $platform
* @return DateTime * @return \DateTime
*/ */
public function convertToPHPValue($value, AbstractPlatform $platform) public function convertToPHPValue($value, AbstractPlatform $platform)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment