Merge branch '2.4.x' into 2.3.x-merge-up-into-2.4.x_bQewfsbb

Ocramius · Mar 5, 2022 · 6ee248e · 6ee248e
2 parents 184faed + 0d5fc19
commit 6ee248e
Show file tree

Hide file tree

Showing 8 changed files with 895 additions and 641 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,25 @@
+{
+  "version": 2,
+  "updates": [
+    {
+      "allow": [
+        {
+          "dependency-type": "all"
+        }
+      ],
+      "directory": "/",
+      "package-ecosystem": "composer",
+      "schedule": {
+        "interval": "daily"
+      },
+      "versioning-strategy": "increase"
+    },
+    {
+      "directory": "/",
+      "package-ecosystem": "github-actions",
+      "schedule": {
+        "interval": "daily"
+      }
+    }
+  ]
+}
diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml
@@ -0,0 +1,23 @@
+# See https://github.com/ridedott/merge-me-action/
+# This workflow automates merges from patches sent by Dependabot, and
+# only by dependabot, once the other CI workflows pass
+name: Auto-merge Dependabot PRs
+
+on:
+  workflow_run:
+    types:
+      - completed
+    workflows:
+      - "Continuous Integration"
+
+jobs:
+  merge-me:
+    name: Auto-merge Dependabot PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Auto-Merge
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        uses: ridedott/merge-me-action@v2.9.35
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MERGE_METHOD: MERGE
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -58,9 +58,7 @@ jobs:
         run: "composer install --no-interaction --no-progress --no-suggest --ignore-platform-req=php"
 
       - name: "Infection"
-        # Note: we disable infection CI checking right now, since infection is not yet compatible with PHPUnit 9.3.x
-        # We do need PHPUnit 9.3.x though, because otherwise we can't run our tests on PHP 8.0.x.
-        run: "vendor/bin/infection || true"
+        run: "vendor/bin/roave-infection-static-analysis-plugin"
         env:
           INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -55,3 +55,13 @@ jobs:
           "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
+
+      - name: "Create new milestones"
+        uses: "laminas/automatic-releases@v1"
+        with:
+          command-name: "laminas:automatic-releases:create-milestones"
+        env:
+          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
+          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
+          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
+          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,24 +20,8 @@ Total issues resolved: **5**
 - [152: Ocramius/PackageVersions is not compatible with composer configuration &quot;lock: false&quot;](https://github.com/Ocramius/PackageVersions/issues/152) thanks to @windaishi
 - [155: BC break: removed deprecated `PackageVersions\Versions::ROOT_PACKAGE_NAME` constant](https://github.com/Ocramius/PackageVersions/pull/155) thanks to @Ocramius
 
-## 2.3.1 - 2022-03-05
-
-
 -----
 
-### Release Notes for [2.3.1](https://github.com/Ocramius/PackageVersions/milestone/41)
-
-
-
-### 2.3.1
-
-- Total issues resolved: **0**
-- Total pull requests resolved: **1**
-- Total contributors: **1**
-
-#### enhancement,help wanted
-
- - [199: Raise awareness of current Russia-Ukraine situation, targeting Russian 🇷🇺  readers](https://github.com/Ocramius/PackageVersions/pull/199) thanks to @github-actions[bot]
 
 ## 2.3.0 - 2020-12-23
 

diff --git a/composer.json b/composer.json
@@ -10,16 +10,16 @@
         }
     ],
     "require": {
-        "php":                  "~8.0.0",
-        "composer-runtime-api": "^2.0.0"
+        "php":                  "~8.0.0 || ~8.1.0",
+        "composer-runtime-api": "^2.1.0"
     },
     "require-dev": {
-        "composer/composer":        "^2.0.0@dev",
-        "doctrine/coding-standard": "^8.1.0",
-        "ext-zip":                  "^1.15.0",
-        "infection/infection":      "dev-master#8d6c4d6b15ec58d3190a78b7774a5d604ec1075a",
-        "phpunit/phpunit":          "~9.3.11",
-        "vimeo/psalm":              "^4.0.1"
+        "composer/composer":                      "^2.1.8",
+        "doctrine/coding-standard":               "^9.0.0",
+        "ext-zip":                                "^1.15.0",
+        "roave/infection-static-analysis-plugin": "^1.10.0",
+        "phpunit/phpunit":                        "^9.5.9",
+        "vimeo/psalm":                            "^4.10.0"
     },
     "replace": {
         "composer/package-versions-deprecated": "*"