Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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

Merged
merged 2 commits into from almost 2 years ago

4 participants

Alexander Miehe Don't Add Me To Your Organization a.k.a The Travis Bot Christophe Coevoet Benjamin Eberlei
Alexander Miehe
Engerim commented May 18, 2012

No description provided.

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

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

lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
@@ -19,7 +19,7 @@
19 19
 
20 20
 namespace Doctrine\DBAL\Tools\Console\Command;
21 21
 
22  
-use Symfony\Component\Console\Input\InputArgument,
  22
+use Symfony\Component\Console\Input\nputArgument,
2
Christophe Coevoet
stof added a note May 18, 2012

this is wrong and will break things

Alexander Miehe
Engerim added a note May 18, 2012

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
stof commented May 18, 2012

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 May 22, 2012
Benjamin Eberlei beberlei closed this May 22, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.

Showing 23 changed files with 36 additions and 37 deletions. Show diff stats Hide diff stats

  1. 2  lib/Doctrine/DBAL/Connection.php
  2. 2  lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
  3. 2  lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
  4. 2  lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
  5. 2  lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
  6. 2  lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
  7. 2  lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
  8. 2  lib/Doctrine/DBAL/Platforms/DB2Platform.php
  9. 5  lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
  10. 6  lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
  11. 10  lib/Doctrine/DBAL/Platforms/OraclePlatform.php
  12. 10  lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
  13. 2  lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
  14. 2  lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
  15. 2  lib/Doctrine/DBAL/Portability/Statement.php
  16. 2  lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
  17. 1  lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
  18. 2  lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
  19. 8  lib/Doctrine/DBAL/Schema/Schema.php
  20. 2  lib/Doctrine/DBAL/Schema/SchemaConfig.php
  21. 1  lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php
  22. 2  lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
  23. 2  lib/Doctrine/DBAL/Types/VarDateTimeType.php
2  lib/Doctrine/DBAL/Connection.php
@@ -105,7 +105,7 @@ class Connection implements DriverConnection
105 105
     protected $_eventManager;
106 106
 
107 107
     /**
108  
-     * @var \Doctrine\DBAL\Query\ExpressionBuilder
  108
+     * @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder
109 109
      */
110 110
     protected $_expr;
111 111
 
2  lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
@@ -80,7 +80,7 @@ public function getDatabasePlatform()
80 80
      * database schema of the platform this driver connects to.
81 81
      *
82 82
      * @param  \Doctrine\DBAL\Connection $conn
83  
-     * @return \Doctrine\DBAL\SchemaManager
  83
+     * @return \Doctrine\DBAL\Schema\DB2SchemaManager
84 84
      */
85 85
     public function getSchemaManager(Connection $conn)
