Updated Rector to commit 01406fbaceb72e815e6caafc31f174d434389fd5

rectorphp/rector-src@01406fb Bump to PHPStan 2.1.34 and fix compatible code (#7844)

Author: TomasVotruba

composer.json

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

rules/Php81/NodeManipulator/NullToStrictStringIntConverter.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 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_;
@@ -173,6 +174,9 @@ private function isAnErrorType(Expr $expr, Type $type, Scope $scope): bool
             return \true;
         }
         $parentScope = $scope->getParentScope();
+        if ($parentScope instanceof FiberScope) {
+            $parentScope = $parentScope->toMutatingScope();
+        }
         if ($parentScope instanceof Scope) {
             return $parentScope->getType($expr) instanceof ErrorType;
         }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '732278ea4e22e696f77e5ffbcf40efd6be6d8a4e';
+    public const PACKAGE_VERSION = '01406fbaceb72e815e6caafc31f174d434389fd5';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-19 11:05:47';
+    public const RELEASE_DATE = '2026-01-19 22:30:17';
     /**
      * @var int
      */

src/DependencyInjection/PHPStan/PHPStanContainerMemento.php

@@ -8,8 +8,6 @@
 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;
 /**
  * Helper service to modify PHPStan container
@@ -32,7 +30,7 @@ public static function removeRichVisitors(RichParser $richParser): void
         $tags = $privatesAccessor->getPrivateProperty($deeperContainer, 'tags');
         // keep visitors that are useful
         // 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];
+        $nodeVisitorsToKeep = [$container->findServiceNamesByType(AnonymousClassVisitor::class)[0] => \true, $container->findServiceNamesByType(ArrayMapArgVisitor::class)[0] => \true];
         $tags[RichParser::VISITOR_SERVICE_TAG] = $nodeVisitorsToKeep;
         $privatesAccessor->setPrivateProperty($deeperContainer, 'tags', $tags);
     }

src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\NodeTypeResolver\PHPStan\Scope;
 
+use PHPStan\Analyser\Fiber\FiberScope;
 use Error;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
@@ -173,6 +174,9 @@ public function processNodes(array $stmts, string $filePath, ?MutatingScope $for
         Assert::allIsInstanceOf($stmts, Stmt::class);
         $scope = $formerMutatingScope ?? $this->scopeFactory->createFromFile($filePath);
         $nodeCallback = function (Node $node, MutatingScope $mutatingScope) use (&$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

@@ -5,9 +5,8 @@
 
 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\OptimizedSingleFileSourceLocator;
+use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
 use Rector\Contract\DependencyInjection\ResettableInterface;
 use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
 /**
@@ -18,11 +17,11 @@ final class DynamicSourceLocatorProvider implements ResettableInterface
     /**
      * @readonly
      */
-    private FileNodesFetcher $fileNodesFetcher;
+    private OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory;
     /**
      * @readonly
      */
-    private OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory;
+    private OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository;
     /**
      * @var string[]
      */
@@ -32,10 +31,10 @@ final class DynamicSourceLocatorProvider implements ResettableInterface
      */
     private array $directories = [];
     private ?AggregateSourceLocator $aggregateSourceLocator = null;
-    public function __construct(FileNodesFetcher $fileNodesFetcher, OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory)
+    public function __construct(OptimizedDirectorySourceLocatorFactory $optimizedDirectorySourceLocatorFactory, OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository)
     {
-        $this->fileNodesFetcher = $fileNodesFetcher;
         $this->optimizedDirectorySourceLocatorFactory = $optimizedDirectorySourceLocatorFactory;
+        $this->optimizedSingleFileSourceLocatorRepository = $optimizedSingleFileSourceLocatorRepository;
     }
     public function setFilePath(string $filePath): void
     {
@@ -64,7 +63,7 @@ public function provide(): SourceLocator
         }
         $sourceLocators = [];
         foreach ($this->filePaths as $file) {
-            $sourceLocators[] = new OptimizedSingleFileSourceLocator($this->fileNodesFetcher, $file);
+            $sourceLocators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($file);
         }
         foreach ($this->directories as $directory) {
             $sourceLocators[] = $this->optimizedDirectorySourceLocatorFactory->createByDirectory($directory);

vendor/autoload.php

@@ -19,4 +19,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit95a1adf206b6315b2c18296429c15002::getLoader();
+return ComposerAutoloaderInit7955fffd214f172412f8f9f29266aeae::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit95a1adf206b6315b2c18296429c15002
+class ComposerAutoloaderInit7955fffd214f172412f8f9f29266aeae
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit95a1adf206b6315b2c18296429c15002', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit7955fffd214f172412f8f9f29266aeae', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit95a1adf206b6315b2c18296429c15002', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit7955fffd214f172412f8f9f29266aeae', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit95a1adf206b6315b2c18296429c15002::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit7955fffd214f172412f8f9f29266aeae::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit95a1adf206b6315b2c18296429c15002::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit7955fffd214f172412f8f9f29266aeae::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit95a1adf206b6315b2c18296429c15002
+class ComposerStaticInit7955fffd214f172412f8f9f29266aeae
 {
     public static $files = array (
         '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
@@ -3221,9 +3221,9 @@ class ComposerStaticInit95a1adf206b6315b2c18296429c15002
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit95a1adf206b6315b2c18296429c15002::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit95a1adf206b6315b2c18296429c15002::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit95a1adf206b6315b2c18296429c15002::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit7955fffd214f172412f8f9f29266aeae::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit7955fffd214f172412f8f9f29266aeae::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit7955fffd214f172412f8f9f29266aeae::$classMap;
 
         }, null, ClassLoader::class);
     }