Fix type which caused widening of type in Doctrine\DBAL\Event\SchemaC…

…olumnDefinitionEventArgs

lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php

@@ -83,7 +83,7 @@ public function getDatabase(Connection $conn) : ?string
     {
         $params = $conn->getParams();
 
-        return $params['path'] ?? null;
+        return $params['path'] ?? '';
     }
 
     /**

lib/Doctrine/DBAL/Event/SchemaColumnDefinitionEventArgs.php

@@ -33,9 +33,9 @@ class SchemaColumnDefinitionEventArgs extends SchemaEventArgs
     private $connection;
 
     /**
-     * @param mixed[]     $tableColumn
-     * @param string      $table
-     * @param string|null $database
+     * @param mixed[] $tableColumn
+     * @param string  $table
+     * @param string  $database
      */
     public function __construct(array $tableColumn, $table, $database, Connection $connection)
     {

lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php

@@ -12,6 +12,7 @@
 use Doctrine\DBAL\Events;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\Exception\NotSupported;
+use InvalidArgumentException;
 use Throwable;
 use function array_filter;
 use function array_intersect;
@@ -128,9 +129,10 @@ public function listNamespaceNames() : array
      */
     public function listSequences(?string $database = null) : array
     {
-        if ($database === null) {
-            $database = $this->_conn->getDatabase();
-        }
+        $database = $this->ensureDatabase(
+            $database ?? $this->_conn->getDatabase()
+        );
+
         $sql = $this->_platform->getListSequencesSQL($database);
 
         $sequences = $this->_conn->fetchAll($sql);
@@ -152,9 +154,9 @@ public function listSequences(?string $database = null) : array
      */
     public function listTableColumns(string $table, ?string $database = null) : array
     {
-        if (! $database) {
-            $database = $this->_conn->getDatabase();
-        }
+        $database = $this->ensureDatabase(
+            $database ?? $this->_conn->getDatabase()
+        );
 
         $sql = $this->_platform->getListTableColumnsSQL($table, $database);
 
@@ -267,9 +269,12 @@ public function listTableDetails(string $tableName) : Table
      */
     public function listViews() : array
     {
-        $database = $this->_conn->getDatabase();
-        $sql      = $this->_platform->getListViewsSQL($database);
-        $views    = $this->_conn->fetchAll($sql);
+        $database = $this->ensureDatabase(
+            $this->_conn->getDatabase()
+        );
+
+        $sql   = $this->_platform->getListViewsSQL($database);
+        $views = $this->_conn->fetchAll($sql);
 
         return $this->_getPortableViewsList($views);
     }
@@ -661,7 +666,7 @@ protected function _getPortableSequenceDefinition(array $sequence) : Sequence
      *
      * @return array<string, Column>
      */
-    protected function _getPortableTableColumnList(string $table, ?string $database, array $tableColumns) : array
+    protected function _getPortableTableColumnList(string $table, string $database, array $tableColumns) : array
     {
         $eventManager = $this->_platform->getEventManager();
 
@@ -973,4 +978,13 @@ final protected function extractDoctrineTypeFromComment(?string &$comment) : ?st
 
         return $match[2];
     }
+
+    private function ensureDatabase(?string $database) : string
+    {
+        if ($database === null) {
+            throw new InvalidArgumentException('Needs a database.');
+        }
+
+        return $database;
+    }
 }

lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php

@@ -226,7 +226,7 @@ protected function _getPortableTableIndexesList(array $tableIndexRows, string $t
     /**
      * {@inheritdoc}
      */
-    protected function _getPortableTableColumnList(string $table, ?string $database, array $tableColumns) : array
+    protected function _getPortableTableColumnList(string $table, string $database, array $tableColumns) : array
     {
         $list = parent::_getPortableTableColumnList($table, $database, $tableColumns);
 

tests/Doctrine/Tests/DBAL/Functional/Driver/AbstractDriverTest.php

@@ -69,6 +69,6 @@ abstract protected function createDriver();
 
     protected static function getDatabaseNameForConnectionWithoutDatabaseNameParameter() : ?string
     {
-        return null;
+        return '';
     }
 }