Revert "Bump to PHPStan 2.1.34 and fix compatible code (#7844)"

This reverts commit 01406fb.

Author: calebdw

build/target-repository/composer.json

@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "phpstan/phpstan": "^2.1.34"
+        "phpstan/phpstan": "^2.1.33"
     },
     "autoload": {
         "files": [

composer.json

@@ -23,7 +23,7 @@
         "nikic/php-parser": "^5.7",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.3",
-        "phpstan/phpstan": "^2.1.34",
+        "phpstan/phpstan": "^2.1.33",
         "react/event-loop": "^1.6",
         "react/promise": "^3.3",
         "react/socket": "^1.17",

phpstan.neon

@@ -438,29 +438,3 @@ parameters:
         -
             identifier: symplify.noMissnamedDocTag
             path: rules/TypeDeclarationDocblocks/TypeResolver/ConstantArrayTypeGeneralizer.php
-
-        -
-            identifier: typePerfect.narrowReturnObjectType
-            path: src/PHPStan/ScopeFetcher.php
-
-        -
-            identifier: varTag.nativeType
-            path: src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php
-
-        -
-            identifier: argument.type
-            paths:
-                - rules/Privatization/TypeManipulator/TypeNormalizer.php
-                - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector.php
-                - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector.php
-                - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector.php
-                - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector.php
-                - rules/TypeDeclarationDocblocks/Rector/Class_/AddVarArrayDocblockFromDimFetchAssignRector.php
-                - src/NodeTypeResolver/PHPStan/Type/TypeFactory.php
-
-        -
-            identifier: argument.templateType
-            paths:
-                - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector.php
-                - rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector.php
-                - src/NodeTypeResolver/PHPStan/Type/TypeFactory.php

rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php

@@ -4,7 +4,6 @@
 
 namespace Rector\Php81\NodeManipulator;
 
-use PHPStan\Analyser\Fiber\FiberScope;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Cast\Int_ as CastInt_;
@@ -214,10 +213,6 @@ private function isAnErrorType(Expr $expr, Type $type, Scope $scope): bool
         }
 
         $parentScope = $scope->getParentScope();
-        if ($parentScope instanceof FiberScope) {
-            $parentScope = $parentScope->toMutatingScope();
-        }
-
         if ($parentScope instanceof Scope) {
             return $parentScope->getType($expr) instanceof ErrorType;
         }

src/DependencyInjection/PHPStan/PHPStanContainerMemento.php

@@ -9,6 +9,8 @@
 use PHPStan\Parser\AnonymousClassVisitor;
 use PHPStan\Parser\ArrayMapArgVisitor;
 use PHPStan\Parser\RichParser;
+use PHPStan\Parser\VariadicFunctionsVisitor;
+use PHPStan\Parser\VariadicMethodsVisitor;
 use Rector\Util\Reflection\PrivatesAccessor;
 
 /**
@@ -39,6 +41,8 @@ public static function removeRichVisitors(RichParser $richParser): void
         // remove all the rest, https://github.com/phpstan/phpstan-src/tree/1d86de8bb9371534983a8dbcd879e057d2ff028f/src/Parser
         $nodeVisitorsToKeep = [
             $container->findServiceNamesByType(AnonymousClassVisitor::class)[0] => true,
+            $container->findServiceNamesByType(VariadicFunctionsVisitor::class)[0] => true,
+            $container->findServiceNamesByType(VariadicMethodsVisitor::class)[0] => true,
             $container->findServiceNamesByType(ArrayMapArgVisitor::class)[0] => true,
         ];
 

src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -4,7 +4,6 @@
 
 namespace Rector\NodeTypeResolver\PHPStan\Scope;
 
-use PHPStan\Analyser\Fiber\FiberScope;
 use Error;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
@@ -159,10 +158,6 @@ public function processNodes(
             &$nodeCallback,
             $filePath,
         ): void {
-            if ($mutatingScope instanceof FiberScope) {
-                $mutatingScope = $mutatingScope->toMutatingScope();
-            }
-
             // the class reflection is resolved AFTER entering to class node
             // so we need to get it from the first after this one
             if ($node instanceof Class_ || $node instanceof Interface_ || $node instanceof Enum_) {

src/NodeTypeResolver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php

@@ -6,8 +6,9 @@
 
 use PHPStan\BetterReflection\SourceLocator\Type\AggregateSourceLocator;
 use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
+use PHPStan\Reflection\BetterReflection\SourceLocator\FileNodesFetcher;
 use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorFactory;
-use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
+use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocator;
 use Rector\Contract\DependencyInjection\ResettableInterface;
 use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
 
@@ -29,8 +30,8 @@ final class DynamicSourceLocatorProvider implements ResettableInterface
     private ?AggregateSourceLocator $aggregateSourceLocator = null;
 
     public function __construct(
-        private readonly OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory,
-        private readonly OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository
+        private readonly FileNodesFetcher $fileNodesFetcher,
+        private readonly OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory
     ) {
     }
 
@@ -67,7 +68,7 @@ public function provide(): SourceLocator
         $sourceLocators = [];
 
         foreach ($this->filePaths as $file) {
-            $sourceLocators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($file);
+            $sourceLocators[] = new OptimizedSingleFileSourceLocator($this->fileNodesFetcher, $file);
         }
 
         foreach ($this->directories as $directory) {