Add closure/arrow support to AddParamStringTypeFromSprintfUseRector (#7494)

* add closure support to AddParamStringTypeFromSprintfUseRector

* add clarrow function fixxture

* add arrow support to AddParamStringTypeFromSprintfUseRector

Author: TomasVotruba

rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamStringTypeFromSprintfUseRector/Fixture/add_arrow_function.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamStringTypeFromSprintfUseRector\Fixture;
+
+final class AddArrowFunction
+{
+    public function test()
+    {
+        $someClosure = fn ($name) => sprintf('Hello %s', $name);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamStringTypeFromSprintfUseRector\Fixture;
+
+final class AddArrowFunction
+{
+    public function test()
+    {
+        $someClosure = fn (string $name) => sprintf('Hello %s', $name);
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamStringTypeFromSprintfUseRector/Fixture/cover_closure.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamStringTypeFromSprintfUseRector\Fixture;
+
+final class CoverClosure
+{
+    public function run()
+    {
+        $someClosure = function ($name) {
+            return sprintf('Hello %s', $name);
+        };
+
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamStringTypeFromSprintfUseRector\Fixture;
+
+final class CoverClosure
+{
+    public function run()
+    {
+        $someClosure = function (string $name) {
+            return sprintf('Hello %s', $name);
+        };
+
+    }
+}
+
+?>

rules/TypeDeclaration/NodeAnalyzer/VariableInSprintfMaskMatcher.php

@@ -6,6 +6,8 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\ArrowFunction;
+use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -28,9 +30,18 @@ public function __construct(
 
     }
 
-    public function matchMask(ClassMethod|Function_ $functionLike, string $variableName, string $mask): bool
-    {
-        $funcCalls = $this->betterNodeFinder->findInstancesOfScoped((array) $functionLike->stmts, FuncCall::class);
+    public function matchMask(
+        ClassMethod|Function_|Closure|ArrowFunction $functionLike,
+        string $variableName,
+        string $mask
+    ): bool {
+        if ($functionLike instanceof ArrowFunction) {
+            $stmts = [$functionLike->expr];
+        } else {
+            $stmts = (array) $functionLike->stmts;
+        }
+
+        $funcCalls = $this->betterNodeFinder->findInstancesOfScoped($stmts, FuncCall::class);
         $funcCalls = array_values(
             array_filter($funcCalls, fn (FuncCall $funcCall): bool => $this->nodeNameResolver->isName(
                 $funcCall->name,

rules/TypeDeclaration/Rector/ClassMethod/AddParamStringTypeFromSprintfUseRector.php

@@ -6,6 +6,8 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ArrowFunction;
+use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -61,15 +63,15 @@ public function formatMessage(string $name)
      */
     public function getNodeTypes(): array
     {
-        return [ClassMethod::class, Function_::class];
+        return [ClassMethod::class, Function_::class, Closure::class, ArrowFunction::class];
     }
 
     /**
-     * @param ClassMethod|Function_ $node
+     * @param ClassMethod|Function_|Closure|ArrowFunction $node
      */
-    public function refactor(Node $node): ClassMethod|Function_|null
+    public function refactor(Node $node): ClassMethod|Function_|Closure|ArrowFunction|null
     {
-        if ($node->stmts === null) {
+        if ($node instanceof ClassMethod && $node->stmts === null) {
             return null;
         }
 

src/ChangesReporting/Output/GitHubOutputFormatter.php

@@ -131,7 +131,11 @@ private function sanitizeAnnotationProperties(array $annotationProperties): stri
         );
 
         $sanitizedProperties = array_map(
-            fn (string $key, string|int|null $value): string => sprintf('%s=%s', $key, $this->sanitizeAnnotationProperty($value)),
+            fn (string $key, string|int|null $value): string => sprintf(
+                '%s=%s',
+                $key,
+                $this->sanitizeAnnotationProperty($value)
+            ),
             array_keys($nonNullProperties),
             $nonNullProperties
         );