86 86
     {
2  lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
@@ -51,7 +51,7 @@ public function __construct(array $params, $username, $password, array $driverOp
51 51
      *
52 52
      * Could be used if part of your application is not using DBAL
53 53
      *
54  
-     * @return mysqli
  54
+     * @return \mysqli
55 55
      */
56 56
     public function getWrappedResourceHandle()
57 57
     {
2  lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
@@ -196,7 +196,7 @@ private function _bindValues($values)
196 196
     }
197 197
 
198 198
     /**
199  
-     * @return null|false|array
  199
+     * @return boolean|array
200 200
      */
201 201
     private function _fetch()
202 202
     {
2  lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
@@ -95,7 +95,7 @@ public function getDatabasePlatform()
95 95
      * database schema of the platform this driver connects to.
96 96
      *
97 97
      * @param  \Doctrine\DBAL\Connection $conn
98  
-     * @return \Doctrine\DBAL\SchemaManager
  98
+     * @return \Doctrine\DBAL\Schema\DB2SchemaManager
99 99
      */
100 100
     public function getSchemaManager(Connection $conn)
101 101
     {
2  lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
@@ -42,7 +42,7 @@ class Driver implements \Doctrine\DBAL\Driver
42 42
      * @param string $username
43 43
      * @param string $password
44 44
      * @param array $driverOptions
45  
-     * @return Connection
  45
+     * @return \Doctrine\DBAL\Driver\PDOConnection
46 46
      */
47 47
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
48 48
     {
2  lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -2678,7 +2678,7 @@ public function rollbackSavePoint($savepoint)
2678 2678
      * Throws exception if no keyword list is specified.
2679 2679
      *
2680 2680
      * @throws DBALException
2681  
-     * @return KeywordList
  2681
+     * @return \Doctrine\DBAL\Platforms\Keywords\KeywordList
2682 2682
      */
2683 2683
     final public function getReservedKeywordsList()
2684 2684
     {
2  lib/Doctrine/DBAL/Platforms/DB2Platform.php
@@ -397,7 +397,7 @@ public function getAlterTableSQL(TableDiff $diff)
397 397
                 continue;
398 398
             }
399 399
 
400  
-            /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
  400
+            /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
401 401
             $column = $columnDiff->column;
402 402
             $queryParts[] =  'ALTER ' . ($columnDiff->oldColumnName) . ' '
403 403
                     . $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
5  lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
@@ -291,7 +291,7 @@ public function getDateTypeDeclarationSQL(array $fieldDeclaration)
291 291
      * C/P from mysql platform
292 292
      *
293 293
      * @param TableDiff $diff
294  
-     * @return type
  294
+     * @return string
295 295
      */
296 296
     public function getAlterTableSQL(TableDiff $diff)
297 297
     {
@@ -325,7 +325,7 @@ public function getAlterTableSQL(TableDiff $diff)
325 325
                 continue;
326 326
             }
327 327
 
328  
-            /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
  328
+            /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
329 329
             $column = $columnDiff->column;
330 330
             $columnArray = $column->toArray();
331 331
             $columnArray['comment'] = $this->getColumnComment($column);
@@ -386,7 +386,6 @@ public function convertBooleans($item)
386 386
            }
387 387
         }
388 388
         return $item;
389  
-        return $item;
390 389
     }
391 390
 
392 391
     public function getLocateExpression($str, $substr, $startPos = false)
6  lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
@@ -380,7 +380,7 @@ public function getDropDatabaseSQL($name)
380 380
      *                              )
381 381
      *                          );
382 382
      *
383  
-     * @return void
  383
+     * @return string
384 384
      * @override
385 385
      */
386 386
     protected function _getCreateTableSQL($tableName, array $columns, array $options = array())
@@ -480,7 +480,7 @@ public function getAlterTableSQL(TableDiff $diff)
480 480
                 continue;
481 481
             }
482 482
 
483  
-            /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
  483
+            /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
484 484
             $column = $columnDiff->column;
485 485
             $columnArray = $column->toArray();
486 486
             $columnArray['comment'] = $this->getColumnComment($column);
@@ -633,7 +633,7 @@ protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
633 633
      * Return the FOREIGN KEY query section dealing with non-standard options
634 634
      * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
635 635
      *
636  
-     * @param ForeignKeyConstraint $foreignKey
  636
+     * @param \Doctrine\DBAL\Schema\ForeignKeyConstraint $foreignKey
637 637
      * @return string
638 638
      * @override
639 639
      */
10  lib/Doctrine/DBAL/Platforms/OraclePlatform.php
@@ -107,9 +107,9 @@ public function getGuidExpression()
107 107
      * them to the difference in days. This is obviously a restriction of the original functionality, but we
108 108
      * need to make this a portable function.
109 109
      *
110  
-     * @param type $date1
111  
-     * @param type $date2
112  
-     * @return type
  110
+     * @param string $date1
  111
+     * @param string $date2
  112
+     * @return string
113 113
      */
114 114
     public function getDateDiffExpression($date1, $date2)
