[PHPStan] Avoid removing bleeding edge from phar include, let user ha…

…ndle own phpstan configuration (#4840) Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Aug 23, 2023 · 75f2cbc · 75f2cbc
1 parent 5de9824
commit 75f2cbc
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 148 deletions.
diff --git a/build/config/phpstan-for-downgrade.neon b/build/config/phpstan-for-downgrade.neon
@@ -1,6 +1,3 @@
-includes:
-    - phar://vendor/phpstan/phpstan/phpstan.phar/conf/bleedingEdge.neon
-
 # this config has extensions, that helps PHPStan inside Rector to resolve more precise types
 parameters:
     inferPrivatePropertyTypeFromConstructor: true

diff --git a/...olver/DependencyInjection/BleedingEdgeIncludePurifier/BleedingEdgeIncludePurifierTest.php b/...olver/DependencyInjection/BleedingEdgeIncludePurifier/BleedingEdgeIncludePurifierTest.php
diff --git a/...esolver/DependencyInjection/BleedingEdgeIncludePurifier/Expected/some_file_including.neon b/...esolver/DependencyInjection/BleedingEdgeIncludePurifier/Expected/some_file_including.neon
diff --git a/...ypeResolver/DependencyInjection/BleedingEdgeIncludePurifier/Fixture/no_bleeding_edge.neon b/...ypeResolver/DependencyInjection/BleedingEdgeIncludePurifier/Fixture/no_bleeding_edge.neon
diff --git a/...Resolver/DependencyInjection/BleedingEdgeIncludePurifier/Fixture/some_file_including.neon b/...Resolver/DependencyInjection/BleedingEdgeIncludePurifier/Fixture/some_file_including.neon
diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php
@@ -336,6 +336,11 @@ public function services(): void
         );
     }
 
+    public function resetRuleConfigurations(): void
+    {
+        $this->ruleConfigurations = [];
+    }
+
     private function importFile(string $filePath): void
     {
         Assert::fileExists($filePath);
@@ -412,9 +417,4 @@ private function ensureNotDuplicatedClasses(array $rectorClasses): void
             $duplicatedRectorClasses
         ));
     }
-
-    public function resetRuleConfigurations(): void
-    {
-        $this->ruleConfigurations = [];
-    }
 }
diff --git a/packages/NodeTypeResolver/DependencyInjection/BleedingEdgeIncludePurifier.php b/packages/NodeTypeResolver/DependencyInjection/BleedingEdgeIncludePurifier.php
diff --git a/packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php b/packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php
@@ -16,7 +16,6 @@
 use Rector\Core\Configuration\Option;
 use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
 use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
-use Symfony\Component\Filesystem\Filesystem;
 use Webmozart\Assert\Assert;
 
 /**
@@ -29,34 +28,15 @@ final class PHPStanServicesFactory
     private readonly Container $container;
 
     public function __construct(
-        BleedingEdgeIncludePurifier $bleedingEdgeIncludePurifier,
     ) {
+        $containerFactory = new ContainerFactory(getcwd());
         $additionalConfigFiles = $this->resolveAdditionalConfigFiles();
 
-        $purifiedConfigFiles = [];
-
-        foreach ($additionalConfigFiles as $key => $additionalConfigFile) {
-            $purifiedConfigFile = $bleedingEdgeIncludePurifier->purifyConfigFile($additionalConfigFile);
-
-            // nothing was changed
-            if ($purifiedConfigFile === null) {
-                continue;
-            }
-
-            $additionalConfigFiles[$key] = $purifiedConfigFile;
-            $purifiedConfigFiles[] = $purifiedConfigFile;
-        }
-
-        $containerFactory = new ContainerFactory(getcwd());
         $this->container = $containerFactory->create(
             SimpleParameterProvider::provideStringParameter(Option::CONTAINER_CACHE_DIRECTORY),
             $additionalConfigFiles,
             []
         );
-
-        // clear temporary files, after container is created
-        $filesystem = new Filesystem();
-        $filesystem->remove($purifiedConfigFiles);
     }
 
     /**

diff --git a/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver/StaticCallMethodCallTypeResolver.php
@@ -72,8 +72,8 @@ public function resolve(Node $node): Type
             $callerType = $this->nodeTypeResolver->getType($node->class);
         }
 
-        foreach ($callerType->getObjectClassReflections() as $classReflection) {
-            $classMethodReturnType = $this->resolveClassMethodReturnType($classReflection, $node, $methodName, $scope);
+        foreach ($callerType->getObjectClassReflections() as $objectClassReflection) {
+            $classMethodReturnType = $this->resolveClassMethodReturnType($objectClassReflection, $node, $methodName, $scope);
             if (! $classMethodReturnType instanceof MixedType) {
                 return $classMethodReturnType;
             }

diff --git a/tests/Issues/EmptyLongArraySyntax/config/configured_rule.php b/tests/Issues/EmptyLongArraySyntax/config/configured_rule.php
@@ -7,8 +7,5 @@
 use Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rules([
-        SensitiveConstantNameRector::class,
-        AddParamBasedOnParentClassMethodRector::class,
-    ]);
+    $rectorConfig->rules([SensitiveConstantNameRector::class, AddParamBasedOnParentClassMethodRector::class]);
 };