Merge branch '4.2.x' into 4.3.x

morozov · morozov · commit 1089fcb6aa46 · 2025-05-17T13:03:02.000-07:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -245,6 +245,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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="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
@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -18,6 +18,7 @@
          failOnRisky="true"
          failOnWarning="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/tests/Functional/BooleanBindingTest.php b/tests/Functional/BooleanBindingTest.php
@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class BooleanBindingTest extends FunctionalTestCase
 {
@@ -27,7 +28,7 @@ protected function tearDown(): void
         $this->dropTableIfExists('boolean_test_table');
     }
 
-    /** @dataProvider booleanProvider */
+    #[DataProvider('booleanProvider')]
     public function testBooleanInsert(bool $input): void
     {
         $queryBuilder = $this->connection->createQueryBuilder();

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`failOnRisky="true"`
`7`	`7`	`failOnWarning="true"`
`8`	`8`	`displayDetailsOnTestsThatTriggerWarnings="true"`
	`9`	`+ displayDetailsOnPhpunitDeprecations="true"`
`9`	`10`	`>`
`10`	`11`	`<php>`
`11`	`12`	`<var name="db_driver" value="pdo_sqlsrv"/>`