Skip to content

Commit 4cad50a

Browse files
committed
Revert "Add workaround for Psalm and PHP 8.5"
This reverts commit 6a6ff9f.
1 parent 2c9fb90 commit 4cad50a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ jobs:
7878
key: "cache-composer-${{ hashFiles('composer.json') }}"
7979
restore-keys: 'cache-composer-'
8080
- name: Run composer
81-
if: ${{ matrix.php_version != '8.5' }}
8281
run: composer update ${{ matrix.dependencies_level }} --prefer-dist --no-interaction --no-progress
83-
- name: Run composer PHP 8.5 workaround
84-
if: ${{ matrix.php_version == '8.5' }}
85-
run: composer update ${{ matrix.dependencies_level }} --ignore-platform-reqs --prefer-dist --no-interaction --no-progress
8682
- name: Check composer.json
8783
run: composer normalize --dry-run
8884
- name: Run tests
@@ -92,7 +88,7 @@ jobs:
9288
- name: Run PHPStan
9389
run: vendor/bin/phpstan analyse --no-progress
9490
- name: Run psalm
95-
if: ${{ matrix.os != 'windows-latest' && matrix.php_version != '8.5' }}
91+
if: ${{ matrix.os != 'windows-latest' }}
9692
run: vendor/bin/psalm
9793
- name: Run phan
9894
if: ${{ matrix.os != 'windows-latest' }}

0 commit comments

Comments
 (0)