Remove NonVariableToVariableOnFunctionCallRector, should be handled manually as might need attention (rectorphp#3357)

Author: TomasVotruba

build/target-repository/docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# 415 Rules Overview
+# 414 Rules Overview
 
 <br>
 
@@ -34,7 +34,7 @@
 
 - [Php56](#php56) (2)
 
-- [Php70](#php70) (19)
+- [Php70](#php70) (18)
 
 - [Php71](#php71) (9)
 
@@ -4917,19 +4917,6 @@ Changes multiple `dirname()` calls to one with nesting level
 
 <br>
 
-### NonVariableToVariableOnFunctionCallRector
-
-Transform non variable like arguments to variable where a function or method expects an argument passed by reference
-
-- class: [`Rector\Php70\Rector\FuncCall\NonVariableToVariableOnFunctionCallRector`](../rules/Php70/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php)
-
-```diff
--reset(a());
-+$a = a(); reset($a);
-```
-
-<br>
-
 ### Php4ConstructorRector
 
 Changes PHP 4 style constructor to __construct.

config/set/php70.php

@@ -10,7 +10,6 @@
 use Rector\Php70\Rector\FuncCall\CallUserMethodRector;
 use Rector\Php70\Rector\FuncCall\EregToPregMatchRector;
 use Rector\Php70\Rector\FuncCall\MultiDirnameRector;
-use Rector\Php70\Rector\FuncCall\NonVariableToVariableOnFunctionCallRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
 use Rector\Php70\Rector\FuncCall\RenameMktimeWithoutArgsToTimeRector;
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
@@ -24,42 +23,25 @@
 use Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rule(Php4ConstructorRector::class);
-
-    $rectorConfig->rule(TernaryToNullCoalescingRector::class);
-
-    $rectorConfig->rule(RandomFunctionRector::class);
-
-    $rectorConfig->rule(ExceptionHandlerTypehintRector::class);
-
-    $rectorConfig->rule(MultiDirnameRector::class);
-
-    $rectorConfig->rule(ListSplitStringRector::class);
-
-    $rectorConfig->rule(EmptyListRector::class);
-
-    # be careful, run this just once, since it can keep swapping order back and forth
-    $rectorConfig->rule(ListSwapArrayOrderRector::class);
-
-    $rectorConfig->rule(CallUserMethodRector::class);
-
-    $rectorConfig->rule(EregToPregMatchRector::class);
-
-    $rectorConfig->rule(ReduceMultipleDefaultSwitchRector::class);
-
-    $rectorConfig->rule(TernaryToSpaceshipRector::class);
-
-    $rectorConfig->rule(WrapVariableVariableNameInCurlyBracesRector::class);
-
-    $rectorConfig->rule(IfToSpaceshipRector::class);
-
-    $rectorConfig->rule(StaticCallOnNonStaticToInstanceCallRector::class);
-
-    $rectorConfig->rule(ThisCallOnStaticMethodToStaticCallRector::class);
-
-    $rectorConfig->rule(BreakNotInLoopOrSwitchToReturnRector::class);
-
-    $rectorConfig->rule(RenameMktimeWithoutArgsToTimeRector::class);
-
-    $rectorConfig->rule(NonVariableToVariableOnFunctionCallRector::class);
+    $rectorConfig->rules([
+        Php4ConstructorRector::class,
+        TernaryToNullCoalescingRector::class,
+        RandomFunctionRector::class,
+        ExceptionHandlerTypehintRector::class,
+        MultiDirnameRector::class,
+        ListSplitStringRector::class,
+        EmptyListRector::class,
+        // be careful, run this just once, since it can keep swapping order back and forth
+        ListSwapArrayOrderRector::class,
+        CallUserMethodRector::class,
+        EregToPregMatchRector::class,
+        ReduceMultipleDefaultSwitchRector::class,
+        TernaryToSpaceshipRector::class,
+        WrapVariableVariableNameInCurlyBracesRector::class,
+        IfToSpaceshipRector::class,
+        StaticCallOnNonStaticToInstanceCallRector::class,
+        ThisCallOnStaticMethodToStaticCallRector::class,
+        BreakNotInLoopOrSwitchToReturnRector::class,
+        RenameMktimeWithoutArgsToTimeRector::class,
+    ]);
 };

packages/NodeNestingScope/ParentScopeFinder.php

@@ -4,8 +4,8 @@
 
 namespace Rector\NodeNestingScope;
 
-use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
@@ -19,9 +19,9 @@ public function __construct(
     ) {
     }
 
-    public function find(Node $node): ClassMethod | Function_ | Class_ | Namespace_ | Closure | null
+    public function find(Variable $variable): ClassMethod | Function_ | Class_ | Namespace_ | Closure | null
     {
-        return $this->betterNodeFinder->findParentByTypes($node, [
+        return $this->betterNodeFinder->findParentByTypes($variable, [
             Closure::class,
             Function_::class,
             ClassMethod::class,

phpstan.neon

@@ -808,3 +808,6 @@ parameters:
         -
             message: '#Function "dump_node\(\)" cannot be used/left in the code\: #'
             path: src/functions/node_helper.php
+
+        # nullable in external package
+        - '#Parameters should use "PhpParser\\Node\\Expr\\FuncCall\|string\|string\|PHPStan\\Analyser\\Scope" types as the only types passed to this method#'