Skip to content

Commit

Permalink
Merge pull request #178 from TimWolla/psalm-psl
Browse files Browse the repository at this point in the history
Remove `php-standard-library/psalm-plugin`
  • Loading branch information
asgrim authored Jan 28, 2025
2 parents e41e560 + 38337a0 commit 5cf53e8
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 59 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
# temporarily remove Psalm until ready for PHP 8.4
- name: remove psalm
if: matrix.php-versions == '8.4'
run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit php-standard-library/psalm-plugin
run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit
- uses: ramsey/composer-install@v3
- name: Run PHPUnit on Windows
if: matrix.operating-system == 'windows-latest'
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
# temporarily remove Psalm until ready for PHP 8.4
- name: remove psalm
if: matrix.php-versions == '8.4'
run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit php-standard-library/psalm-plugin
run: composer remove --dev --no-install vimeo/psalm psalm/plugin-phpunit
- uses: ramsey/composer-install@v3
- name: Run Behat on Windows
if: matrix.operating-system == 'windows-latest'
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"require-dev": {
"behat/behat": "^3.17",
"doctrine/coding-standard": "^12.0",
"php-standard-library/psalm-plugin": "^2.3",
"phpunit/phpunit": "^10.5.39",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.26.1"
Expand Down
56 changes: 1 addition & 55 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
</projectFiles>
<plugins>
<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
<pluginClass class="Psl\Psalm\Plugin"/>
</plugins>
<issueHandlers>
<PossiblyUnusedMethod>
Expand Down

0 comments on commit 5cf53e8

Please sign in to comment.