Skip to content

rename FirstClassCallableRector to ArrayToFirstClassCallableRector to make feature explicit #7735

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
TomasVotruba merged 1 commit into from
Dec 8, 2025
Merged

rename FirstClassCallableRector to ArrayToFirstClassCallableRector to make feature explicit #7735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions config/set/php81.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Rector\CodingStyle\Rector\FuncCall\FunctionFirstClassCallableRector;
use Rector\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector;
use Rector\Config\RectorConfig;
use Rector\Php81\Rector\Array_\FirstClassCallableRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
Expand All @@ -31,7 +31,7 @@
NullToStrictStringFuncCallArgRector::class,
NullToStrictIntPregSlitFuncCallLimitArgRector::class,
// array of local method call
FirstClassCallableRector::class,
ArrayToFirstClassCallableRector::class,
// closure/arrow function
FunctionLikeToFirstClassCallableRector::class,
ClosureFromCallableToFirstClassCallableRector::class,
Expand Down
4 changes: 2 additions & 2 deletions ...leRector/FirstClassCallableRectorTest.php → ...r/ArrayToFirstClassCallableRectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

declare(strict_types=1);

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector;

use Iterator;
use PHPUnit\Framework\Attributes\DataProvider;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;

final class FirstClassCallableRectorTest extends AbstractRectorTestCase
final class ArrayToFirstClassCallableRectorTest extends AbstractRectorTestCase
{
#[DataProvider('provideData')]
public function test(string $filePath): void
Expand Down
8 changes: 4 additions & 4 deletions ...r/Fixture/make_other_closure_pass.php.inc → ...r/Fixture/make_other_closure_pass.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Source\stdClass;
use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

return static function (stdClass $container): void {
$container->services()
Expand All @@ -14,10 +14,10 @@ return static function (stdClass $container): void {
-----
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Source\stdClass;
use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

return static function (stdClass $container): void {
$container->services()
Expand Down
2 changes: 1 addition & 1 deletion ...or/Fixture/skip_dynamic_variable2.php.inc → ...or/Fixture/skip_dynamic_variable2.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

$variableName = 'x';
$index = 1;
Expand Down
2 changes: 1 addition & 1 deletion ...ableRector/Fixture/skip_enum_data.php.inc → ...ableRector/Fixture/skip_enum_data.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

enum SkipEnumData: int {

Expand Down
2 changes: 1 addition & 1 deletion ...r/Fixture/skip_function_reference.php.inc → ...r/Fixture/skip_function_reference.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SkipFunctionReference
{
Expand Down
4 changes: 2 additions & 2 deletions ...eRector/Fixture/skip_in_attribute.php.inc → ...eRector/Fixture/skip_in_attribute.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

function run(\Closure $closure): void
{
Expand All @@ -9,4 +9,4 @@ function run(\Closure $closure): void
run(
#[SomeAttribute(['array-argument'])]
fn(): null => null,
);
);
8 changes: 8 additions & 0 deletions ...p81/Rector/Array_/ArrayToFirstClassCallableRector/Fixture/skip_in_attribute_class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

#[SomeAttribute(['array-argument'])]
class SkipInAttributeClass
{
}
8 changes: 8 additions & 0 deletions ...or/Array_/ArrayToFirstClassCallableRector/Fixture/skip_invoke_from_non_class_code.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

Route::get('verify-email', [SomeExternalObject::class, '__invoke'])
->name('verification.notice');
2 changes: 1 addition & 1 deletion .../Fixture/skip_non_existing_method.php.inc → .../Fixture/skip_non_existing_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SkipNonExistingMethod
{
Expand Down
4 changes: 2 additions & 2 deletions ...hod_with_other_object_const_fetch.php.inc → ...hod_with_other_object_const_fetch.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

final class SkipNonStaticPrivateMethodWithOtherObjectConstFetch
{
Expand Down
4 changes: 2 additions & 2 deletions ...tic_with_other_object_const_fetch.php.inc → ...tic_with_other_object_const_fetch.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

final class SkipNonStaticWithOtherObjectConstFetch
{
Expand Down
2 changes: 1 addition & 1 deletion ...ector/Fixture/skip_on_class_const.php.inc → ...ector/Fixture/skip_on_class_const.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SkipOnClassConst
{
Expand Down
2 changes: 1 addition & 1 deletion ...leRector/Fixture/skip_on_property.php.inc → ...leRector/Fixture/skip_on_property.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SkipOnProperty
{
Expand Down
4 changes: 2 additions & 2 deletions ...p_private_method_by_instantiation.php.inc → ...p_private_method_by_instantiation.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\WithPrivateMethod;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\WithPrivateMethod;

final class SkipPrivateMethodByInstantiation
{
Expand Down
4 changes: 2 additions & 2 deletions ..._private_method_by_property_fetch.php.inc → ..._private_method_by_property_fetch.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\WithPrivateMethod;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\WithPrivateMethod;

final class SkipPrivateMethodByPropertyFetch
{
Expand Down
2 changes: 1 addition & 1 deletion ...r/Fixture/skip_simple_yield_array.php.inc → ...r/Fixture/skip_simple_yield_array.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use PHPStan\Type\ArrayType;

Expand Down
4 changes: 2 additions & 2 deletions ...ector/Fixture/skip_symfony_config.php.inc → ...ector/Fixture/skip_symfony_config.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $container): void {
Expand Down
4 changes: 2 additions & 2 deletions ...CallableRector/Fixture/some_class.php.inc → ...CallableRector/Fixture/some_class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SomeClass
{
Expand All @@ -18,7 +18,7 @@ final class SomeClass
-----
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SomeClass
{
Expand Down
4 changes: 2 additions & 2 deletions ...leRector/Fixture/some_static_call.php.inc → ...leRector/Fixture/some_static_call.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SomeStaticCall
{
Expand All @@ -18,7 +18,7 @@ final class SomeStaticCall
-----
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

final class SomeStaticCall
{
Expand Down
8 changes: 4 additions & 4 deletions ...tic_with_other_object_const_fetch.php.inc → ...tic_with_other_object_const_fetch.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

final class StaticWithOtherObjectConstFetch
{
Expand All @@ -16,9 +16,9 @@ final class StaticWithOtherObjectConstFetch
-----
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

final class StaticWithOtherObjectConstFetch
{
Expand Down
8 changes: 4 additions & 4 deletions ...ector/Fixture/with_property_fetch.php.inc → ...ector/Fixture/with_property_fetch.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

final class WithPropertyFetch
{
Expand All @@ -23,9 +23,9 @@ final class WithPropertyFetch
-----
<?php

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Fixture;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Fixture;

use Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source\SomeExternalObject;
use Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source\SomeExternalObject;

final class WithPropertyFetch
{
Expand Down
2 changes: 1 addition & 1 deletion ...lableRector/Source/SomeExternalObject.php → ...lableRector/Source/SomeExternalObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source;

final class SomeExternalObject
{
Expand Down
2 changes: 1 addition & 1 deletion ...llableRector/Source/WithPrivateMethod.php → ...llableRector/Source/WithPrivateMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\Source;
namespace Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\Source;

class WithPrivateMethod {
/** @var callable */
Expand Down
4 changes: 2 additions & 2 deletions ...CallableRector/config/configured_rule.php → ...CallableRector/config/configured_rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\Php81\Rector\Array_\FirstClassCallableRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
use Rector\ValueObject\PhpVersion;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(FirstClassCallableRector::class);
$rectorConfig->rule(ArrayToFirstClassCallableRector::class);

$rectorConfig->phpVersion(PhpVersion::PHP_81);
};
6 changes: 0 additions & 6 deletions ...-tests/Php81/Rector/Array_/FirstClassCallableRector/Fixture/skip_dynamic_variable.php.inc
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...ests/Php81/Rector/Array_/FirstClassCallableRector/Fixture/skip_in_attribute_class.php.inc
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...81/Rector/Array_/FirstClassCallableRector/Fixture/skip_invoke_from_non_class_code.php.inc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ector/Array_/FirstClassCallableRector.php → ...rray_/ArrayToFirstClassCallableRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

/**
* @see RFC https://wiki.php.net/rfc/first_class_callable_syntax
* @see \Rector\Tests\Php81\Rector\Array_\FirstClassCallableRector\FirstClassCallableRectorTest
* @see \Rector\Tests\Php81\Rector\Array_\ArrayToFirstClassCallableRector\ArrayToFirstClassCallableRectorTest
*/
final class FirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
final class ArrayToFirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
{
public function __construct(
private readonly ArrayCallableMethodMatcher $arrayCallableMethodMatcher,
Expand Down
4 changes: 2 additions & 2 deletions tests/Issues/AnnotationToAttributeFirstClassCallable/config/configured_rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
use Rector\Php80\ValueObject\AnnotationToAttribute;
use Rector\Php81\Rector\Array_\FirstClassCallableRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;

return RectorConfig::configure()
->withConfiguredRule(AnnotationToAttributeRector::class, [
new AnnotationToAttribute('Symfony\Component\Serializer\Annotation\Context'),
])
->withRules([FirstClassCallableRector::class]);
->withRules([ArrayToFirstClassCallableRector::class]);
4 changes: 2 additions & 2 deletions tests/Issues/AttributeAndArgValueRefresh/config/configured_rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\Php81\Rector\Array_\FirstClassCallableRector;
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
use Rector\Tests\Issues\AttributeAndArgValueRefresh\Source\SetArrayArgValueRector;
use Rector\Tests\Issues\AttributeAndArgValueRefresh\Source\SetArrayAttributeValueRector;

return RectorConfig::configure()
->withRules([
SetArrayArgValueRector::class,
SetArrayAttributeValueRector::class,
FirstClassCallableRector::class,
ArrayToFirstClassCallableRector::class,
]);