Merge branch '5.0.x' into 4.2.x-merge-up-into-5.0.x_ouqcWgwJ

# Conflicts:
#	composer.json

Author: driehle

.doctrine-project.json

@@ -4,25 +4,37 @@
   "slug": "doctrine-orm-module",
   "versions": [
     {
-      "name": "4.2",
-      "branchName": "4.2.x",
-      "slug": "4.2",
+      "name": "5.1",
+      "branchName": "5.1.x",
+      "slug": "5.1",
       "aliases": [
         "latest"
       ],
       "upcoming": true
     },
     {
-      "name": "4.1",
-      "branchName": "4.1.x",
-      "slug": "4.1",
+      "name": "5.0",
+      "branchName": "5.0.x",
+      "slug": "5.0",
       "aliases": [
         "current",
         "stable"
       ],
       "current": true,
       "maintained": true
     },
+    {
+      "name": "4.2",
+      "branchName": "4.2.x",
+      "slug": "4.2",
+      "maintained": true
+    },
+    {
+      "name": "4.1",
+      "branchName": "4.1.x",
+      "slug": "4.1",
+      "maintained": false
+    },
     {
       "name": "4.0",
       "branchName": "4.0.x",

.github/workflows/coding-standards.yml

@@ -14,4 +14,3 @@ jobs:
     uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1"
     with:
       php-version: '8.1'
-      composer-options: '--prefer-dist --ignore-platform-req=php'

.github/workflows/continuous-integration.yml

@@ -17,7 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -30,22 +29,22 @@ jobs:
           - true
           - false
         include:
-          -   php-version: "7.3"
-              dependencies: "lowest"
-              dbal-version: "2.13.0"
-              optional-dependencies: false
-          -   php-version: "7.3"
-              dependencies: "lowest"
-              dbal-version: "3.1.0"
-              optional-dependencies: false
-          -   php-version: "7.3"
-              dependencies: "lowest"
-              dbal-version: "2.13.0"
-              optional-dependencies: true
-          -   php-version: "7.3"
-              dependencies: "lowest"
-              dbal-version: "3.1.0"
-              optional-dependencies: true
+          - php-version: "7.4"
+            dbal-version: "2.13.0"
+            dependencies: "lowest"
+            optional-dependencies: false
+          - php-version: "7.4"
+            dbal-version: "3.1.0"
+            dependencies: "lowest"
+            optional-dependencies: false
+          - php-version: "7.4"
+            dbal-version: "2.13.0"
+            dependencies: "lowest"
+            optional-dependencies: true
+          - php-version: "7.4"
+            dbal-version: "3.1.0"
+            dependencies: "lowest"
+            optional-dependencies: true
 
     services:
       mysql:
@@ -78,26 +77,14 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
-        if: "! startsWith(matrix.php-version, '8')"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-suggest"
 
-      - name: "Install dependencies with Composer (--ignore-platform-req=php)"
-        uses: "ramsey/composer-install@v1"
-        if: "startsWith(matrix.php-version, '8')"
-        with:
-          dependency-versions: "${{ matrix.dependencies }}"
-          composer-options: "--prefer-dist --no-suggest --ignore-platform-req=php"
-
       - name: "Remove optional dependencies"
-        if: "! startsWith(matrix.php-version, '8') && ! matrix.optional-dependencies"
+        if: "! matrix.optional-dependencies"
         run: "composer remove --dev doctrine/data-fixtures doctrine/migrations"
 
-      - name: "Remove optional dependencies (--ignore-platform-req=php)"
-        if: "startsWith(matrix.php-version, '8') && ! matrix.optional-dependencies"
-        run: "composer remove --ignore-platform-req=php --dev doctrine/data-fixtures doctrine/migrations"
-
       - name: "Configure test application"
         run: "cp ci/config/application.config.php config/application.config.php"
 

.github/workflows/static-analysis.yml

@@ -14,4 +14,3 @@ jobs:
     uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.4.1"
     with:
       php-version: '8.1'
-      composer-options: '--prefer-dist --ignore-platform-req=php'

Module.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * This file is placed here for compatibility with Laminas's ModuleManager.
+ * It allows usage of this module even without composer.
+ * The original Module.php is in 'src/' in order to respect PSR-4.
+ */
+require_once __DIR__ . '/src/Module.php';

README.md

@@ -23,32 +23,6 @@ Run the following to install this library using [Composer](https://getcomposer.o
 composer require doctrine/doctrine-orm-module
 ```
 
-### Note on PHP 8.0 or later
-
-[DoctrineModule](https://github.com/doctrine/DoctrineModule/) provides an integration with 
-[laminas-cache](https://docs.laminas.dev/laminas-cache/), which currently comes with some storage adapters which 
-are not compatible with PHP 8.0 or later. To prevent installation of these unused cache adapters, you will need 
-to add the following to your `composer.json` file:
-
-```json
-    "require": {
-         "doctrine/doctrine-orm-module": "^4.1.0"
-    },
-    "replace": {
-        "laminas/laminas-cache-storage-adapter-apc": "*",
-        "laminas/laminas-cache-storage-adapter-dba": "*",
-        "laminas/laminas-cache-storage-adapter-memcache": "*",
-        "laminas/laminas-cache-storage-adapter-memcached": "*",
-        "laminas/laminas-cache-storage-adapter-mongodb": "*",
-        "laminas/laminas-cache-storage-adapter-wincache": "*",
-        "laminas/laminas-cache-storage-adapter-xcache": "*",
-        "laminas/laminas-cache-storage-adapter-zend-server": "*"
-    }
-```
-
-Consult the [laminas-cache documentation](https://docs.laminas.dev/laminas-cache/installation/#avoid-unused-cache-adapters-are-being-installed)
-for further information on this issue.
-
 ## Documentation
 
 Please check the [documentation on the Doctrine website](https://www.doctrine-project.org/projects/doctrine-orm-module.html)

composer.json

@@ -45,22 +45,22 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
         "container-interop/container-interop": "^1.2.0",
-        "doctrine/dbal": "^2.13.4 || ^3.1.3",
-        "doctrine/doctrine-laminas-hydrator": "^2.2.1",
-        "doctrine/doctrine-module": "^4.2.2",
+        "doctrine/dbal": "^2.13.4 || ^3.1.4",
+        "doctrine/doctrine-laminas-hydrator": "^2.2.1 || ^3.0.0",
+        "doctrine/doctrine-module": "^5.0.0",
         "doctrine/event-manager": "^1.1.1",
         "doctrine/orm": "^2.11.1",
-        "doctrine/persistence": "^2.2.2",
+        "doctrine/persistence": "^2.2.3",
         "laminas/laminas-eventmanager": "^3.4.0",
         "laminas/laminas-modulemanager": "^2.11.0",
         "laminas/laminas-mvc": "^3.3.0",
         "laminas/laminas-paginator": "^2.11.0",
-        "laminas/laminas-servicemanager": "^3.7.0",
-        "laminas/laminas-stdlib": "^3.6.1",
-        "symfony/console": "^5.3.0 || ^6.0.0"
+        "laminas/laminas-servicemanager": "^3.10.0",
+        "laminas/laminas-stdlib": "^3.6.4",
+        "symfony/console": "^5.4.1 || ^6.0.1"
     },
     "require-dev": {
         "doctrine/annotations": "^1.13.2",
@@ -76,7 +76,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^9.5.10",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "vimeo/psalm": "^4.13.0"
+        "vimeo/psalm": "^4.15.0"
     },
     "conflict": {
         "doctrine/migrations": "<3.3"

docs/en/index.rst

@@ -20,34 +20,6 @@ Run the following to install this library using `Composer <https://getcomposer.o
 
    $ composer require doctrine/doctrine-orm-module
 
-Note on PHP 8.0 or later
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-`DoctrineModule <https://www.doctrine-project.org/projects/doctrine-module/en/current/index.html>`__
-provides an integration with `laminas-cache <https://docs.laminas.dev/laminas-cache/>`__, which
-currently comes with some storage adapters which are not compatible with PHP 8.0 or later. To
-prevent installation of these unused cache adapters, you will need to add the following to your
-``composer.json`` file:
-
-.. code:: json
-
-    "require": {
-         "doctrine/doctrine-orm-module": "^4.1.0"
-    },
-    "replace": {
-        "laminas/laminas-cache-storage-adapter-apc": "*",
-        "laminas/laminas-cache-storage-adapter-dba": "*",
-        "laminas/laminas-cache-storage-adapter-memcache": "*",
-        "laminas/laminas-cache-storage-adapter-memcached": "*",
-        "laminas/laminas-cache-storage-adapter-mongodb": "*",
-        "laminas/laminas-cache-storage-adapter-wincache": "*",
-        "laminas/laminas-cache-storage-adapter-xcache": "*",
-        "laminas/laminas-cache-storage-adapter-zend-server": "*"
-    }
-
-Consult the `laminas-cache documentation <https://docs.laminas.dev/laminas-cache/installation/#avoid-unused-cache-adapters-are-being-installed>`__
-for further information on this issue.
-
 Next Steps
 ----------
 

phpcs.xml

@@ -6,8 +6,8 @@
     <arg name="cache" value=".phpcs.cache"/>
     <arg name="colors"/>
 
-    <!-- set minimal required PHP version (7.3) -->
-    <config name="php_version" value="70300"/>
+    <!-- set minimal required PHP version (7.4) -->
+    <config name="php_version" value="70400"/>
 
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>

phpstan.neon

@@ -1,10 +1,14 @@
 parameters:
-    level: 5
+    level: 6
     paths:
         - src
         - tests
+    checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
     ignoreErrors:
+        -
+            message: '#Method .*EntityBasedFormBuilder::createForm\(\) .* iterable type .*FormInterface#'
+            path: src/Form/Annotation/EntityBasedFormBuilder.php
         -
             message: '#Offset class-string<object> on array\{\} in isset\(\) does not exist#'
             path: src/Yuml/MetadataGrapher.php

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="5"
+    errorLevel="4"
     phpVersion="8.0"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

src/CliConfigurator.php

@@ -21,11 +21,10 @@
 
 class CliConfigurator
 {
-    /** @var string */
-    private $defaultObjectManagerName = 'doctrine.entitymanager.orm_default';
+    private string $defaultObjectManagerName = 'doctrine.entitymanager.orm_default';
 
     /** @var string[] */
-    private $commands = [
+    private array $commands = [
         'doctrine.dbal_cmd.runsql',
         'doctrine.dbal_cmd.reserved_words',
         'doctrine.orm_cmd.clear_cache_metadata',
@@ -46,7 +45,7 @@ class CliConfigurator
     ];
 
     /** @var string[] */
-    private $migrationCommands = [
+    private array $migrationCommands = [
         'doctrine.migrations_cmd.current',
         'doctrine.migrations_cmd.diff',
         'doctrine.migrations_cmd.dumpschema',
@@ -62,8 +61,7 @@ class CliConfigurator
         'doctrine.migrations_cmd.uptodate',
     ];
 
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {