Merge branch '4.4.x' into 5.0.x

Author: morozov

UPGRADE.md

@@ -404,6 +404,11 @@ all drivers and middleware.
 
 # Upgrade to 4.4
 
+## Deprecated `TableDiff::getDroppedForeignKeys()`
+
+The `TableDiff::getDroppedForeignKeys()` method has been deprecated. Use
+`TableDiff::getDroppedForeignKeyConstraintNames()` instead.
+
 ## Deprecated `AbstractSchemaManager` methods
 
 The following `AbstractSchemaManager` methods have been deprecated:

src/Schema/Exception/InvalidState.php

@@ -9,4 +9,8 @@
 
 final class InvalidState extends LogicException implements SchemaException
 {
+    public static function tableDiffContainsUnnamedDroppedForeignKeyConstraints(): self
+    {
+        return new self('Table diff contains unnamed dropped foreign key constraints');
+    }
 }

src/Schema/TableDiff.php

@@ -5,6 +5,8 @@
 namespace Doctrine\DBAL\Schema;
 
 use Doctrine\DBAL\Exception\InvalidArgumentException;
+use Doctrine\DBAL\Schema\Exception\InvalidState;
+use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\Deprecations\Deprecation;
 
 use function array_filter;
@@ -177,12 +179,33 @@ public function getAddedForeignKeys(): array
         return $this->addedForeignKeys;
     }
 
-    /** @return array<ForeignKeyConstraint> */
+    /**
+     * @deprecated Use {@see getDroppedForeignKeyConstraintNames()}.
+     *
+     * @return array<ForeignKeyConstraint>
+     */
     public function getDroppedForeignKeys(): array
     {
         return $this->droppedForeignKeys;
     }
 
+    /** @return array<UnqualifiedName> */
+    public function getDroppedForeignKeyConstraintNames(): array
+    {
+        $names = [];
+        foreach ($this->droppedForeignKeys as $constraint) {
+            $name = $constraint->getObjectName();
+
+            if ($name === null) {
+                throw InvalidState::tableDiffContainsUnnamedDroppedForeignKeyConstraints();
+            }
+
+            $names[] = $name;
+        }
+
+        return $names;
+    }
+
     public function getAddedPrimaryKeyConstraint(): ?PrimaryKeyConstraint
     {
         return $this->addedPrimaryKeyConstraint;

tests/Schema/AbstractComparatorTestCase.php

@@ -363,16 +363,6 @@ public function testTableAddForeignKey(): void
 
     public function testTableDropForeignKey(): void
     {
-        $tableForeign = Table::editor()
-            ->setUnquotedName('bar')
-            ->setColumns(
-                Column::editor()
-                    ->setUnquotedName('id')
-                    ->setTypeName(Types::INTEGER)
-                    ->create(),
-            )
-            ->create();
-
         $table1 = Table::editor()
             ->setUnquotedName('foo')
             ->setColumns(
@@ -403,7 +393,7 @@ public function testTableDropForeignKey(): void
 
         $tableDiff = $this->comparator->compareTables($table2, $table1);
 
-        self::assertCount(1, $tableDiff->getDroppedForeignKeys());
+        self::assertCount(1, $tableDiff->getDroppedForeignKeyConstraintNames());
     }
 
     public function testTableUpdateForeignKey(): void
@@ -446,7 +436,7 @@ public function testTableUpdateForeignKey(): void
 
         $tableDiff = $this->comparator->compareTables($table1, $table2);
 
-        self::assertCount(1, $tableDiff->getDroppedForeignKeys());
+        self::assertCount(1, $tableDiff->getDroppedForeignKeyConstraintNames());
         self::assertCount(1, $tableDiff->getAddedForeignKeys());
     }
 
@@ -489,7 +479,7 @@ public function testMovedForeignKeyForeignTable(): void
 
         $tableDiff = $this->comparator->compareTables($table1, $table2);
 
-        self::assertCount(1, $tableDiff->getDroppedForeignKeys());
+        self::assertCount(1, $tableDiff->getDroppedForeignKeyConstraintNames());
         self::assertCount(1, $tableDiff->getAddedForeignKeys());
     }
 

tests/Schema/TableDiffTest.php

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Exception\InvalidState;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
@@ -35,6 +36,9 @@ public function testCreateWithInvalidDroppedForeignKeyName(): void
         $this->expectException(InvalidArgumentException::class);
 
         // @phpstan-ignore new.resultUnused
-        new TableDiff($table, droppedForeignKeys: [$droppedForeignKeys]);
+        $diff = new TableDiff($table, droppedForeignKeys: [$droppedForeignKeys]);
+
+        $this->expectException(InvalidState::class);
+        $diff->getDroppedForeignKeyConstraintNames();
     }
 }