Merge branch '4.3.x' into 5.0.x

morozov · morozov · commit 937e08fe4d6f · 2025-06-14T10:30:37.000-07:00
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -25,6 +25,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
     with:
       composer-options: "--ignore-platform-req=php+"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -24,9 +24,6 @@ on:
   schedule:
     - cron: "42 3 * * *"
 
-env:
-  fail-fast: true
-
 jobs:
   phpunit-smoke-check:
     name: "PHPUnit with SQLite"
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@7.3.0"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -11,6 +11,7 @@ jobs:
     runs-on: "ubuntu-24.04"
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - "8.3"
@@ -80,6 +81,7 @@ jobs:
       dependency-versions: ${{ matrix.dependency-versions }}
 
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-24.04
@@ -100,6 +102,7 @@ jobs:
       extension: ${{ matrix.extension }}
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - '8.5'
@@ -118,6 +121,7 @@ jobs:
       extension: ${{ matrix.extension }}
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - '8.5'
@@ -136,6 +140,7 @@ jobs:
       collation: ${{ matrix.collation }}
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - '8.5'
@@ -154,6 +159,7 @@ jobs:
       extension: ${{ matrix.extension }}
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - '8.5'
@@ -173,6 +179,7 @@ jobs:
       postgres-locale-provider: ${{ matrix.postgres-locale-provider }}
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - '8.5'
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -25,4 +25,4 @@ on:
 jobs:
   static-analysis-phpstan:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"
diff --git a/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -5,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/mysqli.xml b/ci/github/phpunit/mysqli.xml
@@ -5,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/oci8.xml b/ci/github/phpunit/oci8.xml
@@ -5,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="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,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/pgsql.xml b/ci/github/phpunit/pgsql.xml
@@ -5,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/sqlite3.xml b/ci/github/phpunit/sqlite3.xml
@@ -5,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/ci/github/phpunit/sqlsrv.xml b/ci/github/phpunit/sqlsrv.xml
@@ -5,9 +5,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -17,9 +17,10 @@
          beStrictAboutOutputDuringTests="true"
          failOnRisky="true"
          failOnWarning="true"
+         failOnNotice="true"
          failOnPhpunitDeprecation="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/src/Platforms/SQLServerPlatform.php b/src/Platforms/SQLServerPlatform.php
@@ -1116,9 +1116,14 @@ public function columnsEqual(Column $column1, Column $column2): bool
             === $this->getDefaultValueDeclarationSQL($column2->toArray());
     }
 
+    /**
+     * The <code>[</code> character is used in SQL Server's extended pattern syntax to define character ranges or sets.
+     *
+     * @link https://learn.microsoft.com/en-us/sql/t-sql/language-elements/like-transact-sql#pattern
+     */
     protected function getLikeWildcardCharacters(): string
     {
-        return parent::getLikeWildcardCharacters() . '[]^';
+        return parent::getLikeWildcardCharacters() . '[';
     }
 
     /** @link https://learn.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-addextendedproperty-transact-sql */
diff --git a/src/Schema/PostgreSQLSchemaManager.php b/src/Schema/PostgreSQLSchemaManager.php
@@ -303,7 +303,9 @@ protected function selectTableNames(string $databaseName): Result
                   AND table_name != 'geometry_columns'
                   AND table_name != 'spatial_ref_sys'
                   AND table_type = 'BASE TABLE'
-                SQL,
+                ORDER BY
+                  quote_ident(table_name)
+            SQL,
             $this->platform->quoteSingleIdentifier(self::SCHEMA_NAME_COLUMN),
             $this->platform->quoteSingleIdentifier(self::TABLE_NAME_COLUMN),
         );
@@ -506,6 +508,7 @@ protected function selectForeignKeyColumns(string $databaseName, ?OptionallyQual
                                     ON n.oid = c.relnamespace
                             WHERE %s
                           ) AND r.contype = 'f'
+                  ORDER BY 1, 2
         SQL,
             $this->platform->quoteSingleIdentifier(self::SCHEMA_NAME_COLUMN),
             $this->platform->quoteSingleIdentifier(self::TABLE_NAME_COLUMN),
diff --git a/tests/Functional/Schema/SQLiteSchemaManagerTest.php b/tests/Functional/Schema/SQLiteSchemaManagerTest.php
diff --git a/tests/Functional/Ticket/DBAL461Test.php b/tests/Functional/Ticket/DBAL461Test.php
diff --git a/tests/Schema/SQLiteSchemaManagerTest.php b/tests/Schema/SQLiteSchemaManagerTest.php
