Merge branch '4.2.x' into 4.3.x

.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.1"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"
     with:
       composer-options: "--ignore-platform-req=php+"

.github/workflows/continuous-integration.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - "ubuntu-22.04"
+          - "ubuntu-24.04"
         php-version:
           - "8.3"
           - "8.4"
@@ -46,11 +46,11 @@ jobs:
           - "sqlite3"
           - "pdo_sqlite"
         include:
-          - os: "ubuntu-20.04"
+          - os: "ubuntu-22.04"
             php-version: "8.2"
             dependencies: "lowest"
             extension: "pdo_sqlite"
-          - os: "ubuntu-22.04"
+          - os: "ubuntu-24.04"
             php-version: "8.4"
             dependencies: "highest"
             extension: "sqlite3"
@@ -95,7 +95,7 @@ jobs:
 
   phpunit-oci8:
     name: "PHPUnit on OCI8"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -155,7 +155,7 @@ jobs:
 
   phpunit-pdo-oci:
     name: "PHPUnit on PDO_OCI"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -215,7 +215,7 @@ jobs:
 
   phpunit-postgres:
     name: "PHPUnit with PostgreSQL"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -293,7 +293,7 @@ jobs:
 
   phpunit-mariadb:
     name: "PHPUnit with MariaDB"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -368,7 +368,7 @@ jobs:
 
   phpunit-mysql:
     name: "PHPUnit with MySQL"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -447,7 +447,7 @@ jobs:
 
   phpunit-mssql:
     name: "PHPUnit with SQL Server"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -515,7 +515,7 @@ jobs:
 
   phpunit-ibm-db2:
     name: "PHPUnit with IBM DB2"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs: "phpunit-smoke-check"
 
     strategy:
@@ -585,7 +585,7 @@ jobs:
 
   development-deps:
     name: "PHPUnit with PDO_SQLite and development dependencies"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
 
     strategy:
       matrix:
@@ -614,7 +614,7 @@ jobs:
 
   upload_coverage:
     name: "Upload coverage to Codecov"
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     needs:
       - "phpunit-smoke-check"
       - "phpunit-oci8"

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@7.2.1"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@7.2.2"

.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.1"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"

composer.json

@@ -37,15 +37,15 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "doctrine/coding-standard": "12.0.0",
+        "doctrine/coding-standard": "13.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
         "phpstan/phpstan": "2.1.1",
         "phpstan/phpstan-phpunit": "2.0.6",
         "phpstan/phpstan-strict-rules": "^2",
         "phpunit/phpunit": "11.5.15",
-        "slevomat/coding-standard": "8.13.1",
-        "squizlabs/php_codesniffer": "3.10.2",
+        "slevomat/coding-standard": "8.16.2",
+        "squizlabs/php_codesniffer": "3.12.0",
         "symfony/cache": "^6.3.8|^7.0",
         "symfony/console": "^5.4|^6.3|^7.0"
     },

phpcs.xml.dist

@@ -12,7 +12,7 @@
     <!-- Show progress of the run and show sniff names -->
     <arg value="ps"/>
 
-    <config name="php_version" value="80300"/>
+    <config name="php_version" value="80200"/>
 
     <file>src</file>
     <file>tests</file>
@@ -23,7 +23,7 @@
         <exclude name="SlevomatCodingStandard.Classes.DisallowLateStaticBindingForConstants.DisallowedLateStaticBindingForConstant"/>
         <exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing.IncorrectLinesCountAfterLastControlStructure"/>
         <!-- https://github.com/doctrine/coding-standard/issues/288 -->
-        <exclude name="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat"/>
 
         <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
         <!-- https://github.com/slevomat/coding-standard/issues/867 -->

tests/FunctionalTestCase.php

@@ -78,7 +78,7 @@ abstract class FunctionalTestCase extends TestCase
         // (e.g. to drop a table), and then this reopened connection will remain open and attached to the PHPUnit result
         // until the end of the suite leaking connection resources, while subsequent tests will use
         // the newly established shared connection.
-        unset($this->connection);
+        unset($this->connection); // @phpstan-ignore unset.possiblyHookedProperty
 
         $this->isConnectionReusable = true;
     }

tests/Platforms/PostgreSQLPlatformTest.php

@@ -823,10 +823,10 @@ class PostgreSQLPlatformTest extends AbstractPlatformTestCase
         $tableDiff = new TableDiff($table, changedColumns: [
             'payload' => new ColumnDiff(
                 $table->getColumn('payload'),
-                (new Column(
+                new Column(
                     'payload',
                     Type::getType(Types::JSON),
-                )),
+                ),
             ),
         ]);