Merge branch '4.3.x' into 5.0.x

morozov · morozov · commit 64aa62dfeb62 · 2025-05-25T08:00:04.000+03:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -243,6 +243,8 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
+        env:
+          fail-fast: true
 
       - name: "Lower minimum stability"
         run: "composer config minimum-stability dev"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -5,9 +5,6 @@ on:
     - cron: "12 3 * * *"
   workflow_dispatch:
 
-env:
-  fail-fast: true
-
 jobs:
   phpunit-mariadb-devel:
     name: "PHPUnit with MariaDB"
@@ -50,6 +47,8 @@ jobs:
           coverage: "pcov"
           ini-values: "zend.assertions=1"
           extensions: "${{ matrix.extension }}"
+        env:
+          fail-fast: true
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v3"
diff --git a/.github/workflows/phpunit-db2.yml b/.github/workflows/phpunit-db2.yml
@@ -47,6 +47,7 @@ jobs:
           coverage: pcov
           ini-values: zend.assertions=1
         env:
+          fail-fast: true
           IBM_DB2_CONFIGURE_OPTS: '--with-IBM_DB2=/tmp/clidriver'
 
       - name: Install dependencies with Composer
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
@@ -39,6 +39,8 @@ jobs:
           extensions: ${{ inputs.extension }}
           coverage: pcov
           ini-values: zend.assertions=1
+        env:
+          fail-fast: true
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v3
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -43,6 +43,8 @@ jobs:
           extensions: ${{ inputs.extension }}
           coverage: pcov
           ini-values: zend.assertions=1
+        env:
+          fail-fast: true
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v3
diff --git a/.github/workflows/phpunit-oracle.yml b/.github/workflows/phpunit-oracle.yml
@@ -41,6 +41,8 @@ jobs:
           extensions: ${{ inputs.extension }}
           coverage: pcov
           ini-values: zend.assertions=1
+        env:
+          fail-fast: true
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v3
diff --git a/.github/workflows/phpunit-postgres.yml b/.github/workflows/phpunit-postgres.yml
@@ -42,6 +42,8 @@ jobs:
           extensions: ${{ inputs.extension }}
           coverage: pcov
           ini-values: zend.assertions=1
+        env:
+          fail-fast: true
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v3
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -30,6 +30,8 @@ jobs:
           php-version: ${{ inputs.php-version }}
           coverage: pcov
           ini-values: zend.assertions=1
+        env:
+          fail-fast: true
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v3
diff --git a/.github/workflows/phpunit-sqlserver.yml b/.github/workflows/phpunit-sqlserver.yml
@@ -41,6 +41,8 @@ jobs:
           coverage: pcov
           ini-values: zend.assertions=1
           tools: pecl
+        env:
+          fail-fast: true
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v3
diff --git a/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <var name="db_driver" value="pdo_sqlsrv"/>
diff --git a/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <var name="db_driver" value="sqlsrv"/>
diff --git a/ci/github/phpunit/ibm_db2.xml b/ci/github/phpunit/ibm_db2.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/mysqli-tls.xml b/ci/github/phpunit/mysqli-tls.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/mysqli.xml b/ci/github/phpunit/mysqli.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/oci8-21.xml b/ci/github/phpunit/oci8-21.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/oci8.xml b/ci/github/phpunit/oci8.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pdo_mysql.xml b/ci/github/phpunit/pdo_mysql.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pdo_oci-21.xml b/ci/github/phpunit/pdo_oci-21.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pdo_oci.xml b/ci/github/phpunit/pdo_oci.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pdo_pgsql.xml b/ci/github/phpunit/pdo_pgsql.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pdo_sqlite.xml b/ci/github/phpunit/pdo_sqlite.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pdo_sqlsrv.xml b/ci/github/phpunit/pdo_sqlsrv.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pgsql.xml b/ci/github/phpunit/pgsql.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/sqlite3.xml b/ci/github/phpunit/sqlite3.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/sqlsrv.xml b/ci/github/phpunit/sqlsrv.xml
@@ -5,7 +5,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "doctrine/deprecations": "^0.5.3|^1",
+        "doctrine/deprecations": "^1.1.5",
         "psr/cache": "^1|^2|^3",
         "psr/log": "^1|^2|^3"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -17,7 +17,9 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnPhpunitDeprecation="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/src/Schema/Collections/Exception.php b/src/Schema/Collections/Exception.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Schema\Collections;
