Merge pull request #410 from doctrine/4.0.x

Merge 4.0.x up into 4.1.x

Author: greg0ire

.doctrine-project.json

@@ -5,16 +5,28 @@
     "docsSlug": "doctrine-persistence",
     "versions": [
         {
-            "name": "4.0",
-            "branchName": "4.0.x",
+            "name": "5.0",
+            "branchName": "5.0.x",
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "4.1",
+            "branchName": "4.1.x",
+            "slug": "4.1",
+            "upcoming": true
+        },
+        {
+            "name": "4.0",
+            "branchName": "4.0.x",
+            "slug": "4.0",
+            "current": true
+        },
         {
             "name": "3.4",
             "branchName": "3.4.x",
             "slug": "3.4",
-            "current": true
+            "maintained": true
         },
         {
             "name": "3.3",

.github/dependabot.yml

@@ -6,3 +6,4 @@ updates:
       interval: "weekly"
     labels:
       - "CI"
+    target-branch: "3.4.x"

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.1.0"

.github/workflows/continuous-integration.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@7.1.0"
     with:
       php-versions: '["8.1", "8.2", "8.3"]'
     secrets:

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.1.0"

README.md

@@ -1,7 +1,7 @@
 # Doctrine Persistence
 
-[![GitHub Actions][GA 3.4 image]][GA 3.4]
-[![Code Coverage][Coverage 3.4 image]][CodeCov 3.4]
+[![GitHub Actions][GA 4.0 image]][GA 4.0]
+[![Code Coverage][Coverage 4.0 image]][CodeCov 4.0]
 
 The Doctrine Persistence project is a library that provides common abstractions for object mapper persistence.
 
@@ -11,7 +11,7 @@ The Doctrine Persistence project is a library that provides common abstractions
 * [Documentation](https://www.doctrine-project.org/projects/doctrine-persistence/en/latest/index.html)
 * [Downloads](https://github.com/doctrine/persistence/releases)
 
-  [Coverage 3.4 image]: https://codecov.io/gh/doctrine/persistence/branch/3.4.x/graph/badge.svg
-  [CodeCov 3.4]: https://codecov.io/gh/doctrine/persistence/branch/3.4.x
-  [GA 3.4 image]: https://github.com/doctrine/persistence/actions/workflows/continuous-integration.yml/badge.svg?branch=3.4.x
-  [GA 3.4]: https://github.com/doctrine/persistence/actions/workflows/continuous-integration.yml?branch=3.4.x
+  [Coverage 4.0 image]: https://codecov.io/gh/doctrine/persistence/branch/4.0.x/graph/badge.svg
+  [CodeCov 4.0]: https://codecov.io/gh/doctrine/persistence/branch/4.0.x
+  [GA 4.0 image]: https://github.com/doctrine/persistence/actions/workflows/continuous-integration.yml/badge.svg?branch=4.0.x
+  [GA 4.0]: https://github.com/doctrine/persistence/actions/workflows/continuous-integration.yml?branch=4.0.x

composer.json

@@ -32,9 +32,6 @@
         "phpunit/phpunit": "^9.6",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0"
     },
-    "conflict": {
-        "doctrine/common": "<2.10"
-    },
     "autoload": {
         "psr-4": {
             "Doctrine\\Persistence\\": "src/Persistence"