Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 448
refactor: Move function first-class-callable to a standalone rule#6131
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.
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
TomasVotruba
merged 3 commits into
rectorphp:main
from
nikolicaleksa:refactor/function-first-class-callableJul 8, 2024
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4 ...ector/Fixture/with_function_calls.php.inc → ...ector/Fixture/with_function_calls.php.inc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28 ...Rector/FuncCall/FunctionFirstClassCallableRector/FunctionFirstClassCallableRectorTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?php | ||
| declare(strict_types=1); | ||
| namespace Rector\Tests\CodingStyle\Rector\FuncCall\FunctionFirstClassCallableRector; | ||
| use Iterator; | ||
| use PHPUnit\Framework\Attributes\DataProvider; | ||
| use Rector\Testing\PHPUnit\AbstractRectorTestCase; | ||
| final class FunctionFirstClassCallableRectorTest extends AbstractRectorTestCase | ||
| { | ||
| #[DataProvider('provideData')] | ||
| public function test(string $filePath): void | ||
| { | ||
| $this->doTestFile($filePath); | ||
| } | ||
| public static function provideData(): Iterator | ||
| { | ||
| return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); | ||
| } | ||
| public function provideConfigFilePath(): string | ||
| { | ||
| return __DIR__ . '/config/configured_rule.php'; | ||
| } | ||
| } |
13 changes: 13 additions & 0 deletions
13 ...s/CodingStyle/Rector/FuncCall/FunctionFirstClassCallableRector/config/configured_rule.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?php | ||
| declare(strict_types=1); | ||
| use Rector\CodingStyle\Rector\FuncCall\FunctionFirstClassCallableRector; | ||
| use Rector\Config\RectorConfig; | ||
| use Rector\ValueObject\PhpVersion; | ||
| return static function (RectorConfig $rectorConfig): void { | ||
| $rectorConfig->rule(FunctionFirstClassCallableRector::class); | ||
| $rectorConfig->phpVersion(PhpVersion::PHP_81); | ||
| }; |
119 changes: 119 additions & 0 deletions
119 rules/CodingStyle/Rector/FuncCall/FunctionFirstClassCallableRector.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| <?php | ||
| declare(strict_types=1); | ||
| namespace Rector\CodingStyle\Rector\FuncCall; | ||
| use PhpParser\Node; | ||
| use PhpParser\Node\Arg; | ||
| use PhpParser\Node\Expr\FuncCall; | ||
| use PhpParser\Node\Name; | ||
| use PhpParser\Node\Scalar\String_; | ||
| use PhpParser\Node\VariadicPlaceholder; | ||
| use PHPStan\Analyser\Scope; | ||
| use Rector\Rector\AbstractScopeAwareRector; | ||
| use Rector\ValueObject\PhpVersion; | ||
| use Rector\VersionBonding\Contract\MinPhpVersionInterface; | ||
| use ReflectionException; | ||
| use ReflectionFunction; | ||
| use ReflectionNamedType; | ||
| use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; | ||
| use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; | ||
| /** | ||
| * @see \Rector\Tests\CodingStyle\Rector\FuncCall\FunctionFirstClassCallableRector\FunctionFirstClassCallableRectorTest | ||
| */ | ||
| final class FunctionFirstClassCallableRector extends AbstractScopeAwareRector implements MinPhpVersionInterface | ||
| { | ||
| public function getRuleDefinition(): RuleDefinition | ||
| { | ||
| // see RFC https://wiki.php.net/rfc/first_class_callable_syntax | ||
| return new RuleDefinition('Upgrade string callback functions to first class callable', [ | ||
| new CodeSample( | ||
| <<<'CODE_SAMPLE' | ||
| final class SomeClass | ||
| { | ||
| public function run(array $data) | ||
| { | ||
| return array_map('trim', $data); | ||
| } | ||
| } | ||
| CODE_SAMPLE | ||
| , | ||
| <<<'CODE_SAMPLE' | ||
| final class SomeClass | ||
| { | ||
| public function run(array $data) | ||
| { | ||
| return array_map(trim(...), $data); | ||
| } | ||
| } | ||
| CODE_SAMPLE | ||
| ), | ||
| ]); | ||
| } | ||
| /** | ||
| * @return array<class-string<Node>> | ||
| */ | ||
| public function getNodeTypes(): array | ||
| { | ||
| return [FuncCall::class]; | ||
| } | ||
| public function refactorWithScope(Node $node, Scope $scope): ?FuncCall | ||
| { | ||
| if (! $node instanceof FuncCall) { | ||
| return null; | ||
| } | ||
| if (! $node->name instanceof Name) { | ||
| return null; | ||
| } | ||
| if ($node->isFirstClassCallable()) { | ||
| return null; | ||
| } | ||
| $functionName = (string) $this->getName($node); | ||
| try { | ||
| $reflectionFunction = new ReflectionFunction($functionName); | ||
| } catch (ReflectionException) { | ||
| return null; | ||
| } | ||
| $callableArgs = []; | ||
| foreach ($reflectionFunction->getParameters() as $reflectionParameter) { | ||
| if ($reflectionParameter->getType() instanceof ReflectionNamedType && $reflectionParameter->getType()->getName() === 'callable') { | ||
| $callableArgs[] = $reflectionParameter->getPosition(); | ||
| } | ||
| } | ||
| $hasChanged = false; | ||
| foreach ($node->getArgs() as $key => $arg) { | ||
| if (! in_array($key, $callableArgs, true)) { | ||
| continue; | ||
| } | ||
| if (! $arg->value instanceof String_) { | ||
| continue; | ||
| } | ||
| $node->args[$key] = new Arg( | ||
| new FuncCall(new Name($arg->value->value), [new VariadicPlaceholder()]), | ||
| name: $arg->name | ||
| ); | ||
| $hasChanged = true; | ||
| } | ||
| return $hasChanged ? $node : null; | ||
| } | ||
| public function provideMinPhpVersion(): int | ||
| { | ||
| return PhpVersion::PHP_81; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.