Merge origin/2.2.x into 3.0.x (using imerge)

.doctrine-project.json

@@ -6,26 +6,50 @@
     "versions": [
         {
             "name": "3.0",
-            "branchName": "master",
+            "branchName": "3.0.x",
             "slug": "latest",
             "upcoming": true
         },
         {
-            "name": "2.1",
-            "branchName": "2.1.x",
-            "slug": "2.1",
+            "name": "2.2",
+            "branchName": "2.2.x",
+            "slug": "2.2",
             "upcoming": true
         },
         {
-            "name": "2.0",
-            "branchName": "2.0.x",
-            "slug": "2.0",
+            "name": "2.1",
+            "branchName": "2.1.x",
+            "slug": "2.1",
             "current": true,
             "aliases": [
                 "current",
                 "stable"
             ]
         },
+        {
+            "name": "2.0",
+            "branchName": "2.0.x",
+            "slug": "2.0",
+            "maintained": false
+        },
+        {
+            "name": "1.4",
+            "branchName": "1.4.x",
+            "slug": "1.4",
+            "maintained": false
+        },
+        {
+            "name": "1.3",
+            "branchName": "1.3.x",
+            "slug": "1.3",
+            "maintained": false
+        },
+        {
+            "name": "1.2",
+            "branchName": "1.2.x",
+            "slug": "1.2",
+            "maintained": false
+        },
         {
             "name": "1.1",
             "branchName": "1.1.x",

.github/workflows/continuous-integration.yml

@@ -51,6 +51,10 @@ jobs:
         run: "composer remove --dev --no-update vimeo/psalm"
         if: "${{ matrix.php-version == '8.0' }}"
 
+      - name: "Downgrade Composer"
+        run: "composer self-update --1"
+        if: "${{ matrix.php-version == '7.1' }}"
+
       - name: "Update dependencies with composer"
         run: "composer update --no-interaction --no-progress --no-suggest"
         if: "${{ matrix.deps == 'normal' }}"

.github/workflows/static-analysis.yml

@@ -62,3 +62,5 @@ jobs:
 
       - name: Psalm
         uses: docker://vimeo/psalm-github-actions
+        with:
+          composer_require_dev: true

README.md

@@ -1,7 +1,7 @@
 # Doctrine Persistence
 
 [![Build Status](https://travis-ci.org/doctrine/persistence.svg)](https://travis-ci.org/doctrine/persistence)
-[![Code Coverage](https://codecov.io/gh/doctrine/persistence/branch/master/graph/badge.svg)](https://codecov.io/gh/doctrine/persistence/branch/master)
+[![Code Coverage](https://codecov.io/gh/doctrine/persistence/branch/2.1.x/graph/badge.svg)](https://codecov.io/gh/doctrine/persistence/branch/2.1.x)
 
 The Doctrine Persistence project is a library that provides common abstractions for object mapper persistence.
 

composer.json

@@ -27,6 +27,7 @@
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
+        "composer/package-versions-deprecated": "^1.11",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-phpunit": "^0.12",
         "phpstan/phpstan-strict-rules": "^0.12",
@@ -48,10 +49,5 @@
             "Doctrine\\Tests\\": "tests/Doctrine/Tests",
             "Doctrine\\Tests_PHP74\\": "tests/Doctrine/Tests_PHP74"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        }
     }
 }