Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

changed some phpdoc's, set correct namespaces and types #149

Merged
merged 2 commits into from

4 participants

Alexander Miehe Don't Add Me To Your Organization a.k.a The Travis Bot Christophe Coevoet Benjamin Eberlei
Alexander Miehe

No description provided.

Don't Add Me To Your Organization a.k.a The Travis Bot

This pull request fails (merged a727cab into 8fe368e).

...Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
@@ -19,7 +19,7 @@
namespace Doctrine\DBAL\Tools\Console\Command;
-use Symfony\Component\Console\Input\InputArgument,
+use Symfony\Component\Console\Input\nputArgument,
Christophe Coevoet
stof added a note

this is wrong and will break things

Alexander Miehe
Engerim added a note

Ops, my mistake, this should not be so.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Don't Add Me To Your Organization a.k.a The Travis Bot

This pull request fails (merged 331e579 into 8fe368e).

Christophe Coevoet

Note that the failure reported by @travisbot is unrelated to the PR. The testsuite fails in the doctrine master branch too (see #150 for the fix)

Benjamin Eberlei beberlei merged commit 004854f into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 18, 2012
  1. Alexander Miehe
  2. Alexander Miehe

    Added removed "I"

    Engerim authored
This page is out of date. Refresh to see the latest.
Showing with 36 additions and 37 deletions.
  1. +1 −1  lib/Doctrine/DBAL/Connection.php
  2. +1 −1  lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
  3. +1 −1  lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
  4. +1 −1  lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
  5. +1 −1  lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
  6. +1 −1  lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
  7. +1 −1  lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
  8. +1 −1  lib/Doctrine/DBAL/Platforms/DB2Platform.php
  9. +2 −3 lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
  10. +3 −3 lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
  11. +5 −5 lib/Doctrine/DBAL/Platforms/OraclePlatform.php
  12. +4 −6 lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
  13. +1 −1  lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
  14. +1 −1  lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
  15. +1 −1  lib/Doctrine/DBAL/Portability/Statement.php
  16. +1 −1  lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
  17. +1 −0  lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
  18. +1 −1  lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
  19. +4 −4 lib/Doctrine/DBAL/Schema/Schema.php
  20. +1 −1  lib/Doctrine/DBAL/Schema/SchemaConfig.php
  21. +1 −0  lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php
  22. +1 −1  lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
  23. +1 −1  lib/Doctrine/DBAL/Types/VarDateTimeType.php
2  lib/Doctrine/DBAL/Connection.php
View
@@ -105,7 +105,7 @@ class Connection implements DriverConnection
protected $_eventManager;
/**
- * @var \Doctrine\DBAL\Query\ExpressionBuilder
+ * @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder
*/
protected $_expr;
2  lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
View
@@ -80,7 +80,7 @@ public function getDatabasePlatform()
* database schema of the platform this driver connects to.
*
* @param \Doctrine\DBAL\Connection $conn
- * @return \Doctrine\DBAL\SchemaManager
+ * @return \Doctrine\DBAL\Schema\DB2SchemaManager
*/
public function getSchemaManager(Connection $conn)
{
2  lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View
@@ -51,7 +51,7 @@ public function __construct(array $params, $username, $password, array $driverOp
*
* Could be used if part of your application is not using DBAL
*
- * @return mysqli
+ * @return \mysqli
*/
public function getWrappedResourceHandle()
{
2  lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
View
@@ -196,7 +196,7 @@ private function _bindValues($values)
}
/**
- * @return null|false|array
+ * @return boolean|array
*/
private function _fetch()
{
2  lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
View
@@ -95,7 +95,7 @@ public function getDatabasePlatform()
* database schema of the platform this driver connects to.
*
* @param \Doctrine\DBAL\Connection $conn
- * @return \Doctrine\DBAL\SchemaManager
+ * @return \Doctrine\DBAL\Schema\DB2SchemaManager
*/
public function getSchemaManager(Connection $conn)
{
2  lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
View
@@ -42,7 +42,7 @@ class Driver implements \Doctrine\DBAL\Driver
* @param string $username
* @param string $password
* @param array $driverOptions
- * @return Connection
+ * @return \Doctrine\DBAL\Driver\PDOConnection
*/
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
2  lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View
@@ -2678,7 +2678,7 @@ public function rollbackSavePoint($savepoint)
* Throws exception if no keyword list is specified.
*
* @throws DBALException
- * @return KeywordList
+ * @return \Doctrine\DBAL\Platforms\Keywords\KeywordList
*/
final public function getReservedKeywordsList()
{
2  lib/Doctrine/DBAL/Platforms/DB2Platform.php
View
@@ -397,7 +397,7 @@ public function getAlterTableSQL(TableDiff $diff)
continue;
}
- /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
+ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column;
$queryParts[] = 'ALTER ' . ($columnDiff->oldColumnName) . ' '
. $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
5 lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
View
@@ -291,7 +291,7 @@ public function getDateTypeDeclarationSQL(array $fieldDeclaration)
* C/P from mysql platform
*
* @param TableDiff $diff
- * @return type
+ * @return string
*/
public function getAlterTableSQL(TableDiff $diff)
{
@@ -325,7 +325,7 @@ public function getAlterTableSQL(TableDiff $diff)
continue;
}
- /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
+ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column;
$columnArray = $column->toArray();
$columnArray['comment'] = $this->getColumnComment($column);
@@ -386,7 +386,6 @@ public function convertBooleans($item)
}
}
return $item;
- return $item;
}
public function getLocateExpression($str, $substr, $startPos = false)
6 lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View
@@ -380,7 +380,7 @@ public function getDropDatabaseSQL($name)
* )
* );
*
- * @return void
+ * @return string
* @override
*/
protected function _getCreateTableSQL($tableName, array $columns, array $options = array())
@@ -480,7 +480,7 @@ public function getAlterTableSQL(TableDiff $diff)
continue;
}
- /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
+ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column;
$columnArray = $column->toArray();
$columnArray['comment'] = $this->getColumnComment($column);
@@ -633,7 +633,7 @@ protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
* Return the FOREIGN KEY query section dealing with non-standard options
* as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
*
- * @param ForeignKeyConstraint $foreignKey
+ * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint $foreignKey
* @return string
* @override
*/
10 lib/Doctrine/DBAL/Platforms/OraclePlatform.php
View
@@ -107,9 +107,9 @@ public function getGuidExpression()
* them to the difference in days. This is obviously a restriction of the original functionality, but we
* need to make this a portable function.
*
- * @param type $date1
- * @param type $date2
- * @return type
+ * @param string $date1
+ * @param string $date2
+ * @return string
*/
public function getDateDiffExpression($date1, $date2)
{
@@ -527,8 +527,8 @@ public function getDropSequenceSQL($sequence)
}
/**
- * @param ForeignKeyConstraint|string $foreignKey
- * @param Table|string $table
+ * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint|string $foreignKey
+ * @param \Doctrine\DBAL\Schema\Table|string $table
* @return string
*/
public function getDropForeignKeySQL($foreignKey, $table)
10 lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View
@@ -316,8 +316,7 @@ public function getListTableColumnsSQL($table, $database = null)
* create a new database
*
* @param string $name name of the database that should be created
- * @throws PDOException
- * @return void
+ * @return string
* @override
*/
public function getCreateDatabaseSQL($name)
@@ -329,7 +328,6 @@ public function getCreateDatabaseSQL($name)
* drop an existing database
*
* @param string $name name of the database that should be dropped
- * @throws PDOException
* @access public
*/
public function getDropDatabaseSQL($name)
@@ -502,7 +500,7 @@ public function getDropSequenceSQL($sequence)
}
/**
- * @param ForeignKeyConstraint|string $foreignKey
+ * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint|string $foreignKey
* @param Table|string $table
* @return string
*/
@@ -514,10 +512,10 @@ public function getDropForeignKeySQL($foreignKey, $table)
/**
* Gets the SQL used to create a table.
*
- * @param unknown_type $tableName
+ * @param string $tableName
* @param array $columns
* @param array $options
- * @return unknown
+ * @return string
*/
protected function _getCreateTableSQL($tableName, array $columns, array $options = array())
{
2  lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
View
@@ -342,7 +342,7 @@ public function getAlterTableSQL(TableDiff $diff)
continue;
}
- /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
+ /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
$column = $columnDiff->column;
$queryParts[] = 'ALTER COLUMN ' .
$this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
2  lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View
@@ -283,7 +283,7 @@ protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
* );
* @param array $options An associative array of table options:
*
- * @return void
+ * @return string
* @override
*/
protected function _getCreateTableSQL($name, array $columns, array $options = array())
2  lib/Doctrine/DBAL/Portability/Statement.php
View
@@ -39,7 +39,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
private $portability;
/**
- * @var Doctrine\DBAL\Driver\Statement
+ * @var \Doctrine\DBAL\Driver\Statement
*/
private $stmt;
2  lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
View
@@ -403,7 +403,7 @@ public function createTable(Table $table)
* Create a new 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)
{
1  lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
View
@@ -22,6 +22,7 @@
namespace Doctrine\DBAL\Schema;
use Doctrine\DBAL\Event\SchemaIndexDefinitionEventArgs;
+use Doctrine\DBAL\Events;
/**
* IBM Db2 Schema Manager
2  lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
View
@@ -84,7 +84,7 @@ public function getExistingSchemaSearchPaths()
*
* This is a PostgreSQL only function.
*
- * @return type
+ * @return void
*/
public function determineExistingSchemaSearchPaths()
{
8 lib/Doctrine/DBAL/Schema/Schema.php
View
@@ -293,7 +293,7 @@ public function dropSequence($sequenceName)
/**
* 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
*/
public function toSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
@@ -307,7 +307,7 @@ public function toSql(\Doctrine\DBAL\Platforms\AbstractPlatform $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
*/
public function toDropSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
@@ -320,7 +320,7 @@ public function toDropSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
/**
* @param Schema $toSchema
- * @param AbstractPlatform $platform
+ * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
*/
public function getMigrateToSql(Schema $toSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
{
@@ -331,7 +331,7 @@ public function getMigrateToSql(Schema $toSchema, \Doctrine\DBAL\Platforms\Abstr
/**
* @param Schema $fromSchema
- * @param AbstractPlatform $platform
+ * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
*/
public function getMigrateFromSql(Schema $fromSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
{
2  lib/Doctrine/DBAL/Schema/SchemaConfig.php
View
@@ -94,7 +94,7 @@ public function getName()
/**
* set default namespace name of schema objects.
*
- * @param _name the value to set.
+ * @param string $name the value to set.
*/
public function setName($name)
{
1  lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php
View
@@ -28,6 +28,7 @@
Doctrine\DBAL\Schema\ForeignKeyConstraint,
Doctrine\DBAL\Schema\Constraint,
Doctrine\DBAL\Schema\Sequence,
+ Doctrine\DBAL\Schema\SchemaException,
Doctrine\DBAL\Schema\Index;
/**
2  lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
View
@@ -93,7 +93,7 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- /* @var $conn Doctrine\DBAL\Connection */
+ /* @var $conn \Doctrine\DBAL\Connection */
$conn = $this->getHelper('db')->getConnection();
$keywordLists = (array)$input->getOption('list');
2  lib/Doctrine/DBAL/Types/VarDateTimeType.php
View
@@ -43,7 +43,7 @@ class VarDateTimeType extends DateTimeType
* @throws ConversionException
* @param string $value
* @param AbstractPlatform $platform
- * @return DateTime
+ * @return \DateTime
*/
public function convertToPHPValue($value, AbstractPlatform $platform)
{
Something went wrong with that request. Please try again.