Merge branch '3.10.x' into 4.3.x

* 3.10.x:
  Improve DBAL migration docs for object, array and json_array type removals.
  Consistently reference IBM Db2 as Db2
  replace SplObjectStorage::attach() with SplObjectStorage::offsetSet()
  do not call setAccessible() on PHP >= 8.1
  Bump doctrine/coding-standard to v14

Author: derrabus

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

.github/workflows/continuous-integration.yml

@@ -236,8 +236,8 @@ jobs:
             php-version: "8.2"
             extension: "pdo_sqlsrv"
 
-  phpunit-ibm-db2:
-    name: "PHPUnit with IBM DB2"
+  phpunit-db2:
+    name: "PHPUnit with Db2"
     needs: "phpunit-smoke-check"
     uses: ./.github/workflows/phpunit-db2.yml
     with:
@@ -293,7 +293,7 @@ jobs:
       - "phpunit-mariadb"
       - "phpunit-mysql"
       - "phpunit-mssql"
-      - "phpunit-ibm-db2"
+      - "phpunit-db2"
 
     steps:
       - name: "Checkout"

.github/workflows/documentation.yml

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

.github/workflows/phpunit-db2.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install IBM DB2 CLI driver
+      - name: Install Db2 CLI driver
         working-directory: /tmp
         run: |
           wget https://github.com/ibmdb/db2drivers/raw/refs/heads/main/clidriver/v11.5.9/linuxx64_odbc_cli.tar.gz

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

UPGRADE.md

@@ -1916,6 +1916,22 @@ The following classes and constants have been deprecated:
 
 Use JSON for storing unstructured data.
 
