Skip to content

Commit 67e24c7

Browse files
committed
PHPLIB-1752 Upgrade to psalm 6.14
1 parent 75fa63e commit 67e24c7

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/static-analysis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ on:
1717
type: string
1818
required: true
1919

20-
env:
21-
PHP_VERSION: "8.2"
22-
# TODO: change to "stable" once 2.0.0 is released
23-
# DRIVER_VERSION: "stable"
24-
DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
25-
2620
jobs:
2721
psalm:
2822
name: "Psalm"
2923
runs-on: "ubuntu-24.04"
3024

25+
matrix:
26+
include:
27+
- php-version: "8.1"
28+
driver-version: "stable"
29+
- php-version: "8.5"
30+
driver-version: "mongodb/mongo-php-driver@v2.x"
31+
3132
steps:
3233
- name: "Checkout"
3334
uses: "actions/checkout@v5"
@@ -42,8 +43,8 @@ jobs:
4243
- name: "Setup"
4344
uses: "./.github/actions/setup"
4445
with:
45-
php-version: ${{ env.PHP_VERSION }}
46-
driver-version: ${{ env.DRIVER_VERSION }}
46+
php-version: ${{ matrix.php-version }}
47+
driver-version: ${{ matrix.driver-version }}
4748

4849
- name: "Run Psalm"
4950
run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --report=psalm.sarif"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"phpunit/phpunit": "^10.5.35",
2222
"rector/rector": "^2.1.4",
2323
"squizlabs/php_codesniffer": "^3.7",
24-
"vimeo/psalm": "6.5.*"
24+
"vimeo/psalm": "~6.14.2"
2525
},
2626
"replace": {
2727
"mongodb/builder": "*"

psalm.xml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,8 @@
4545
<directory name="examples" />
4646
</errorLevel>
4747
</RiskyTruthyFalsyComparison>
48+
49+
<MissingOverrideAttribute errorLevel="suppress" />
50+
<ClassMustBeFinal errorLevel="info" />
4851
</issueHandlers>
4952
</psalm>

0 commit comments

Comments
 (0)