[10.x] Clean up DBAL deprecations (#45289)

* Clean up DBAL deprecations

* wip

* wip

* wip

* Apply fixes from StyleCI

* Fix tests

* revert

* wip

Co-authored-by: StyleCI Bot <[email protected]>

Author: driesvints

src/Illuminate/Database/Connection.php

@@ -273,7 +273,7 @@ public function useDefaultSchemaGrammar()
     /**
      * Get the default schema grammar instance.
      *
-     * @return \Illuminate\Database\Schema\Grammars\Grammar
+     * @return \Illuminate\Database\Schema\Grammars\Grammar|null
      */
     protected function getDefaultSchemaGrammar()
     {
@@ -1097,7 +1097,7 @@ public function getDoctrineColumn($table, $column)
     {
         $schema = $this->getDoctrineSchemaManager();
 
-        return $schema->listTableDetails($table)->getColumn($column);
+        return $schema->introspectTable($table)->getColumn($column);
     }
 
     /**
@@ -1109,11 +1109,7 @@ public function getDoctrineSchemaManager()
     {
         $connection = $this->getDoctrineConnection();
 
-        // Doctrine v2 expects one parameter while v3 expects two. 2nd will be ignored on v2...
-        return $this->getDoctrineDriver()->getSchemaManager(
-            $connection,
-            $connection->getDatabasePlatform()
-        );
+        return $connection->createSchemaManager();
     }
 
     /**
@@ -1151,7 +1147,7 @@ public function getDoctrineConnection()
      * @param  string  $type
      * @return void
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws \Doctrine\DBAL\Exception
      * @throws \RuntimeException
      */
     public function registerDoctrineType(Type|string $class, string $name, string $type): void

src/Illuminate/Database/Connectors/Connector.php

@@ -2,7 +2,6 @@
 
 namespace Illuminate\Database\Connectors;
 
-use Doctrine\DBAL\Driver\PDOConnection;
 use Exception;
 use Illuminate\Database\DetectsLostConnections;
 use PDO;
@@ -63,25 +62,9 @@ public function createConnection($dsn, array $config, array $options)
      */
     protected function createPdoConnection($dsn, $username, $password, $options)
     {
-        if (class_exists(PDOConnection::class) && ! $this->isPersistentConnection($options)) {
-            return new PDOConnection($dsn, $username, $password, $options);
-        }
-
         return new PDO($dsn, $username, $password, $options);
     }
 
-    /**
-     * Determine if the connection is persistent.
-     *
-     * @param  array  $options
-     * @return bool
-     */
-    protected function isPersistentConnection($options)
-    {
-        return isset($options[PDO::ATTR_PERSISTENT]) &&
-               $options[PDO::ATTR_PERSISTENT];
-    }
-
     /**
      * Handle an exception that occurred during connect execution.
      *

src/Illuminate/Database/Console/ShowCommand.php

@@ -44,14 +44,15 @@ public function handle(ConnectionResolverInterface $connections)
 
         $connection = $connections->connection($database = $this->input->getOption('database'));
 
+        $doctrineConnection = $connection->getDoctrineConnection();
         $schema = $connection->getDoctrineSchemaManager();
 
-        $this->registerTypeMappings($schema->getDatabasePlatform());
+        $this->registerTypeMappings($doctrineConnection->getDatabasePlatform());
 
         $data = [
             'platform' => [
                 'config' => $this->getConfigFromDatabase($database),
-                'name' => $this->getPlatformName($schema->getDatabasePlatform(), $database),
+                'name' => $this->getPlatformName($doctrineConnection->getDatabasePlatform(), $database),
                 'open_connections' => $this->getConnectionCount($connection),
             ],
             'tables' => $this->tables($connection, $schema),

src/Illuminate/Database/Console/ShowModelCommand.php

@@ -76,7 +76,7 @@ class ShowModelCommand extends DatabaseInspectionCommand
     /**
      * Execute the console command.
      *
-     * @return void
+     * @return int
      */
     public function handle()
     {
@@ -113,7 +113,7 @@ public function handle()
      * Get the first policy associated with this model.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return Illuminate\Support\Collection
+     * @return string
      */
     protected function getPolicy($model)
     {
@@ -131,8 +131,9 @@ protected function getPolicy($model)
      */
     protected function getAttributes($model)
     {
-        $schema = $model->getConnection()->getDoctrineSchemaManager();
-        $this->registerTypeMappings($schema->getDatabasePlatform());
+        $connection = $model->getConnection();
+        $schema = $connection->getDoctrineSchemaManager();
+        $this->registerTypeMappings($connection->getDoctrineConnection()->getDatabasePlatform());
         $table = $model->getConnection()->getTablePrefix().$model->getTable();
         $columns = $schema->listTableColumns($table);
         $indexes = $schema->listTableIndexes($table);
@@ -244,7 +245,7 @@ protected function getRelations($model)
      * Get the Observers watching this model.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return Illuminate\Support\Collection
+     * @return \Illuminate\Support\Collection
      */
     protected function getObservers($model)
     {

src/Illuminate/Database/Console/TableCommand.php

@@ -45,7 +45,7 @@ public function handle(ConnectionResolverInterface $connections)
 
         $schema = $connection->getDoctrineSchemaManager();
 
-        $this->registerTypeMappings($schema->getDatabasePlatform());
+        $this->registerTypeMappings($connection->getDoctrineConnection()->getDatabasePlatform());
 
         $table = $this->argument('table') ?: $this->components->choice(
             'Which table would you like to inspect?',
@@ -56,7 +56,7 @@ public function handle(ConnectionResolverInterface $connections)
             return $this->components->warn("Table [{$table}] doesn't exist.");
         }
 
-        $table = $schema->listTableDetails($table);
+        $table = $schema->introspectTable($table);
 
         $columns = $this->columns($table);
         $indexes = $this->indexes($table);

src/Illuminate/Database/DatabaseManager.php

@@ -245,7 +245,7 @@ protected function registerConfiguredDoctrineTypes(Connection $connection): void
      * @param  string  $type
      * @return void
      *
-     * @throws \Doctrine\DBAL\DBALException
+     * @throws \Doctrine\DBAL\Exception
      * @throws \RuntimeException
      */
     public function registerDoctrineType(string $class, string $name, string $type): void

src/Illuminate/Database/Migrations/Migrator.php

@@ -703,7 +703,7 @@ public function hasRunAnyMigrations()
      */
     public function deleteRepository()
     {
-        return $this->repository->deleteRepository();
+        $this->repository->deleteRepository();
     }
 
     /**

src/Illuminate/Database/Schema/Grammars/ChangeColumn.php

@@ -34,14 +34,14 @@ public static function compile($grammar, Blueprint $blueprint, Fluent $command,
         }
 
         $schema = $connection->getDoctrineSchemaManager();
-        $databasePlatform = $schema->getDatabasePlatform();
+        $databasePlatform = $connection->getDoctrineConnection()->getDatabasePlatform();
         $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
 
         $tableDiff = static::getChangedDiff(
             $grammar, $blueprint, $schema
         );
 
-        if ($tableDiff !== false) {
+        if (! $tableDiff->isEmpty()) {
             return (array) $databasePlatform->getAlterTableSQL($tableDiff);
         }
 
@@ -54,13 +54,13 @@ public static function compile($grammar, Blueprint $blueprint, Fluent $command,
      * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
      * @param  \Doctrine\DBAL\Schema\AbstractSchemaManager  $schema
-     * @return \Doctrine\DBAL\Schema\TableDiff|bool
+     * @return \Doctrine\DBAL\Schema\TableDiff
      */
     protected static function getChangedDiff($grammar, Blueprint $blueprint, SchemaManager $schema)
     {
-        $current = $schema->listTableDetails($grammar->getTablePrefix().$blueprint->getTable());
+        $current = $schema->introspectTable($grammar->getTablePrefix().$blueprint->getTable());
 
-        return (new Comparator)->diffTable(
+        return (new Comparator)->compareTables(
             $current, static::getTableWithColumnChanges($blueprint, $current)
         );
     }
@@ -89,7 +89,7 @@ protected static function getTableWithColumnChanges(Blueprint $blueprint, Table
                         continue;
                     }
 
-                    $column->setCustomSchemaOption($option, static::mapFluentValueToDoctrine($option, $value));
+                    $column->setPlatformOption($option, static::mapFluentValueToDoctrine($option, $value));
                 }
             }
         }
@@ -106,7 +106,7 @@ protected static function getTableWithColumnChanges(Blueprint $blueprint, Table
      */
     protected static function getDoctrineColumn(Table $table, Fluent $fluent)
     {
-        return $table->changeColumn(
+        return $table->modifyColumn(
             $fluent['name'], static::getDoctrineColumnChangeOptions($fluent)
         )->getColumn($fluent['name']);
     }

src/Illuminate/Database/Schema/Grammars/Grammar.php

@@ -17,6 +17,13 @@ abstract class Grammar extends BaseGrammar
 {
     use CompilesJsonPaths;
 
+    /**
+     * The possible column modifiers.
+     *
+     * @var string[]
+     */
+    protected $modifiers = [];
+
     /**
      * If this Grammar supports schema changes wrapped in a transaction.
      *
@@ -319,7 +326,7 @@ public function getDoctrineTableDiff(Blueprint $blueprint, SchemaManager $schema
         $table = $this->getTablePrefix().$blueprint->getTable();
 
         return tap(new TableDiff($table), function ($tableDiff) use ($schema, $table) {
-            $tableDiff->fromTable = $schema->listTableDetails($table);
+            $tableDiff->fromTable = $schema->introspectTable($table);
         });
     }
 

src/Illuminate/Database/Schema/Grammars/RenameColumn.php

@@ -23,7 +23,7 @@ class RenameColumn
     public static function compile(Grammar $grammar, Blueprint $blueprint, Fluent $command, Connection $connection)
     {
         $schema = $connection->getDoctrineSchemaManager();
-        $databasePlatform = $schema->getDatabasePlatform();
+        $databasePlatform = $connection->getDoctrineConnection()->getDatabasePlatform();
         $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
 
         $column = $connection->getDoctrineColumn(