Register FunctionLikeToFirstClassCallableRector to PHP 8.1 set (#7497)

* add array map closure fixture

* add usort fixture

* register FirstClassCallableRector in PHP 8.1 set

* apply first class callables

Author: TomasVotruba

config/set/php81.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Rector\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector;
 use Rector\Config\RectorConfig;
 use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
@@ -26,7 +27,10 @@
         SpatieEnumMethodCallToEnumConstRector::class,
         NullToStrictStringFuncCallArgRector::class,
         NullToStrictIntPregSlitFuncCallLimitArgRector::class,
+        // array of local method call
         FirstClassCallableRector::class,
+        // closure/arrow function
+        FunctionLikeToFirstClassCallableRector::class,
         RemoveReflectionSetAccessibleCallsRector::class,
     ]);
 };

rules-tests/CodingStyle/Rector/FunctionLike/FunctionLikeToFirstClassCallableRector/Fixture/array_map.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector\Fixture;
+
+final class ArrayMap
+{
+    public function call($items)
+    {
+        array_map(fn($x) => strlen($x), $items);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector\Fixture;
+
+final class ArrayMap
+{
+    public function call($items)
+    {
+        array_map(strlen(...), $items);
+    }
+}
+
+?>

rules-tests/CodingStyle/Rector/FunctionLike/FunctionLikeToFirstClassCallableRector/Fixture/multiple_params.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector\Fixture;
+
+final class MultipleParams
+{
+    public function call($items)
+    {
+        usort($items, fn($a, $b) => strcmp($a, $b));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector\Fixture;
+
+final class MultipleParams
+{
+    public function call($items)
+    {
+        usort($items, strcmp(...));
+    }
+}
+
+?>

rules/CodingStyle/Rector/FunctionLike/FunctionLikeToFirstClassCallableRector.php

@@ -31,10 +31,12 @@ final class FunctionLikeToFirstClassCallableRector extends AbstractRector
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'converts function like to first class callable',
+            'Converts arrow function and closures to first class callable',
             [new CodeSample(
                 <<<'CODE_SAMPLE'
-function ($parameter) { return Call::to($parameter); }
+function ($parameter) {
+    return Call::to($parameter);
+}
 CODE_SAMPLE
                 ,
                 <<<'CODE_SAMPLE'

rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php

@@ -139,7 +139,7 @@ private function hasCallLikeInAssignExpr(Expr $expr): bool
     {
         return (bool) $this->betterNodeFinder->findFirst(
             $expr,
-            fn (Node $subNode): bool => $this->sideEffectNodeDetector->detectCallExpr($subNode)
+            $this->sideEffectNodeDetector->detectCallExpr(...)
         );
     }
 

rules/DeadCode/SideEffect/SideEffectNodeDetector.php

@@ -50,7 +50,7 @@ public function detect(Expr $expr): bool
 
         return (bool) $this->betterNodeFinder->findFirst(
             $expr,
-            fn (Node $subNode): bool => $this->detectCallExpr($subNode)
+            $this->detectCallExpr(...)
         );
     }
 

rules/Php81/NodeFactory/EnumFactory.php

@@ -221,7 +221,7 @@ private function collectMappings(array $items, array $mapping): array
      */
     private function getIdentifierTypeFromMappings(array $mapping): string
     {
-        $callableGetType = static fn ($value): string => gettype($value);
+        $callableGetType = gettype(...);
         $valueTypes = array_map($callableGetType, $mapping);
         $uniqueValueTypes = array_unique($valueTypes);
         if (count($uniqueValueTypes) === 1) {

src/Configuration/RectorConfigBuilder.php

@@ -191,8 +191,7 @@ public function __invoke(RectorConfig $rectorConfig): void
     {
         if ($this->setGroups !== [] || $this->setProviders !== []) {
             $setProviderCollector = new SetProviderCollector(array_map(
-                static fn (string $setProvider): SetProviderInterface =>
-                $rectorConfig->make($setProvider),
+                $rectorConfig->make(...),
                 \array_keys($this->setProviders)
             ));
 

src/FileSystem/FileAndDirectoryFilter.php

@@ -15,7 +15,7 @@ final class FileAndDirectoryFilter
      */
     public function filterDirectories(array $filesAndDirectories): array
     {
-        $directories = array_filter($filesAndDirectories, static fn (string $path): bool => is_dir($path));
+        $directories = array_filter($filesAndDirectories, is_dir(...));
 
         return array_values($directories);
     }
@@ -26,7 +26,7 @@ public function filterDirectories(array $filesAndDirectories): array
      */
     public function filterFiles(array $filesAndDirectories): array
     {
-        $files = array_filter($filesAndDirectories, static fn (string $path): bool => is_file($path));
+        $files = array_filter($filesAndDirectories, is_file(...));
 
         return array_values($files);
     }

src/FileSystem/FilesystemTweaker.php

@@ -56,6 +56,6 @@ private function foundInGlob(string $path): array
         /** @var string[] $paths */
         $paths = (array) glob($path);
 
-        return array_filter($paths, static fn (string $path): bool => file_exists($path));
+        return array_filter($paths, file_exists(...));
     }
 }