[DowngradePhp83] Allow with first class callable on DowngradeJsonValidateRector (#332)

Author: samsonasik

rules-tests/DowngradePhp83/Rector/FuncCall/DowngradeJsonValidateRector/Fixture/with_first_class_callable.php.inc

@@ -0,0 +1,44 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp83\Rector\FuncCall\DowngradeJsonValidateRector\Fixture;
+
+class WithFirstClassCallable
+{
+    public function run($json)
+    {
+        echo (int) json_validate(...)($json);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp83\Rector\FuncCall\DowngradeJsonValidateRector\Fixture;
+
+class WithFirstClassCallable
+{
+    public function run($json)
+    {
+        $jsonValidate = function (string $json, int $depth = 512, int $flags = 0) {
+            if (function_exists('json_validate')) {
+                return json_validate($json, $depth, $flags);
+            }
+            $maxDepth = 0x7fffffff;
+            if (0 !== $flags && \defined('JSON_INVALID_UTF8_IGNORE') && \JSON_INVALID_UTF8_IGNORE !== $flags) {
+                throw new \ValueError('json_validate(): Argument #3 ($flags) must be a valid flag (allowed flags: JSON_INVALID_UTF8_IGNORE)');
+            }
+            if ($depth <= 0) {
+                throw new \ValueError('json_validate(): Argument #2 ($depth) must be greater than 0');
+            }
+            if ($depth > $maxDepth) {
+                throw new \ValueError(sprintf('json_validate(): Argument #2 ($depth) must be less than %d', $maxDepth));
+            }
+            json_decode($json, true, $depth, $flags);
+            return \JSON_ERROR_NONE === json_last_error();
+        };
+        echo (int) $jsonValidate(...)($json);
+    }
+}
+
+?>

rules/DowngradePhp83/Rector/FuncCall/DowngradeJsonValidateRector.php

@@ -17,9 +17,11 @@
 use PHPStan\Analyser\Scope;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Exception\ShouldNotHappenException;
+use Rector\Naming\Naming\VariableNaming;
 use Rector\NodeAnalyzer\ExprInTopStmtMatcher;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Parser\InlineCodeParser;
+use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -35,6 +37,7 @@ final class DowngradeJsonValidateRector extends AbstractRector
 
     public function __construct(
         private readonly InlineCodeParser $inlineCodeParser,
+        private readonly VariableNaming $variableNaming,
         private readonly ExprInTopStmtMatcher $exprInTopStmtMatcher
     ) {
     }
@@ -106,7 +109,8 @@ function (Node $subNode): bool {
             return null;
         }
 
-        $variable = new Variable('jsonValidate');
+        $scope = ScopeFetcher::fetch($node);
+        $variable = new Variable($this->variableNaming->createCountedValueName('jsonValidate', $scope));
 
         $function = $this->createClosure();
         $expression = new Expression(new Assign($variable, $function));
@@ -152,11 +156,7 @@ private function shouldSkip(CallLike $callLike): bool
             return true;
         }
 
-        if ($callLike->isFirstClassCallable()) {
-            return true;
-        }
-
-        $args = $callLike->getArgs();
+        $args = $callLike->args;
         return count($args) < 1;
     }
 }