Merge branch '5.0.x' into 5.1.x

doctrine · Aug 30, 2024 · 396377f · 396377f
2 parents ee1e238 + edfb3da
commit 396377f
Show file tree

Hide file tree

Showing 16 changed files with 359 additions and 80 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -4,20 +4,40 @@
     "slug": "doctrine-mongodb-bundle",
     "versions": [
         {
-            "name": "4.5",
-            "branchName": "4.5.x",
+            "name": "5.1",
+            "branchName": "5.1.x",
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "5.0",
+            "branchName": "5.0.x",
+            "slug": "5.0",
+            "current": true
+        },
+        {
+            "name": "4.7",
+            "branchName": "4.7.x",
+            "slug": "4.7",
+            "maintained": false
+        },
+        {
+            "name": "4.6",
+            "branchName": "4.6.x",
+            "slug": "4.6",
+            "maintained": false
+        },
+        {
+            "name": "4.5",
+            "branchName": "4.5.x",
+            "slug": "4.5",
+            "maintained": false
+        },
         {
             "name": "4.4",
             "branchName": "4.4.x",
             "slug": "4.4",
-            "current": true,
-            "aliases": [
-                "current",
-                "stable"
-            ]
+            "maintained": false
         },
         {
             "name": "4.3",

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -11,4 +11,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml
@@ -15,4 +15,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@5.0.1"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -66,7 +66,7 @@ jobs:
           key: "extcache-v1"
 
       - name: Cache extensions
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.extcache.outputs.dir }}
           key: ${{ steps.extcache.outputs.key }}
@@ -85,17 +85,17 @@ jobs:
         run: "composer config minimum-stability ${{ matrix.stability }}"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
-          name: "phpunit-${{ matrix.php-version }}.coverage"
+          name: "phpunit-${{ matrix.php-version }}-${{ hashFiles(composer.lock) }}.coverage"
           path: "coverage.xml"
 
   upload_coverage:
@@ -106,16 +106,18 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v3"
+        uses: "codecov/codecov-action@v4"
         with:
           directory: reports
+        env:
+          CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -10,7 +10,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: "DOCtor-RST"
               uses: docker://oskarstark/doctor-rst

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.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@3.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -30,7 +30,7 @@ jobs:
         run: "composer config minimum-stability stable"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
 
       - name: "Run a static analysis with vimeo/psalm"
         run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --php-version=${{ matrix.php-version }}"