Merge branch '4.4.x' into 5.0.x

Author: morozov

.github/workflows/continuous-integration.yml

@@ -131,6 +131,7 @@ jobs:
           - "10.11" # LTS (Feb 2028) We have code specific to ^10.10
           - "11.4"  # LTS (May 2029)
           - "11.8"  # LTS (Jun 2028)
+          - "12.0"  # Rolling Release (Q4 2025)
         extension:
           - "mysqli"
           - "pdo_mysql"
@@ -191,18 +192,17 @@ jobs:
           - "Latin1_General_100_CI_AS_SC_UTF8"
           - "Latin1_General_100_CS_AS_SC_UTF8"
 
-# The DB2 workflow currently segfaults with PHP 8.4
-#  phpunit-ibm-db2:
-#    name: "PHPUnit with IBM DB2"
-#    needs: "phpunit-smoke-check"
-#    uses: ./.github/workflows/phpunit-db2.yml
-#    with:
-#      php-version: ${{ matrix.php-version }}
-#
-#    strategy:
-#      matrix:
-#        php-version:
-#          - "8.4"
+  phpunit-ibm-db2:
+    name: "PHPUnit with IBM DB2"
+    needs: "phpunit-smoke-check"
+    uses: ./.github/workflows/phpunit-db2.yml
+    with:
+      php-version: ${{ matrix.php-version }}
+
+    strategy:
+      matrix:
+        php-version:
+          - "8.4"
 
   development-deps:
     name: "PHPUnit with PDO_SQLite and development dependencies"

UPGRADE.md

@@ -381,6 +381,17 @@ all drivers and middleware.
 
 # Upgrade to 4.4
 
+## Deprecated dropping unnamed constraints in SQLite
+
+Passing unnamed foreign key constraints as part of the `$droppedForeignKeys` argument of the `TableDiff` constructor
+has been deprecated.
+
+## Deprecated overwriting foreign key constraints
+
+Adding a foreign key constraint with a name that matches an existing one, whether explicitly specified or
+auto-generated, has been deprecated. In order to replace an existing constraint, drop it first
+via `dropForeignKey()`.
+
 ## Deprecated `View` features
 
 The `View` constructor has been marked as internal. Use `View::editor()` to instantiate an editor and

src/Schema/Table.php

@@ -838,6 +838,15 @@ private function _addForeignKeyConstraint(ForeignKeyConstraint $constraint): sel
             $key = strtolower($this->generateNameFromObjectColumnNames('fk', $columnNames));
         }
 
+        if (isset($this->foreignKeyConstraints[$key])) {
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/pull/7125',
+                'Overwriting an existing foreign key constraint ("%s") is deprecated.',
+                $key,
+            );
+        }
+
         $this->foreignKeyConstraints[$key] = $constraint;
 
         // add an explicit index on the foreign key columns.

src/Schema/TableDiff.php

@@ -42,6 +42,16 @@ public function __construct(
         private readonly ?PrimaryKeyConstraint $addedPrimaryKeyConstraint = null,
         private readonly ?PrimaryKeyConstraint $droppedPrimaryKeyConstraint = null,
     ) {
+        foreach ($droppedForeignKeys as $droppedForeignKey) {
+            if ($droppedForeignKey->getObjectName() === null) {
+                Deprecation::trigger(
+                    'doctrine/dbal',
+                    'https://github.com/doctrine/dbal/pull/7143',
+                    'Dropping a foreign key constraints without specifying its name is deprecated.',
+                );
+                break;
+            }
+        }
     }
 
     public function getOldTable(): Table

tests/Schema/TableDiffTest.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Schema;
+
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\TableDiff;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
+use PHPUnit\Framework\TestCase;
+
+class TableDiffTest extends TestCase
+{
+    use VerifyDeprecations;
+
+    public function testCreateWithInvalidDroppedForeignKeyName(): void
+    {
+        $table = Table::editor()
+            ->setUnquotedName('t1')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('c1')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->create();
+
+        $droppedForeignKeys = ForeignKeyConstraint::editor()
+            ->setUnquotedReferencingColumnNames('c1')
+            ->setUnquotedReferencedTableName('t2')
+            ->setUnquotedReferencedColumnNames('c1')
+            ->create();
+
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/7143');
+
+        // @phpstan-ignore new.resultUnused
+        new TableDiff($table, droppedForeignKeys: [$droppedForeignKeys]);
+    }
+}

tests/Schema/TableTest.php

@@ -1782,4 +1782,22 @@ public function testAddIndexWithConflictingFlags(array $flags): void
         $this->expectException(InvalidIndexDefinition::class);
         $table->addIndex(['user_id'], null, $flags);
     }
+
+    public function testOverwritingForeignKeyConstraint(): void
+    {
+        $table = Table::editor()
+            ->setUnquotedName('foo')
+            ->setColumns(
+                Column::editor()
+                    ->setUnquotedName('id')
+                    ->setTypeName(Types::INTEGER)
+                    ->create(),
+            )
+            ->create();
+
+        $table->addForeignKeyConstraint('bar', ['id'], ['id']);
+
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/7125');
+        $table->addForeignKeyConstraint('baz', ['id'], ['id']);
+    }
 }