Skip to content

Commit e48a15c

Browse files
test(psalm): Fix psalm for php < 8.4
1 parent 1c16ac4 commit e48a15c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ jobs:
9191
run: ddev phpmd ./${{env.EXTENSION_PATH}}/tools/coding-standards phpmd/rulesets.xml ../../src
9292

9393
- name: Run PSALM
94-
# Disable Psalm waiting for a solution to https://github.com/vimeo/psalm/issues/10531
95-
if: false
94+
if: contains(fromJson('["7.4","8.0","8.1","8.2","8.3"]'),matrix.php-version)
9695
run: ddev psalm ./${{env.EXTENSION_PATH}}/tools/coding-standards ./${{env.EXTENSION_PATH}}/tools/coding-standards/psalm
9796

9897
- name: Prepare for Code Coverage

tools/coding-standards/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"phpstan/phpstan": "^1.8.0",
66
"phpmd/phpmd": "^2.12.0",
77
"squizlabs/php_codesniffer": "3.7.1",
8-
"vimeo/psalm": "^4.24.0",
8+
"vimeo/psalm": "^4.24.0 || ^5.26.0",
99
"phpunit/phpunit": "^9.3",
1010
"phpunit/php-code-coverage": "^9.2.15",
1111
"mikey179/vfsstream": "^1.6.11",

0 commit comments

Comments
 (0)