Merge branch '2.x' into 3.x

pestphp · May 13, 2024 · 8791b0d · 8791b0d
2 parents 8e04782 + 7ba7d70
commit 8791b0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "phpstan/phpstan": "^1.10.60",
-        "tomasvotruba/type-coverage": "^0.2.1",
+        "phpstan/phpstan": "^1.11.0",
+        "tomasvotruba/type-coverage": "^0.2.8",
         "pestphp/pest-plugin": "^3.0.0"
     },
     "autoload": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -9,10 +9,10 @@ parameters:
         - src
 
     checkMissingIterableValueType: true
-    checkGenericClassInNonGenericObjectType: false
     reportUnmatchedIgnoredErrors: true
 
     ignoreErrors:
+        - identifier: missingType.generics
         - "#is not allowed to extend#"
         - "#is not covered by backward compatibility promise#"
         - "#is concrete, but does not have a Test suffix.#"

diff --git a/src/PHPStanAnalyser.php b/src/PHPStanAnalyser.php
@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Analyser;
 use PHPStan\Analyser\FileAnalyser;
+use PHPStan\Analyser\LocalIgnoresProcessor;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\RuleErrorTransformer;
 use PHPStan\Collectors\Collector;
@@ -81,7 +82,7 @@ public static function make(Container $container, array $rules, array $collector
             $container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
             $container->getByType(DependencyResolver::class),
             new RuleErrorTransformer(),
-            true
+            $container->getByType(LocalIgnoresProcessor::class),
         );
 
         return new Analyser($fileAnalyser, $ruleRegistry, $collectorRegistry, $nodeScopeResolver, 9_999_999_999_999);