Merge pull request #90 from driehle/upgrade-phpstan

Upgraded PHPStan from 1.12 to 2.0
doctrine · Nov 28, 2024 · da0dbd1 · da0dbd1
2 parents 24c3ac8 + a14234c
commit da0dbd1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/phpstan.yml → .github/workflows/static-analysis.yml b/.github/workflows/phpstan.yml → .github/workflows/static-analysis.yml
@@ -5,19 +5,21 @@ on:
     branches:
       - "*.x"
     paths:
-      - ".github/workflows/phpstan.yml"
+      - ".github/workflows/static-analysis.yml"
       - "composer.*"
       - "src/**"
       - "phpstan*"
+      - "psalm*"
       - "tests/**"
   push:
     branches:
       - "*.x"
     paths:
-      - ".github/workflows/phpstan.yml"
+      - ".github/workflows/static-analysis.yml"
       - "composer.*"
       - "src/**"
       - "phpstan*"
+      - "psalm*"
       - "tests/**"
 
 jobs:

diff --git a/composer.json b/composer.json
@@ -24,9 +24,9 @@
     "require-dev": {
         "doctrine/coding-standard": "^12.0.0",
         "phpdocumentor/guides-cli": "^1.5.0",
-        "phpstan/phpstan": "^1.12.11",
+        "phpstan/phpstan": "^2.0.2",
         "phpunit/phpunit": "^10.5.38",
-        "vimeo/psalm": "^5.15.0"
+        "vimeo/psalm": "^5.26.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,10 +1,14 @@
 parameters:
     level: 6
-    checkGenericClassInNonGenericObjectType: false
+    treatPhpDocTypesAsCertain: false
     paths:
         - src
         - tests
     ignoreErrors:
+        -
+          identifier: missingType.generics
+        -
+          identifier: method.alreadyNarrowedType
         -
           message: '#expects .*Collection<\(int\|string\), object>, .*ArrayCollection<int, Doctrine.*Entity> given#'
           path: tests/DoctrineObjectTest.php