Add first class callable support to CallUserFuncArrayToVariadicRector (#7428)

Author: TomasVotruba

rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector/Fixture/first_class_callable.php.inc

@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector\Source\Redirector;
+
+final class FirstClassCallable
+{
+    private $redirector;
+
+    public function __construct()
+    {
+        $this->redirector = new Redirector();
+    }
+
+    public function run()
+    {
+        $args = \func_get_args();
+        call_user_func_array($this->redirector->redirect(...), $args);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector\Source\Redirector;
+
+final class FirstClassCallable
+{
+    private $redirector;
+
+    public function __construct()
+    {
+        $this->redirector = new Redirector();
+    }
+
+    public function run()
+    {
+        $args = \func_get_args();
+        $this->redirector->redirect(...$args);
+    }
+}
+
+?>

rules-tests/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector/config/configured_rule.php

@@ -7,7 +7,7 @@
 use Rector\ValueObject\PhpVersion;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->phpVersion(PhpVersion::PHP_74);
+    $rectorConfig->phpVersion(PhpVersion::PHP_80);
 
     $rectorConfig->rule(CallUserFuncArrayToVariadicRector::class);
 };

rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php

@@ -93,6 +93,12 @@ public function refactor(Node $node): ?Node
             return $this->createMethodCall($firstArgValue, $secondArgValue);
         }
 
+        if ($firstArgValue instanceof MethodCall && $firstArgValue->isFirstClassCallable()) {
+            $firstArgValue->args = [$this->createUnpackedArg($secondArgValue)];
+
+            return $firstArgValue;
+        }
+
         return null;
     }
 

rules/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector.php

@@ -110,7 +110,9 @@ public function refactor(Node $node): ?Node
                 }
             }
 
-            if ($this->isName($classMethod, MethodName::__GET) && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::MIXED_TYPE) && ! $classMethod->returnType instanceof Node) {
+            if ($this->isName($classMethod, MethodName::__GET) && $this->phpVersionProvider->isAtLeastPhpVersion(
+                PhpVersionFeature::MIXED_TYPE
+            ) && ! $classMethod->returnType instanceof Node) {
                 $classMethod->returnType = new Identifier('mixed');
                 $hasChanged = true;
             }