Merge 3.4.x up into 4.0.x

.gitattributes

@@ -19,5 +19,3 @@ phpstan-baseline.neon export-ignore
 phpstan-dbal2.neon export-ignore
 phpstan-params.neon export-ignore
 phpstan-persistence2.neon export-ignore
-psalm.xml export-ignore
-psalm-baseline.xml export-ignore

.github/workflows/coding-standards.yml

@@ -24,4 +24,4 @@ on:
 
 jobs:
   coding-standards:
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0"

.github/workflows/continuous-integration.yml

@@ -319,6 +319,8 @@ jobs:
   upload_coverage:
     name: "Upload coverage to Codecov"
     runs-on: "ubuntu-22.04"
+    # Only run on PRs from forks
+    if: "github.event.pull_request.head.repo.full_name != github.repository"
     needs:
       - "phpunit-smoke-check"
       - "phpunit-postgres"

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@6.0.0"

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

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@6.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -9,7 +9,6 @@ on:
       - composer.*
       - src/**
       - phpstan*
-      - psalm*
       - tests/StaticAnalysis/**
   push:
     branches:
@@ -19,7 +18,6 @@ on:
       - composer.*
       - src/**
       - phpstan*
-      - psalm*
       - tests/StaticAnalysis/**
 
 jobs:
@@ -35,31 +33,11 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: none
-          php-version: "8.3"
+          php-version: "8.4"
           tools: cs2pr
 
       - name: Install dependencies with Composer
         uses: ramsey/composer-install@v2
 
       - name: Run static analysis with phpstan/phpstan
         run: "vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"
-
-  static-analysis-psalm:
-    name: Static Analysis with Psalm
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v4"
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          coverage: none
-          php-version: "8.3"
-
-      - name: Install dependencies with Composer
-        uses: ramsey/composer-install@v3
-
-      - name: Run static analysis with Vimeo Psalm
-        run: vendor/bin/psalm --shepherd

composer.json

@@ -41,13 +41,12 @@
         "phpbench/phpbench": "^1.0",
         "phpdocumentor/guides-cli": "^1.4",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "1.12.6",
-        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpstan/phpstan": "2.0.3",
+        "phpstan/phpstan-deprecation-rules": "^2",
         "phpunit/phpunit": "^10.4.0",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.2",
-        "symfony/cache": "^5.4 || ^6.2 || ^7.0",
-        "vimeo/psalm": "5.26.1"
+        "symfony/cache": "^5.4 || ^6.2 || ^7.0"
     },
     "suggest": {
         "ext-dom": "Provides support for XSD validation for XML mapping files",