Merge pull request #6721 from doctrine/3.9.x

Merge 3.9.x up into 3.10.x

.gitattributes

@@ -8,8 +8,6 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
-/psalm.xml.dist export-ignore
-/psalm-strict.xml export-ignore
 /run-all.sh export-ignore
 /SECURITY.md export-ignore
 /static-analysis export-ignore

.github/workflows/static-analysis.yml

@@ -8,8 +8,6 @@ on:
       - .github/workflows/static-analysis.yml
       - composer.*
       - phpstan.neon.dist
-      - psalm.xml.dist
-      - psalm-strict.xml
       - src/**
       - static-analysis/**
       - tests/**
@@ -20,66 +18,11 @@ on:
       - .github/workflows/static-analysis.yml
       - composer.*
       - phpstan.neon.dist
-      - psalm.xml.dist
-      - psalm-strict.xml
       - src/**
       - static-analysis/**
       - tests/**
 
 jobs:
   static-analysis-phpstan:
-    name: "Static Analysis with PHPStan"
-    runs-on: "ubuntu-22.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.4"
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v4"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "${{ matrix.php-version }}"
-          tools: "cs2pr"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
-        with:
-          composer-options: "--ignore-platform-req=php+"
-
-      - name: "Run a static analysis with phpstan/phpstan"
-        run: "vendor/bin/phpstan --error-format=checkstyle | cs2pr"
-
-  static-analysis-psalm:
-    name: "Static Analysis with Psalm"
-    runs-on: "ubuntu-22.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.3"
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          coverage: none
-          php-version: ${{ matrix.php-version }}
-          tools: cs2pr
-
-      - name: Install dependencies with Composer
-        uses: ramsey/composer-install@v3
-
-      - name: Run static analysis with Vimeo Psalm
-        run: vendor/bin/psalm --shepherd
-
-      - name: Run type inference tests with Vimeo Psalm
-        run: vendor/bin/psalm --config=psalm-strict.xml --shepherd
+    name: "Static Analysis"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

.gitignore

@@ -10,4 +10,3 @@ vendor/
 /phpunit.xml
 /.phpcs-cache
 /phpstan.neon
-/psalm.xml

README.md

@@ -5,7 +5,6 @@
 |      [![GitHub Actions][GA 5.0 image]][GA 5.0]      |      [![GitHub Actions][GA 4.3 image]][GA 4.3]      |      [![GitHub Actions][GA 4.2 image]][GA 4.2]      |      [![GitHub Actions][GA 3.10 image]][GA 3.10]      |      [![GitHub Actions][GA 3.9 image]][GA 3.9]      |
 |   [![AppVeyor][AppVeyor 5.0 image]][AppVeyor 5.0]   |   [![AppVeyor][AppVeyor 4.3 image]][AppVeyor 4.3]   |   [![AppVeyor][AppVeyor 4.2 image]][AppVeyor 4.2]   |   [![AppVeyor][AppVeyor 3.10 image]][AppVeyor 3.10]   |   [![AppVeyor][AppVeyor 3.9 image]][AppVeyor 3.9]   |
 | [![Code Coverage][Coverage 5.0 image]][CodeCov 5.0] | [![Code Coverage][Coverage 4.3 image]][CodeCov 4.3] | [![Code Coverage][Coverage 4.2 image]][CodeCov 4.2] | [![Code Coverage][Coverage 3.10 image]][CodeCov 3.10] | [![Code Coverage][Coverage 3.9 image]][CodeCov 3.9] |
-|                         N/A                         |                         N/A                         |     [![Type Coverage][TypeCov image]][TypeCov]      |                         N/A                           |                         N/A                         |
 
 Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features for database schema introspection and schema management.
 
@@ -38,8 +37,6 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
   [AppVeyor 4.2 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.2.x?svg=true
   [GA 4.2]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.2.x
   [GA 4.2 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=4.2.x
-  [TypeCov]: https://shepherd.dev/github/doctrine/dbal
-  [TypeCov image]: https://shepherd.dev/github/doctrine/dbal/coverage.svg
 
   [Coverage 3.10 image]: https://codecov.io/gh/doctrine/dbal/branch/3.10.x/graph/badge.svg
   [3.10]: https://github.com/doctrine/dbal/tree/3.10.x

composer.json

@@ -46,12 +46,10 @@
         "phpstan/phpstan": "2.1.1",
         "phpstan/phpstan-strict-rules": "^2",
         "phpunit/phpunit": "9.6.22",
-        "psalm/plugin-phpunit": "0.18.4",
         "slevomat/coding-standard": "8.13.1",
         "squizlabs/php_codesniffer": "3.10.2",
         "symfony/cache": "^5.4|^6.0|^7.0",
-        "symfony/console": "^4.4|^5.4|^6.0|^7.0",
-        "vimeo/psalm": "4.30.0"
+        "symfony/console": "^4.4|^5.4|^6.0|^7.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."