+
+use Doctrine\DBAL\Schema\SchemaException;
+
+/** @internal */
+interface Exception extends SchemaException
+{
+}
diff --git a/src/Schema/Collections/Exception/ObjectAlreadyExists.php b/src/Schema/Collections/Exception/ObjectAlreadyExists.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Schema\Collections\Exception;
+
+use Doctrine\DBAL\Schema\Collections\Exception;
+use Doctrine\DBAL\Schema\Name\UnqualifiedName;
+use LogicException;
+
+use function sprintf;
+
+/** @internal */
+final class ObjectAlreadyExists extends LogicException implements Exception
+{
+    public function __construct(string $message, private readonly UnqualifiedName $objectName)
+    {
+        parent::__construct($message);
+    }
+
+    public function getObjectName(): UnqualifiedName
+    {
+        return $this->objectName;
+    }
+
+    public static function new(UnqualifiedName $objectName): self
+    {
+        return new self(sprintf('Object %s already exists.', $objectName->toString()), $objectName);
+    }
+}
diff --git a/src/Schema/Collections/Exception/ObjectDoesNotExist.php b/src/Schema/Collections/Exception/ObjectDoesNotExist.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Schema\Collections\Exception;
+
+use Doctrine\DBAL\Schema\Collections\Exception;
+use Doctrine\DBAL\Schema\Name\UnqualifiedName;
+use LogicException;
+
+use function sprintf;
+
+/** @internal */
+final class ObjectDoesNotExist extends LogicException implements Exception
+{
+    public function __construct(string $message, private readonly UnqualifiedName $objectName)
+    {
+        parent::__construct($message);
+    }
+
+    public function getObjectName(): UnqualifiedName
+    {
+        return $this->objectName;
+    }
+
+    public static function new(UnqualifiedName $objectName): self
+    {
+        return new self(sprintf('Object %s does not exist.', $objectName->toString()), $objectName);
+    }
+}
diff --git a/src/Schema/Collections/ObjectSet.php b/src/Schema/Collections/ObjectSet.php
diff --git a/src/Schema/Collections/OptionallyUnqualifiedNamedObjectSet.php b/src/Schema/Collections/OptionallyUnqualifiedNamedObjectSet.php
diff --git a/src/Schema/Collections/UnqualifiedNamedObjectSet.php b/src/Schema/Collections/UnqualifiedNamedObjectSet.php
diff --git a/src/Schema/Exception/InvalidTableModification.php b/src/Schema/Exception/InvalidTableModification.php
diff --git a/src/Schema/Table.php b/src/Schema/Table.php
diff --git a/src/Schema/TableEditor.php b/src/Schema/TableEditor.php
diff --git a/tests/Functional/BooleanBindingTest.php b/tests/Functional/BooleanBindingTest.php
diff --git a/tests/Platforms/AbstractPlatformTestCase.php b/tests/Platforms/AbstractPlatformTestCase.php
diff --git a/tests/Platforms/SQLServerPlatformTest.php b/tests/Platforms/SQLServerPlatformTest.php
diff --git a/tests/Schema/AbstractComparatorTestCase.php b/tests/Schema/AbstractComparatorTestCase.php
diff --git a/tests/Schema/Collections/OptionallyUnqualifiedNamedObjectSetTest.php b/tests/Schema/Collections/OptionallyUnqualifiedNamedObjectSetTest.php
diff --git a/tests/Schema/Collections/UnqualifiedNamedObjectSetTest.php b/tests/Schema/Collections/UnqualifiedNamedObjectSetTest.php
diff --git a/tests/Schema/TableEditorTest.php b/tests/Schema/TableEditorTest.php
diff --git a/tests/Schema/TableTest.php b/tests/Schema/TableTest.php