+You can keep the old type behavior by copying (and adapting) the old type
+classes
+([Array](https://github.com/doctrine/dbal/blob/2.13.9/lib/Doctrine/DBAL/Types/ArrayType.php)
+and
+[Object](https://github.com/doctrine/dbal/blob/2.13.9/lib/Doctrine/DBAL/Types/ObjectType.php))
+into your own code- base and re-register them in the TypeRegistry:
+
+```php
+use Doctrine\DBAL\Types\TypeFactory;
+use MyApp\Doctrine\Types\ArrayType;
+use MyApp\Doctrine\Types\ObjectType;
+
+TypeRegistry::register('array', new ArrayType());
+TypeRegistry::register('object', new ObjectType());
+```
+
 ## Deprecated `Driver::getSchemaManager()`.
 
 The `Driver::getSchemaManager()` method has been deprecated. Use `AbstractPlatform::createSchemaManager()` instead.
@@ -2122,9 +2138,9 @@ following methods are deprecated:
 The protected property `AbstractPlatform::$doctrineTypeComments` is deprecated
 as well.
 
-## Deprecated support for IBM DB2 10.5 and older
+## Deprecated support for Db2 10.5 and older
 
-IBM DB2 10.5 and older won't be supported in DBAL 4. Consider upgrading to IBM DB2 11.1 or later.
+Db2 10.5 and older won't be supported in DBAL 4. Consider upgrading to Db2 11.1 or later.
 
 ## Deprecated support for Oracle 12c (12.2.0.1) and older
 
@@ -2672,9 +2688,49 @@ Please generate UUIDs on the application side (e.g. using [ramsey/uuid](https://
 
 The `Doctrine\DBAL\Driver::getName()` has been removed.
 
+## BC Break: `json_array` type removed
+
+Removed `json_array` type and all associated hacks.
+
+It is recommened to migrate to the `json` type while still being on the ORM 2
+branch. You then need to migrate the database (using migrations or SchemaTool)
+to update both the type and especially remove the `(Dc2Type:json_array)` column
+comment, before you ugprade to DBAL 3.
+
+If you cannot migrate the database or  rely on this type, especially its
+behavior with regard to NULL and empty values, you can copy (adapt) the
+[JsonArrayType
+class](https://github.com/doctrine/dbal/blob/2.13.9/lib/Doctrine/DBAL/Types/JsonArrayType.php)
+into your own codebase and re-regsiter under the name:
+
+```php
+use Doctrine\DBAL\Types\TypeFactory;
+use MyApp\Doctrine\Types\JsonArrayType;
+
+TypeRegistry::register('json_array', new JsonArrayType());
+```
+
+Or if you want to opt into the newer type instead, with its slightly changed null behavior, you can
+register that with:
+
+```php
+use Doctrine\DBAL\Types\TypeFactory;
+use Doctrine\DBAL\Types\JsonType;
+
+TypeRegistry::register('json_array', new JsonType());
+```
+
+In Symfony you can register this type with:
+
+```yml
+doctrine:
+   dbal:
+      types:
+         json_array: "Doctrine\\DBAL\\Types\\JsonType"
+```
+
 ## BC BREAK Removed previously deprecated features
 
- * Removed `json_array` type and all associated hacks.
  * Removed `Connection::TRANSACTION_*` constants.
  * Removed `AbstractPlatform::DATE_INTERVAL_UNIT_*` and `AbstractPlatform::TRIM_*` constants.
  * Removed `AbstractPlatform::getSQLResultCasing()`, `::prefersSequences()` and `::supportsForeignKeyOnUpdate()` methods.
@@ -2790,9 +2846,9 @@ All implementations of the `VersionAwarePlatformDriver` interface have to implem
 The `Doctrine\DBAL\Platforms\MsSQLKeywords` class has been removed.
 Please use `Doctrine\DBAL\Platforms\SQLServerPlatform` instead.
 
-## BC BREAK: Removed PDO DB2 driver
+## BC BREAK: Removed PDO Db2 driver
 
-This PDO-based IBM DB2 driver (built on top of `pdo_ibm` extension) has already been unsupported as of 2.5, it has been now removed.
+This PDO-based Db2 driver (built on top of `pdo_ibm` extension) has already been unsupported as of 2.5, it has been now removed.
 
 The following class has been removed:
 

composer.json

@@ -37,15 +37,15 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "doctrine/coding-standard": "13.0.1",
+        "doctrine/coding-standard": "14.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
         "phpstan/phpstan": "2.1.22",
         "phpstan/phpstan-phpunit": "2.0.6",
         "phpstan/phpstan-strict-rules": "^2",
         "phpunit/phpunit": "11.5.23",
-        "slevomat/coding-standard": "8.16.2",
-        "squizlabs/php_codesniffer": "3.13.1",
+        "slevomat/coding-standard": "8.24.0",
+        "squizlabs/php_codesniffer": "4.0.0",
         "symfony/cache": "^6.3.8|^7.0",
         "symfony/console": "^5.4|^6.3|^7.0"
     },

docs/en/reference/configuration.rst

@@ -172,7 +172,7 @@ interfaces to use. It can be configured in one of two ways:
    -  ``pdo_sqlsrv``: A Microsoft SQL Server driver that uses pdo_sqlsrv PDO
    -  ``sqlsrv``: A Microsoft SQL Server driver that uses the sqlsrv PHP extension.
    -  ``oci8``: An Oracle driver that uses the oci8 PHP extension.
-   -  ``ibm_db2``: An IBM DB2 driver that uses the ibm_db2 PHP extension.
+   -  ``ibm_db2``: A Db2 driver that uses the ibm_db2 PHP extension.
 
 -  ``driverClass``: Specifies a custom driver implementation if no
    'driver' is specified. This allows the use of custom drivers that

docs/en/reference/introduction.rst

@@ -13,7 +13,7 @@ the oci8 extension under the hood.
 
 The following database vendors are currently supported:
 
-- DB2 (IBM)
+- Db2 (IBM)
 - MariaDB
 - MySQL (Oracle)
 - Oracle

docs/en/reference/known-vendor-issues.rst

@@ -127,13 +127,13 @@ columns in the table is not the same as the order in the primary key. Tables
 created with Doctrine use the order of the columns as defined in the primary
 key.
 
-IBM DB2
--------
+Db2
+---
 
 DateTimeTz
 ~~~~~~~~~~
 
-DB2 does not support saving timezone offsets. The DateTimeTz type therefore behaves like the DateTime
+Db2 does not support saving timezone offsets. The DateTimeTz type therefore behaves like the DateTime
 type.
 
 Oracle