[9.x] Bump DBAL to 2.12 (#35974)

* Bump DBAL to 2.12

* Fix invalid signatures

* Remove conflict

* inheritdoc

* DocBlocks

Author: driesvints

composer.json

@@ -79,7 +79,7 @@
     },
     "require-dev": {
         "aws/aws-sdk-php": "^3.155",
-        "doctrine/dbal": "^2.6|^3.0",
+        "doctrine/dbal": "^2.12|^3.0",
         "filp/whoops": "^2.8",
         "guzzlehttp/guzzle": "^7.2",
         "league/flysystem-aws-s3-v3": "^2.0",
@@ -132,7 +132,7 @@
         "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
         "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
         "brianium/paratest": "Required to run tests in parallel (^6.0).",
-        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).",
+        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.12|^3.0).",
         "filp/whoops": "Required for friendly error pages in development (^2.8).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
         "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^7.2).",

src/Illuminate/Database/Connection.php

@@ -920,7 +920,7 @@ public function getDoctrineConnection()
             $this->doctrineConnection = new DoctrineConnection(array_filter([
                 'pdo' => $this->getPdo(),
                 'dbname' => $this->getDatabaseName(),
-                'driver' => method_exists($driver, 'getName') ? $driver->getName() : null,
+                'driver' => $driver->getName(),
                 'serverVersion' => $this->getConfig('server_version'),
             ]), $driver);
         }

src/Illuminate/Database/DBAL/TimestampType.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Database\DBAL;
 
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 

src/Illuminate/Database/MySqlConnection.php

@@ -2,8 +2,6 @@
 
 namespace Illuminate\Database;
 
-use Doctrine\DBAL\Driver\PDOMySql\Driver as DoctrineDriver;
-use Doctrine\DBAL\Version;
 use Illuminate\Database\PDO\MySqlDriver;
 use Illuminate\Database\Query\Grammars\MySqlGrammar as QueryGrammar;
 use Illuminate\Database\Query\Processors\MySqlProcessor;
@@ -84,10 +82,10 @@ protected function getDefaultPostProcessor()
     /**
      * Get the Doctrine DBAL driver.
      *
-     * @return \Doctrine\DBAL\Driver\PDOMySql\Driver|\Illuminate\Database\PDO\MySqlDriver
+     * @return \Illuminate\Database\PDO\MySqlDriver
      */
     protected function getDoctrineDriver()
     {
-        return class_exists(Version::class) ? new DoctrineDriver : new MySqlDriver;
+        return new MySqlDriver;
     }
 }

src/Illuminate/Database/PDO/Concerns/ConnectsToDatabase.php

@@ -10,10 +10,13 @@ trait ConnectsToDatabase
     /**
      * Create a new database connection.
      *
-     * @param  array  $params
+     * @param  mixed[]  $params
+     * @param  string|null  $username
+     * @param  string|null  $password
+     * @param  mixed[]  $driverOptions
      * @return \Illuminate\Database\PDO\Connection
      */
-    public function connect(array $params)
+    public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
     {
         if (! isset($params['pdo']) || ! $params['pdo'] instanceof PDO) {
             throw new \InvalidArgumentException('Laravel requires the "pdo" property to be set and be a PDO instance.');

src/Illuminate/Database/PDO/MySqlDriver.php

@@ -8,4 +8,12 @@
 class MySqlDriver extends AbstractMySQLDriver
 {
     use ConnectsToDatabase;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'pdo_mysql';
+    }
 }

src/Illuminate/Database/PDO/PostgresDriver.php

@@ -8,4 +8,12 @@
 class PostgresDriver extends AbstractPostgreSQLDriver
 {
     use ConnectsToDatabase;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'pdo_pgsql';
+    }
 }

src/Illuminate/Database/PDO/SQLiteDriver.php

@@ -8,4 +8,12 @@
 class SQLiteDriver extends AbstractSQLiteDriver
 {
     use ConnectsToDatabase;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'pdo_sqlite';
+    }
 }

src/Illuminate/Database/PDO/SqlServerDriver.php

@@ -6,10 +6,27 @@
 
 class SqlServerDriver extends AbstractSQLServerDriver
 {
-    public function connect(array $params)
+    /**
+     * Create a new database connection.
+     *
+     * @param  mixed[]  $params
+     * @param  string|null  $username
+     * @param  string|null  $password
+     * @param  mixed[]  $driverOptions
+     * @return \Illuminate\Database\PDO\Connection
+     */
+    public function connect(array $params, $username = null, $password = null, array $driverOptions = [])
     {
         return new SqlServerConnection(
             new Connection($params['pdo'])
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'pdo_sqlsrv';
+    }
 }

src/Illuminate/Database/PostgresConnection.php

@@ -2,8 +2,6 @@
 
 namespace Illuminate\Database;
 
-use Doctrine\DBAL\Driver\PDOPgSql\Driver as DoctrineDriver;
-use Doctrine\DBAL\Version;
 use Illuminate\Database\PDO\PostgresDriver;
 use Illuminate\Database\Query\Grammars\PostgresGrammar as QueryGrammar;
 use Illuminate\Database\Query\Processors\PostgresProcessor;
@@ -99,10 +97,10 @@ protected function getDefaultPostProcessor()
     /**
      * Get the Doctrine DBAL driver.
      *
-     * @return \Doctrine\DBAL\Driver\PDOPgSql\Driver|\Illuminate\Database\PDO\PostgresDriver
+     * @return \Illuminate\Database\PDO\PostgresDriver
      */
     protected function getDoctrineDriver()
     {
-        return class_exists(Version::class) ? new DoctrineDriver : new PostgresDriver;
+        return new PostgresDriver;
     }
 }