Updated Rector to commit 992f3ff9d162c8ef648427d19f557574591b8580

rectorphp/rector-src@992f3ff [CodeQuality][Php84] Handle crash on ForeachToArrayFindRector+OptionalParametersAfterRequiredRector (#7033)

Author: TomasVotruba

rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php

@@ -88,27 +88,27 @@ public function getNodeTypes() : array
      */
     public function refactor(Node $node)
     {
-        $scope = ScopeFetcher::fetch($node);
         if ($node instanceof ClassMethod || $node instanceof Function_) {
-            return $this->refactorClassMethodOrFunction($node, $scope);
+            return $this->refactorClassMethodOrFunction($node);
         }
         if ($node instanceof New_) {
-            return $this->refactorNew($node, $scope);
+            return $this->refactorNew($node);
         }
-        return $this->refactorMethodCallOrFuncCall($node, $scope);
+        return $this->refactorMethodCallOrFuncCall($node);
     }
     /**
      * @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_ $node
      * @return \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|null
      */
-    private function refactorClassMethodOrFunction($node, Scope $scope)
+    private function refactorClassMethodOrFunction($node)
     {
         if ($node->params === []) {
             return null;
         }
         if ($node->getAttribute(self::HAS_SWAPPED_PARAMS, \false) === \true) {
             return null;
         }
+        $scope = ScopeFetcher::fetch($node);
         if ($node instanceof ClassMethod) {
             $reflection = $this->reflectionResolver->resolveMethodReflectionFromClassMethod($node, $scope);
         } else {
@@ -125,7 +125,7 @@ private function refactorClassMethodOrFunction($node, Scope $scope)
         $node->setAttribute(self::HAS_SWAPPED_PARAMS, \true);
         return $node;
     }
-    private function refactorNew(New_ $new, Scope $scope) : ?New_
+    private function refactorNew(New_ $new) : ?New_
     {
         if ($new->args === []) {
             return null;
@@ -137,6 +137,7 @@ private function refactorNew(New_ $new, Scope $scope) : ?New_
         if (!$methodReflection instanceof MethodReflection) {
             return null;
         }
+        $scope = ScopeFetcher::fetch($new);
         $expectedArgOrParamOrder = $this->resolveExpectedArgParamOrderIfDifferent($methodReflection, $new, $scope);
         if ($expectedArgOrParamOrder === null) {
             return null;
@@ -148,7 +149,7 @@ private function refactorNew(New_ $new, Scope $scope) : ?New_
      * @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\FuncCall $node
      * @return \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\FuncCall|null
      */
-    private function refactorMethodCallOrFuncCall($node, Scope $scope)
+    private function refactorMethodCallOrFuncCall($node)
     {
         if ($node->isFirstClassCallable()) {
             return null;
@@ -157,6 +158,7 @@ private function refactorMethodCallOrFuncCall($node, Scope $scope)
         if (!$reflection instanceof MethodReflection && !$reflection instanceof FunctionReflection) {
             return null;
         }
+        $scope = ScopeFetcher::fetch($node);
         $expectedArgOrParamOrder = $this->resolveExpectedArgParamOrderIfDifferent($reflection, $node, $scope);
         if ($expectedArgOrParamOrder === null) {
             return null;
@@ -184,6 +186,7 @@ private function resolveExpectedArgParamOrderIfDifferent($reflection, $node, Sco
         if ($reflection instanceof FunctionReflection && $this->vendorLocationDetector->detectFunctionReflection($reflection)) {
             return null;
         }
+        $scope = ScopeFetcher::fetch($node);
         $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($reflection, $node, $scope);
         $expectedParameterReflections = $this->requireOptionalParamResolver->resolveFromParametersAcceptor($parametersAcceptor);
         if ($expectedParameterReflections === $parametersAcceptor->getParameters()) {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '4c3ec6c5d0f59e7f82da2edf7331db88b2cbfef9';
+    public const PACKAGE_VERSION = '992f3ff9d162c8ef648427d19f557574591b8580';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-06-30 04:22:51';
+    public const RELEASE_DATE = '2025-06-30 15:53:50';
     /**
      * @var int
      */

src/ProcessAnalyzer/RectifiedAnalyzer.php

@@ -6,6 +6,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 use Rector\Contract\Rector\RectorInterface;
+use Rector\NodeAnalyzer\ScopeAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 /**
  * This service verify if the Node:
@@ -17,6 +18,14 @@
  */
 final class RectifiedAnalyzer
 {
+    /**
+     * @readonly
+     */
+    private ScopeAnalyzer $scopeAnalyzer;
+    public function __construct(ScopeAnalyzer $scopeAnalyzer)
+    {
+        $this->scopeAnalyzer = $scopeAnalyzer;
+    }
     /**
      * @param class-string<RectorInterface> $rectorClass
      */
@@ -66,9 +75,9 @@ private function isJustReprintedOverlappedTokenStart(Node $node, ?Node $original
         if ($startTokenPos >= 0) {
             return \true;
         }
-        if ($node instanceof Stmt) {
-            return !\in_array(AttributeKey::SCOPE, \array_keys($node->getAttributes()), \true);
+        if (!$this->scopeAnalyzer->isRefreshable($node)) {
+            return \false;
         }
-        return $node->getAttributes() === [];
+        return !\in_array(AttributeKey::SCOPE, \array_keys($node->getAttributes()), \true);
     }
 }