Skip to content

[Php81][CodingStyle] Skip multi params on FunctionLikeToFirstClassCallableRector #7537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

[Php81][CodingStyle] Skip multi params on FunctionLikeToFirstClassCallableRector #7537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad78d8
[Php81][CodingStyle] Skip multi param on FunctionLikeToFirstClassCall…
samsonasik Oct 22, 2025
6428177
skip
samsonasik Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ...ctor/FunctionLike/FunctionLikeToFirstClassCallableRector/Fixture/skip_multi_param.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace Rector\Tests\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector\Fixture;

function makeInstance(string $className, array $options = []): object
{
return new $className(...$options);
}

// This works - closure ignores the key (2nd parameter from array_map)
$result1 = array_map(
static fn(string $className): object => makeInstance($className),
$items
);

// This FAILS - first-class callable receives BOTH value and key
// array_map passes: $className (string) and $key (int)
// But makeInstance expects: $className (string) and $options (array)
$result2 = array_map(makeInstance(...), $items, array_keys($items));
// TypeError: makeInstance(): Argument #2 ($options) must be of type array, int give
18 changes: 17 additions & 1 deletion rules/CodingStyle/Rector/FunctionLike/FunctionLikeToFirstClassCallableRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Identifier;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\Return_;
use PhpParser\Node\VariadicPlaceholder;
use PhpParser\NodeVisitor;
use PHPStan\Analyser\Scope;
use Rector\PhpParser\AstResolver;
use Rector\PHPStan\ScopeFetcher;
use Rector\Rector\AbstractRector;
use Rector\ValueObject\PhpVersionFeature;
Expand All @@ -31,6 +33,11 @@
*/
final class FunctionLikeToFirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
{
public function __construct(
private readonly AstResolver $astResolver
) {
}

public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
Expand Down Expand Up @@ -111,7 +118,16 @@ private function shouldSkip(
return true;
}

return $this->isUsingThisInNonObjectContext($callLike, $scope);
if ($this->isUsingThisInNonObjectContext($callLike, $scope)) {
return true;
}

$functionLike = $this->astResolver->resolveClassMethodOrFunctionFromCall($callLike);
if (! $functionLike instanceof FunctionLike) {
return false;
}

return count($functionLike->getParams()) > 1;
}

private function extractCallLike(Closure|ArrowFunction $node): FuncCall|MethodCall|StaticCall|null
Expand Down