Merge release 6.2.0 into 7.0.x

.gitattributes

@@ -5,6 +5,4 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
-/psalm.xml.dist export-ignore
-/psalm-baseline.xml export-ignore
 /tests/ export-ignore

.github/workflows/coding-standards.yml

@@ -4,13 +4,25 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - ".github/workflows/coding-standards.yml"
+      - "composer.*"
+      - "src/**"
+      - "phpcs.xml.dist"
+      - "tests/**"
   push:
     branches:
       - "*.x"
+    paths:
+      - ".github/workflows/coding-standards.yml"
+      - "composer.*"
+      - "src/**"
+      - "phpcs.xml.dist"
+      - "tests/**"
 
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.5.1"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0"
     with:
-      php-version: '8.3'
+      php-version: "8.3"

.github/workflows/composer-lint.yml

@@ -0,0 +1,22 @@
+name: "Composer Lint"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/composer-lint.yml"
+      - "composer.json"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/composer-lint.yml"
+      - "composer.json"
+
+jobs:
+  composer-lint:
+    name: "Composer Lint"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-version: "8.3"

.github/workflows/continuous-integration.yml

@@ -4,9 +4,21 @@ on:
   pull_request:
     branches:
       - "*.x"
+    paths:
+      - ".github/workflows/continuous-integration.yml"
+      - "composer.*"
+      - "src/**"
+      - "phpunit.xml.dist"
+      - "tests/**"
   push:
     branches:
       - "*.x"
+    paths:
+      - ".github/workflows/continuous-integration.yml"
+      - "composer.*"
+      - "src/**"
+      - "phpunit.xml.dist"
+      - "tests/**"
 
 jobs:
   phpunit:
@@ -17,32 +29,22 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
         dbal-version:
-          - "2.13.0"
           - "3.3.0"
         dependencies:
           - "highest"
         optional-dependencies:
           - true
           - false
         include:
-          - php-version: "8.0"
-            dbal-version: "2.13.0"
-            dependencies: "lowest"
-            optional-dependencies: false
-          - php-version: "8.0"
+          - php-version: "8.1"
             dbal-version: "3.3.0"
             dependencies: "lowest"
             optional-dependencies: false
-          - php-version: "8.0"
-            dbal-version: "2.13.0"
-            dependencies: "lowest"
-            optional-dependencies: true
-          - php-version: "8.0"
+          - php-version: "8.1"
             dbal-version: "3.3.0"
             dependencies: "lowest"
             optional-dependencies: true
@@ -61,26 +63,31 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
-      - name: "Install PHP"
+      - name: "Install PHP with PCOV"
         uses: "shivammathur/setup-php@v2"
         with:
           php-version: "${{ matrix.php-version }}"
           coverage: "pcov"
-          ini-values: "error_reporting=E_ALL, zend.assertions=1"
+          ini-values: "zend.assertions=1"
           extensions: "pdo_mysql"
 
+      - name: "Set COMPOSER_ROOT_VERSION"
+        run: |
+          echo "COMPOSER_ROOT_VERSION=${{ inputs.composer-root-version }}" >> $GITHUB_ENV
+        if: "${{ inputs.composer-root-version }}"
+
       - name: "Require specific DBAL version"
         run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
-          composer-options: "--prefer-dist --no-suggest"
+          composer-options: "${{ inputs.composer-options }}"
 
       - name: "Remove optional dependencies"
         if: "! matrix.optional-dependencies"
@@ -103,29 +110,31 @@ jobs:
         run: "./ci/run-cli-migrations.sh"
 
       - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v2"
+        uses: "actions/upload-artifact@v4"
         with:
-          name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ matrix.dbal-version }}.coverage"
+          name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ matrix.optional-dependencies }}-${{ matrix.dbal-version }}.coverage"
           path: "coverage.xml"
 
   upload_coverage:
     name: "Upload coverage to Codecov"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     needs:
       - "phpunit"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v2"
+        uses: "actions/download-artifact@v4"
         with:
           path: "reports"
 
       - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v1"
+        uses: "codecov/codecov-action@v5"
         with:
           directory: "reports"
+        env:
+          CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/documentation.yml

@@ -0,0 +1,20 @@
+name: "Documentation"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/documentation.yml"
+      - "docs/**"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/documentation.yml"
+      - "docs/**"
+
+jobs:
+  documentation:
+    name: "Documentation"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

.github/workflows/phpstan.yml

@@ -0,0 +1,28 @@
+name: "Static Analysis"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/phpstan.yml"
+      - "composer.*"
+      - "src/**"
+      - "phpstan*"
+      - "tests/**"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - ".github/workflows/phpstan.yml"
+      - "composer.*"
+      - "src/**"
+      - "phpstan*"
+      - "tests/**"
+
+jobs:
+  static-analysis:
+    name: "Static Analysis"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-version: "8.3"

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

@@ -8,11 +8,11 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/[email protected]"
-    with:
-      use-next-minor-as-default-branch: true
+    uses: "doctrine/.github/.github/workflows/[email protected]"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
       ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
       SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
+    with:
+      use-next-minor-as-default-branch: true # defaults to false

.gitignore

@@ -1,5 +1,5 @@
 /.phpcs.cache
-/.phpunit.result.cache
+/.phpunit.cache/
 /ci/20*/
 /config/application.config.php
 /coverage.xml