Merge pull request #35 from MrPunyapal/3.x

Fix: Argument #20 ($polluteScopeWithBlock) must be of type bool error
pestphp · Dec 27, 2024 · 254aa8c · 254aa8c
2 parents e6ec9cc + 9906d9d
commit 254aa8c
Showing 1 changed file with 62 additions and 30 deletions.
diff --git a/src/PHPStanAnalyser.php b/src/PHPStanAnalyser.php
@@ -4,6 +4,7 @@
 
 namespace Pest\TypeCoverage;
 
+use Composer\InstalledVersions;
 use PhpParser\Node;
 use PHPStan\Analyser\Analyser;
 use PHPStan\Analyser\FileAnalyser;
@@ -51,36 +52,67 @@ public static function make(Container $container, array $rules, array $collector
 
         $scopeFactory = TestCaseForTypeCoverage::createScopeFactory($reflectionProvider, $typeSpecifier); // @phpstan-ignore-line
 
-        $nodeScopeResolver = new NodeScopeResolver(
-            $reflectionProvider,
-            $container->getByType(InitializerExprTypeResolver::class),
-            $container->getService('betterReflectionReflector'), // @phpstan-ignore-line
-            $container->getByType(ClassReflectionExtensionRegistryProvider::class),
-            $container->getByType(ParameterOutTypeExtensionProvider::class),
-            $container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
-            $container->getByType(FileTypeMapper::class),
-            $container->getByType(StubPhpDocProvider::class),
-            $container->getByType(PhpVersion::class),
-            $container->getByType(SignatureMapProvider::class),
-            $container->getByType(PhpDocInheritanceResolver::class),
-            $container->getByType(FileHelper::class),
-            $typeSpecifier, // @phpstan-ignore-line
-            $container->getByType(DynamicThrowTypeExtensionProvider::class),
-            $container->getByType(ReadWritePropertiesExtensionProvider::class),
-            $container->getByType(ParameterClosureTypeExtensionProvider::class),
-            $scopeFactory,
-            false,
-            true,
-            [],
-            [],
-            [],
-            true,
-            true,
-            false,
-            true,
-            false,
-            false,
-        );
+        $version = InstalledVersions::getPrettyVersion('phpstan/phpstan');
+        if (mb_strpos($version, '2.') === 0) {
+            $nodeScopeResolver = new NodeScopeResolver(
+                $reflectionProvider,
+                $container->getByType(InitializerExprTypeResolver::class),
+                $container->getService('betterReflectionReflector'), // @phpstan-ignore-line
+                $container->getByType(ClassReflectionExtensionRegistryProvider::class),
+                $container->getByType(ParameterOutTypeExtensionProvider::class),
+                $container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
+                $container->getByType(FileTypeMapper::class),
+                $container->getByType(StubPhpDocProvider::class),
+                $container->getByType(PhpVersion::class),
+                $container->getByType(SignatureMapProvider::class),
+                $container->getByType(PhpDocInheritanceResolver::class),
+                $container->getByType(FileHelper::class),
+                $typeSpecifier, // @phpstan-ignore-line
+                $container->getByType(DynamicThrowTypeExtensionProvider::class),
+                $container->getByType(ReadWritePropertiesExtensionProvider::class),
+                $container->getByType(ParameterClosureTypeExtensionProvider::class),
+                $scopeFactory,
+                false,
+                true,
+                true,
+                [],
+                [],
+                [],
+                true,
+                true,
+            );
+        } else {
+            $nodeScopeResolver = new NodeScopeResolver(
+                $reflectionProvider,
+                $container->getByType(InitializerExprTypeResolver::class),
+                $container->getService('betterReflectionReflector'), // @phpstan-ignore-line
+                $container->getByType(ClassReflectionExtensionRegistryProvider::class),
+                $container->getByType(ParameterOutTypeExtensionProvider::class),
+                $container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
+                $container->getByType(FileTypeMapper::class),
+                $container->getByType(StubPhpDocProvider::class),
+                $container->getByType(PhpVersion::class),
+                $container->getByType(SignatureMapProvider::class),
+                $container->getByType(PhpDocInheritanceResolver::class),
+                $container->getByType(FileHelper::class),
+                $typeSpecifier, // @phpstan-ignore-line
+                $container->getByType(DynamicThrowTypeExtensionProvider::class),
+                $container->getByType(ReadWritePropertiesExtensionProvider::class),
+                $container->getByType(ParameterClosureTypeExtensionProvider::class),
+                $scopeFactory,
+                false,
+                true,
+                [],
+                [],
+                [],
+                true,
+                true,
+                false,
+                true,
+                false,
+                false,
+            );
+        }
 
         $fileAnalyser = new FileAnalyser(
             $scopeFactory,