115 115
     {
@@ -527,8 +527,8 @@ public function getDropSequenceSQL($sequence)
527 527
     }
528 528
 
529 529
     /**
530  
-     * @param  ForeignKeyConstraint|string $foreignKey
531  
-     * @param  Table|string $table
  530
+     * @param  \Doctrine\DBAL\Schema\ForeignKeyConstraint|string $foreignKey
  531
+     * @param  \Doctrine\DBAL\Schema\Table|string $table
532 532
      * @return string
533 533
      */
534 534
     public function getDropForeignKeySQL($foreignKey, $table)
10  lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
@@ -316,8 +316,7 @@ public function getListTableColumnsSQL($table, $database = null)
316 316
      * create a new database
317 317
      *
318 318
      * @param string $name name of the database that should be created
319  
-     * @throws PDOException
320  
-     * @return void
  319
+     * @return string
321 320
      * @override
322 321
      */
323 322
     public function getCreateDatabaseSQL($name)
@@ -329,7 +328,6 @@ public function getCreateDatabaseSQL($name)
329 328
      * drop an existing database
330 329
      *
331 330
      * @param string $name name of the database that should be dropped
332  
-     * @throws PDOException
333 331
      * @access public
334 332
      */
335 333
     public function getDropDatabaseSQL($name)
@@ -502,7 +500,7 @@ public function getDropSequenceSQL($sequence)
502 500
     }
503 501
 
504 502
     /**
505  
-     * @param  ForeignKeyConstraint|string $foreignKey
  503
+     * @param  \Doctrine\DBAL\Schema\ForeignKeyConstraint|string $foreignKey
506 504
      * @param  Table|string $table
507 505
      * @return string
508 506
      */
@@ -514,10 +512,10 @@ public function getDropForeignKeySQL($foreignKey, $table)
514 512
     /**
515 513
      * Gets the SQL used to create a table.
516 514
      *
517  
-     * @param unknown_type $tableName
  515
+     * @param string $tableName
518 516
      * @param array $columns
519 517
      * @param array $options
520  
-     * @return unknown
  518
+     * @return string
521 519
      */
522 520
     protected function _getCreateTableSQL($tableName, array $columns, array $options = array())
523 521
     {
2  lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
@@ -342,7 +342,7 @@ public function getAlterTableSQL(TableDiff $diff)
342 342
                 continue;
343 343
             }
344 344
 
345  
-            /* @var $columnDiff Doctrine\DBAL\Schema\ColumnDiff */
  345
+            /* @var $columnDiff \Doctrine\DBAL\Schema\ColumnDiff */
346 346
             $column = $columnDiff->column;
347 347
             $queryParts[] = 'ALTER COLUMN ' .
348 348
                     $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
2  lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
@@ -283,7 +283,7 @@ protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
283 283
      *                          );
284 284
      * @param array $options  An associative array of table options:
285 285
      *
286  
-     * @return void
  286
+     * @return string
287 287
      * @override
288 288
      */
289 289
     protected function _getCreateTableSQL($name, array $columns, array $options = array())
2  lib/Doctrine/DBAL/Portability/Statement.php
@@ -39,7 +39,7 @@ class Statement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
39 39
     private $portability;
40 40
 
41 41
     /**
42  
-     * @var Doctrine\DBAL\Driver\Statement
  42
+     * @var \Doctrine\DBAL\Driver\Statement
43 43
      */
44 44
     private $stmt;
45 45
 
2  lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
@@ -403,7 +403,7 @@ public function createTable(Table $table)
403 403
      * Create a new sequence
404 404
      *
405 405
      * @param Sequence $sequence
406  
-     * @throws Doctrine\DBAL\ConnectionException     if something fails at database level
  406
+     * @throws \Doctrine\DBAL\ConnectionException     if something fails at database level
407 407
      */
408 408
     public function createSequence($sequence)
