Skip to content

Commit

Permalink
Drop Psalm
Browse files Browse the repository at this point in the history
As per the decision we took during the hackathon.
I also had to upgrade PHPStan, presumably because removing Psalm
resulted in dependencies being updated, and lots of deprecations being
shown in the PHPStan job.
  • Loading branch information
greg0ire committed Dec 1, 2024
1 parent 0d0c25d commit 729d36e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 40 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
/tests export-ignore
/test_fixtures export-ignore
/phpstan.neon export-ignore
/psalm.xml export-ignore
4 changes: 1 addition & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
- composer.*
- src/**
- phpstan*
- psalm*
- test_fixtures/**
- tests/**
push:
Expand All @@ -20,11 +19,10 @@ on:
- composer.*
- src/**
- phpstan*
- psalm*
- test_fixtures/**
- tests/**

jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
uses: "doctrine/.github/.github/workflows/phpstan.yml@6.0.0"
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
},
"require-dev": {
"doctrine/coding-standard": "^9",
"phpstan/phpstan": "1.4.10 || 1.10.15",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan": "1.4.10 || 2.0.3",
"phpstan/phpstan-phpunit": "^1.0 || ^2",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psalm/plugin-phpunit": "0.18.4",
"psr/log": "^1 || ^2 || ^3",
"vimeo/psalm": "4.30.0 || 5.12.0"
"psr/log": "^1 || ^2 || ^3"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
Expand Down
5 changes: 5 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ parameters:
message: '/^Static property Doctrine\\Deprecations\\Deprecation::\$type \(int<0, 7>\|null\) does not accept int\.$/'
path: src/Deprecation.php

-
message: '/^.*method_exists.*expectDeprecation.*$/'
path: tests/DeprecationTest.php
count: 2

includes:
- vendor/phpstan/phpstan-phpunit/extension.neon
- vendor/phpstan/phpstan-phpunit/rules.neon
31 changes: 0 additions & 31 deletions psalm.xml

This file was deleted.

0 comments on commit 729d36e

Please sign in to comment.