Ensure check isFirstClassCallable() before node->getArgs() on CallLike (

#4049) * Ensure check isFirstClassCallable() before node->getArgs() on CallLike * Fix phsptan
rectorphp · Jun 2, 2023 · 88eed98 · 88eed98
1 parent 5d6cff1
commit 88eed98
Show file tree

Hide file tree

Showing 48 changed files with 207 additions and 7 deletions.
diff --git a/rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php b/rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php
@@ -68,6 +68,10 @@ public function refactor(Node $node): ?Node
     {
         $hasChanged = false;
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         foreach ($this->removeMethodCallParams as $removeMethodCallParam) {
             if (! $this->isName($node->name, $removeMethodCallParam->getMethodName())) {
                 continue;

diff --git a/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php b/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php
@@ -132,6 +132,10 @@ private function refactorThrow(Throw_ $throw, Variable $catchedThrowableVariable
             return null;
         }
 
+        if ($new->isFirstClassCallable()) {
+            return null;
+        }
+
         // exception is bundled
         if (isset($new->getArgs()[$exceptionArgumentPosition])) {
             return null;

diff --git a/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php b/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php
@@ -119,6 +119,10 @@ private function refactorNew(New_ $new, Scope $scope): ?New_
             return null;
         }
 
+        if ($new->isFirstClassCallable()) {
+            return null;
+        }
+
         $methodReflection = $this->reflectionResolver->resolveMethodReflectionFromNew($new);
         if (! $methodReflection instanceof MethodReflection) {
             return null;
@@ -136,6 +140,10 @@ private function refactorNew(New_ $new, Scope $scope): ?New_
 
     private function refactorMethodCall(MethodCall|StaticCall $methodCall, Scope $scope): MethodCall|StaticCall|null
     {
+        if ($methodCall->isFirstClassCallable()) {
+            return null;
+        }
+
         $methodReflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($methodCall);
         if (! $methodReflection instanceof MethodReflection) {
             return null;

diff --git a/rules/CodeQuality/Rector/FuncCall/BoolvalToTypeCastRector.php b/rules/CodeQuality/Rector/FuncCall/BoolvalToTypeCastRector.php
@@ -59,6 +59,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! $this->isName($node, 'boolval')) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector.php b/rules/CodeQuality/Rector/FuncCall/CallUserFuncWithArrowFunctionToInlineRector.php
@@ -67,6 +67,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! $this->isName($node, 'call_user_func')) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/FloatvalToTypeCastRector.php b/rules/CodeQuality/Rector/FuncCall/FloatvalToTypeCastRector.php
@@ -76,9 +76,9 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        //        if (! isset($node->getArgs[0])) {
-        //            return null;
-        //        }
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
 
         $firstArg = $node->getArgs()[0];
 

diff --git a/rules/CodeQuality/Rector/FuncCall/IsAWithStringWithThirdArgumentRector.php b/rules/CodeQuality/Rector/FuncCall/IsAWithStringWithThirdArgumentRector.php
@@ -63,6 +63,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (isset($node->getArgs()[2])) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/RemoveSoleValueSprintfRector.php b/rules/CodeQuality/Rector/FuncCall/RemoveSoleValueSprintfRector.php
@@ -62,6 +62,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (count($node->getArgs()) !== 2) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/SimplifyFuncGetArgsCountRector.php b/rules/CodeQuality/Rector/FuncCall/SimplifyFuncGetArgsCountRector.php
@@ -40,6 +40,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         $firstArg = $node->getArgs()[0];
 
         if (! $firstArg->value instanceof FuncCall) {

diff --git a/rules/CodeQuality/Rector/FuncCall/SimplifyInArrayValuesRector.php b/rules/CodeQuality/Rector/FuncCall/SimplifyInArrayValuesRector.php
@@ -41,6 +41,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($node->args[1])) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector.php b/rules/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector.php
@@ -41,6 +41,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($node->getArgs()[0])) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/SingleInArrayToCompareRector.php b/rules/CodeQuality/Rector/FuncCall/SingleInArrayToCompareRector.php
@@ -71,6 +71,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($node->args[1])) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/Identical/GetClassToInstanceOfRector.php b/rules/CodeQuality/Rector/Identical/GetClassToInstanceOfRector.php
@@ -78,6 +78,10 @@ public function refactor(Node $node): ?Node
         /** @var FuncCall $secondExpr */
         $secondExpr = $twoNodeMatch->getSecondExpr();
 
+        if ($secondExpr->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($secondExpr->getArgs()[0])) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php
@@ -152,6 +152,10 @@ private function resolveNewConditionNode(Expr $expr, bool $isNegated): ?BinaryOp
 
     private function resolveCount(bool $isNegated, FuncCall $funcCall): Identical | Greater | null
     {
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
         $countedType = $this->getType($funcCall->getArgs()[0]->value);
 
         if ($countedType->isArray()->yes()) {

diff --git a/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php b/rules/CodingStyle/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php
@@ -184,6 +184,10 @@ private function clearNotNullBeforeCount(Class_ $class, array $propertyNames): v
                     return false;
                 }
 
+                if ($node->isFirstClassCallable()) {
+                    return false;
+                }
+
                 if (! $this->isName($node, 'count')) {
                     return false;
                 }

diff --git a/rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php b/rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php
@@ -70,6 +70,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($node->getArgs()[0])) {
             return null;
         }

diff --git a/rules/CodingStyle/Rector/FuncCall/ConsistentImplodeRector.php b/rules/CodingStyle/Rector/FuncCall/ConsistentImplodeRector.php
@@ -74,6 +74,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (count($node->getArgs()) === 1) {
             // complete default value ''
             $node->args[1] = $node->getArgs()[0];

diff --git a/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php b/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php
@@ -192,6 +192,10 @@ private function matchCountFuncCallArgExpr(Expr $expr): ?Expr
             return null;
         }
 
+        if ($expr->isFirstClassCallable()) {
+            return null;
+        }
+
         $firstArg = $expr->getArgs()[0];
         return $firstArg->value;
     }

diff --git a/rules/DeadCode/NodeManipulator/CountManipulator.php b/rules/DeadCode/NodeManipulator/CountManipulator.php
@@ -102,6 +102,10 @@ private function isCountWithExpression(Expr $node, Expr $expr): bool
             return false;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return false;
+        }
+
         if (! isset($node->getArgs()[0])) {
             return false;
         }

diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php
@@ -97,6 +97,10 @@ public function refactor(Node $node): ?FuncCall
 
     private function processMysqlCreateDb(FuncCall $funcCall): ?FuncCall
     {
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($funcCall->getArgs()[0])) {
             return null;
         }
@@ -113,6 +117,10 @@ private function processMysqlCreateDb(FuncCall $funcCall): ?FuncCall
 
     private function processMysqlDropDb(FuncCall $funcCall): ?FuncCall
     {
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($funcCall->getArgs()[0])) {
             return null;
         }

diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlPConnectToMysqliConnectRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlPConnectToMysqliConnectRector.php
@@ -67,6 +67,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($node->getArgs()[0])) {
             return null;
         }

diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector.php
@@ -126,6 +126,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         foreach (self::FUNCTION_RENAME_MAP as $oldFunction => $newFunction) {
             if (! $this->isName($node, $oldFunction)) {
                 continue;

diff --git a/rules/Naming/Naming/VariableNaming.php b/rules/Naming/Naming/VariableNaming.php
@@ -186,6 +186,10 @@ private function resolveBareFuncCallArgumentName(
         string $fallbackName,
         string $suffix
     ): string {
+        if ($funcCall->isFirstClassCallable()) {
+            return '';
+        }
+
         if (! isset($funcCall->getArgs()[0])) {
             return '';
         }

diff --git a/rules/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php b/rules/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php
@@ -63,6 +63,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (count($node->args) !== 1) {
             return null;
         }

diff --git a/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php b/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php
@@ -100,6 +100,10 @@ private function shouldSkipFuncCall(FuncCall $funcCall): bool
             return true;
         }
 
+        if ($funcCall->isFirstClassCallable()) {
+            return true;
+        }
+
         return ! isset($funcCall->getArgs()[0]);
     }
 

diff --git a/rules/Php70/Rector/FuncCall/MultiDirnameRector.php b/rules/Php70/Rector/FuncCall/MultiDirnameRector.php
@@ -87,6 +87,10 @@ private function matchNestedDirnameFuncCall(FuncCall $funcCall): ?FuncCall
             return null;
         }
 
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
         $args = $funcCall->getArgs();
         if (count($args) >= 3) {
             return null;

diff --git a/rules/Php71/IsArrayAndDualCheckToAble.php b/rules/Php71/IsArrayAndDualCheckToAble.php
@@ -55,6 +55,10 @@ public function processBooleanOr(BooleanOr $booleanOr, string $type, string $new
             return null;
         }
 
+        if ($funcCallExpr->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($funcCallExpr->getArgs()[0])) {
             return null;
         }

diff --git a/rules/Php71/Rector/FuncCall/CountOnNullRector.php b/rules/Php71/Rector/FuncCall/CountOnNullRector.php
@@ -156,6 +156,10 @@ private function shouldSkipFuncCall(FuncCall $funcCall): bool
             return true;
         }
 
+        if ($funcCall->isFirstClassCallable()) {
+            return true;
+        }
+
         // skip ternary in trait, as impossible to analyse
         $trait = $this->betterNodeFinder->findParentType($funcCall, Trait_::class);
         if ($trait instanceof Trait_) {

diff --git a/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php b/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php
@@ -85,6 +85,10 @@ public function refactor(Node $node): ?array
         /** @var FuncCall $eachFuncCall */
         $eachFuncCall = $assign->expr;
 
+        if ($eachFuncCall->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($eachFuncCall->getArgs()[0])) {
             return null;
         }

diff --git a/rules/Php72/Rector/FuncCall/GetClassOnNullRector.php b/rules/Php72/Rector/FuncCall/GetClassOnNullRector.php
@@ -94,6 +94,10 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
                 return null;
             }
 
+            if ($node->isFirstClassCallable()) {
+                return null;
+            }
+
             $firstArg = $node->getArgs()[0] ?? null;
             if (! $firstArg instanceof Arg) {
                 return null;

diff --git a/rules/Php72/Rector/FuncCall/StringifyDefineRector.php b/rules/Php72/Rector/FuncCall/StringifyDefineRector.php
@@ -77,6 +77,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (! isset($node->getArgs()[0])) {
             return null;
         }

diff --git a/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php b/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php
@@ -76,6 +76,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         $firstArg = $node->getArgs()[0];
 
         $firstArgValue = $firstArg->value;

diff --git a/rules/Php72/Rector/While_/WhileEachToForeachRector.php b/rules/Php72/Rector/While_/WhileEachToForeachRector.php
@@ -96,6 +96,10 @@ public function refactor(Node $node): ?Node
         /** @var FuncCall $eachFuncCall */
         $eachFuncCall = $assignNode->expr;
 
+        if ($eachFuncCall->isFirstClassCallable()) {
+            return null;
+        }
+
         /** @var List_ $listNode */
         $listNode = $assignNode->var;