409 409
     {
1  lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
@@ -22,6 +22,7 @@
22 22
 namespace Doctrine\DBAL\Schema;
23 23
 
24 24
 use Doctrine\DBAL\Event\SchemaIndexDefinitionEventArgs;
  25
+use Doctrine\DBAL\Events;
25 26
 
26 27
 /**
27 28
  * IBM Db2 Schema Manager
2  lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
@@ -84,7 +84,7 @@ public function getExistingSchemaSearchPaths()
84 84
      *
85 85
      * This is a PostgreSQL only function.
86 86
      *
87  
-     * @return type
  87
+     * @return void
88 88
      */
89 89
     public function determineExistingSchemaSearchPaths()
90 90
     {
8  lib/Doctrine/DBAL/Schema/Schema.php
@@ -293,7 +293,7 @@ public function dropSequence($sequenceName)
293 293
     /**
294 294
      * Return an array of necessary sql queries to create the schema on the given platform.
295 295
      *
296  
-     * @param AbstractPlatform $platform
  296
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
297 297
      * @return array
298 298
      */
299 299
     public function toSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
@@ -307,7 +307,7 @@ public function toSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
307 307
     /**
308 308
      * Return an array of necessary sql queries to drop the schema on the given platform.
309 309
      *
310  
-     * @param AbstractPlatform $platform
  310
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
311 311
      * @return array
312 312
      */
313 313
     public function toDropSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
@@ -320,7 +320,7 @@ public function toDropSql(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
320 320
 
321 321
     /**
322 322
      * @param Schema $toSchema
323  
-     * @param AbstractPlatform $platform
  323
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
324 324
      */
325 325
     public function getMigrateToSql(Schema $toSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
326 326
     {
@@ -331,7 +331,7 @@ public function getMigrateToSql(Schema $toSchema, \Doctrine\DBAL\Platforms\Abstr
331 331
 
332 332
     /**
333 333
      * @param Schema $fromSchema
334  
-     * @param AbstractPlatform $platform
  334
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
335 335
      */
336 336
     public function getMigrateFromSql(Schema $fromSchema, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
337 337
     {
2  lib/Doctrine/DBAL/Schema/SchemaConfig.php
@@ -94,7 +94,7 @@ public function getName()
94 94
     /**
95 95
      * set default namespace name of schema objects.
96 96
      *
97  
-     * @param _name the value to set.
  97
+     * @param string $name the value to set.
98 98
      */
99 99
     public function setName($name)
100 100
     {
1  lib/Doctrine/DBAL/Schema/Visitor/DropSchemaSqlCollector.php
@@ -28,6 +28,7 @@
28 28
     Doctrine\DBAL\Schema\ForeignKeyConstraint,
29 29
     Doctrine\DBAL\Schema\Constraint,
30 30
     Doctrine\DBAL\Schema\Sequence,
  31
+    Doctrine\DBAL\Schema\SchemaException,
31 32
     Doctrine\DBAL\Schema\Index;
32 33
 
33 34
 /**
2  lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
@@ -93,7 +93,7 @@ protected function configure()
93 93
      */
94 94
     protected function execute(InputInterface $input, OutputInterface $output)
95 95
     {
96  
-        /* @var $conn Doctrine\DBAL\Connection */
  96
+        /* @var $conn \Doctrine\DBAL\Connection */
97 97
         $conn = $this->getHelper('db')->getConnection();
98 98
 
99 99
         $keywordLists = (array)$input->getOption('list');
2  lib/Doctrine/DBAL/Types/VarDateTimeType.php
@@ -43,7 +43,7 @@ class VarDateTimeType extends DateTimeType
43 43
      * @throws ConversionException
44 44
      * @param string $value
45 45
      * @param AbstractPlatform $platform
46  
-     * @return DateTime
  46
+     * @return \DateTime
47 47
      */
48 48
     public function convertToPHPValue($value, AbstractPlatform $platform)
49 49
     {
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.