From 17d14ba4acacb0bba7a4d86a125787c7daaede77 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 23 Sep 2019 17:21:55 +0200 Subject: [PATCH] move RenameClassRector to Renaming package --- composer.json | 6 +- config/set/cakephp/cakephp34.yaml | 2 +- config/set/cakephp/cakephp35.yaml | 2 +- config/set/cakephp/cakephp36.yaml | 2 +- config/set/cakephp/cakephp40.yaml | 2 +- config/set/easy-corp/easy-admin-bundle20.yaml | 2 +- .../elasticsearch-dsl50.yaml | 2 +- .../framework-migration/nette-to-symfony.yaml | 2 +- .../nette-to-symfony/doctrine.yaml | 2 +- .../nette-to-symfony/kdyby-to-symfony.yaml | 2 +- config/set/laravel/laravel50.yaml | 2 +- config/set/laravel/laravel51.yaml | 2 +- config/set/laravel/laravel52.yaml | 2 +- config/set/laravel/laravel54.yaml | 2 +- config/set/laravel/laravel55.yaml | 2 +- .../php-code-sniffer/php-code-sniffer30.yaml | 2 +- config/set/phpspec/phpspec30.yaml | 2 +- config/set/phpunit/phpunit80.yaml | 2 +- config/set/sylius/sylius10.yaml | 2 +- config/set/symfony/symfony30.yaml | 2 +- config/set/symfony/symfony33.yaml | 2 +- config/set/symfony/symfony40.yaml | 2 +- config/set/symfony/symfony41.yaml | 2 +- config/set/symfony/symfony42.yaml | 2 +- config/set/symfony/symfony43.yaml | 2 +- .../twig/twig-underscore-to-namespace.yaml | 2 +- config/set/twig/twig112.yaml | 2 +- config/set/twig/twig20.yaml | 2 +- docs/AllRectorsOverview.md | 4 +- .../RenamedClassesReportExtension.php | 2 +- .../src}/Rector/Class_/RenameClassRector.php | 4 +- .../Fixture/class_annotations.php.inc | 65 +++++++++++++++++++ .../class_annotations_serializer_type.php.inc | 31 +++++++++ .../Fixture/class_to_interface.php.inc | 4 +- .../Fixture/class_to_new.php.inc | 21 ++++++ .../Fixture/interface_to_class.php.inc | 4 +- .../Fixture/keep_return_tag.php.inc | 2 +- .../Fixture/name_insensitive.php.inc | 31 +++++++++ .../Fixture/rename_class.php.inc | 0 ...e_class_to_class_without_namespace.php.inc | 0 .../rename_class_without_namespace.php.inc | 0 ...mespace_to_class_without_namespace.php.inc | 0 .../Fixture/rename_interface.php.inc | 0 .../Fixture/rename_trait.php.inc | 0 .../Fixture/underscore_doc.php.inc | 8 +-- .../RenameClassRectorTest.php | 14 ++-- .../Source/AbstractManualExtension.php | 4 +- .../Source/Manual_Twig_Filter.php | 0 .../RenameClassRector/Source/NewClass.php | 8 +++ .../Source/NewClassWithoutTypo.php | 8 +++ .../RenameClassRector/Source/OldClass.php | 8 +++ .../Source/OldClassWithTypo.php | 8 +++ .../RenameClassRector/Source/TwigFilter.php | 0 .../Source/Twig_Extension_Sandbox.php | 0 .../src/PHPStan/Type/ObjectTypeSpecifier.php | 6 +- renames-rector.yaml | 2 +- .../Fixture/class_annotations.php.inc | 65 ------------------- .../class_annotations_serializer_type.php.inc | 31 --------- .../Fixture/class_to_new.php.inc | 21 ------ .../Fixture/name_insensitive.php.inc | 31 --------- .../RenameClassRector/Source/NewClass.php | 8 --- .../Source/NewClassWithoutTypo.php | 8 --- .../RenameClassRector/Source/OldClass.php | 8 --- .../Source/OldClassWithTypo.php | 8 --- 64 files changed, 237 insertions(+), 237 deletions(-) rename {src => packages/Renaming/src}/Rector/Class_/RenameClassRector.php (98%) create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations.php.inc create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc (71%) create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_to_new.php.inc rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc (70%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/keep_return_tag.php.inc (66%) create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/name_insensitive.php.inc rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/rename_class.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/rename_class_to_class_without_namespace.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/rename_interface.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/rename_trait.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc (50%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/RenameClassRectorTest.php (84%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Source/AbstractManualExtension.php (50%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Source/Manual_Twig_Filter.php (100%) create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/NewClass.php create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/NewClassWithoutTypo.php create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/OldClass.php create mode 100644 packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/OldClassWithTypo.php rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Source/TwigFilter.php (100%) rename {tests => packages/Renaming/tests}/Rector/Class_/RenameClassRector/Source/Twig_Extension_Sandbox.php (100%) delete mode 100644 tests/Rector/Class_/RenameClassRector/Fixture/class_annotations.php.inc delete mode 100644 tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc delete mode 100644 tests/Rector/Class_/RenameClassRector/Fixture/class_to_new.php.inc delete mode 100644 tests/Rector/Class_/RenameClassRector/Fixture/name_insensitive.php.inc delete mode 100644 tests/Rector/Class_/RenameClassRector/Source/NewClass.php delete mode 100644 tests/Rector/Class_/RenameClassRector/Source/NewClassWithoutTypo.php delete mode 100644 tests/Rector/Class_/RenameClassRector/Source/OldClass.php delete mode 100644 tests/Rector/Class_/RenameClassRector/Source/OldClassWithTypo.php diff --git a/composer.json b/composer.json index 30d8b655cb7..b293155322d 100644 --- a/composer.json +++ b/composer.json @@ -173,9 +173,9 @@ "packages/TypeDeclaration/tests/Rector/Property/CompleteVarDocTypePropertyRector/Source/EventDispatcher.php", "tests/Rector/Namespace_/PseudoNamespaceToNamespaceRector/Source/ChangeMeAnotherNamespace.php", "packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Source/MyBar.php", - "tests/Rector/Class_/RenameClassRector/Source/Twig_Extension_Sandbox.php", - "tests/Rector/Class_/RenameClassRector/Source/TwigFilter.php", - "tests/Rector/Class_/RenameClassRector/Source/Manual_Twig_Filter.php" + "packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/Twig_Extension_Sandbox.php", + "packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/TwigFilter.php", + "packages/Renaming/tests/Rector/Class_/RenameClassRector/Source/Manual_Twig_Filter.php" ] }, "scripts": { diff --git a/config/set/cakephp/cakephp34.yaml b/config/set/cakephp/cakephp34.yaml index c9cdf3db8de..86dbcfce10b 100644 --- a/config/set/cakephp/cakephp34.yaml +++ b/config/set/cakephp/cakephp34.yaml @@ -240,7 +240,7 @@ services: Cake\View\CellTrait: cell: 'protected' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Cake\Database\Schema\Table: 'Cake\Database\Schema\TableSchema' Rector\Rector\MethodBody\NormalToFluentRector: diff --git a/config/set/cakephp/cakephp35.yaml b/config/set/cakephp/cakephp35.yaml index 403bfb33248..e1b20a5b6c0 100644 --- a/config/set/cakephp/cakephp35.yaml +++ b/config/set/cakephp/cakephp35.yaml @@ -1,7 +1,7 @@ # source: https://book.cakephp.org/3.0/en/appendices/3-5-migration-guide.html services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Cake\Http\Client\CookieCollection: 'Cake\Http\Cookie\CookieCollection' Cake\Console\ShellDispatcher: 'Cake\Console\CommandRunner' diff --git a/config/set/cakephp/cakephp36.yaml b/config/set/cakephp/cakephp36.yaml index e3ea170f78e..b86924c1947 100644 --- a/config/set/cakephp/cakephp36.yaml +++ b/config/set/cakephp/cakephp36.yaml @@ -21,7 +21,7 @@ services: 'get': 'getValidator' 'set': 'setValidator' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: 'Cake\Cache\Engine\ApcEngine': 'Cake\Cache\Engine\ApcuEngine' 'Cake\Network\Exception\BadRequestException': 'Cake\Http\Exception\BadRequestException' 'Cake\Network\Exception\ConflictException': 'Cake\Http\Exception\ConflictException' diff --git a/config/set/cakephp/cakephp40.yaml b/config/set/cakephp/cakephp40.yaml index 988a58c149d..f056c1a04c5 100644 --- a/config/set/cakephp/cakephp40.yaml +++ b/config/set/cakephp/cakephp40.yaml @@ -1,7 +1,7 @@ # source: https://book.cakephp.org/4.0/en/appendices/4-0-migration-guide.html services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Cake\Database\Type: 'Cake\Database\TypeFactory' Rector\Renaming\Rector\Constant\RenameClassConstantRector: diff --git a/config/set/easy-corp/easy-admin-bundle20.yaml b/config/set/easy-corp/easy-admin-bundle20.yaml index fe3af1c8c5f..344705ea7c3 100644 --- a/config/set/easy-corp/easy-admin-bundle20.yaml +++ b/config/set/easy-corp/easy-admin-bundle20.yaml @@ -5,5 +5,5 @@ services: EasyCorp\Bundle\EasyAdminBundle\AdminController: ~ # then rename the "EasyCorp\Bundle\EasyAdminBundle\AdminController" class - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: EasyCorp\Bundle\EasyAdminBundle\AdminController: 'EasyCorp\Bundle\EasyAdminBundle\EasyAdminController' diff --git a/config/set/elasticsearch-dsl/elasticsearch-dsl50.yaml b/config/set/elasticsearch-dsl/elasticsearch-dsl50.yaml index 59cbb7443ec..c494ac1b8b7 100644 --- a/config/set/elasticsearch-dsl/elasticsearch-dsl50.yaml +++ b/config/set/elasticsearch-dsl/elasticsearch-dsl50.yaml @@ -1,7 +1,7 @@ # https://github.com/ongr-io/ElasticsearchDSL/blob/5.x/CHANGELOG.md services: Rector\ElasticSearchDSL\Rector\MethodCall\MigrateFilterToQueryRector: ~ - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: ONGR\ElasticsearchDSL\Query\BoolQuery: ONGR\ElasticsearchDSL\Query\Compound\BoolQuery ONGR\ElasticsearchDSL\Query\BoostingQuery: ONGR\ElasticsearchDSL\Query\Compound\BoostingQuery ONGR\ElasticsearchDSL\Query\ConstantScoreQuery: ONGR\ElasticsearchDSL\Query\Compound\ConstantScoreQuery diff --git a/config/set/framework-migration/nette-to-symfony.yaml b/config/set/framework-migration/nette-to-symfony.yaml index e027c522946..295b5a9aa91 100644 --- a/config/set/framework-migration/nette-to-symfony.yaml +++ b/config/set/framework-migration/nette-to-symfony.yaml @@ -11,7 +11,7 @@ services: Nette\Application\IPresenter: run: Symfony\Component\HttpFoundation\Response - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # run(Request $appRequest) -> run(\Symfony\Component\HttpFoundation\Request $appRequest) Nette\Application\Request: Symfony\Component\HttpFoundation\Request Nette\Http\Request: Symfony\Component\HttpFoundation\Request diff --git a/config/set/framework-migration/nette-to-symfony/doctrine.yaml b/config/set/framework-migration/nette-to-symfony/doctrine.yaml index eb09da37a2d..04098d51dc0 100644 --- a/config/set/framework-migration/nette-to-symfony/doctrine.yaml +++ b/config/set/framework-migration/nette-to-symfony/doctrine.yaml @@ -1,3 +1,3 @@ services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Doctrine\Common\DataFixtures\AbstractFixture: Doctrine\Bundle\FixturesBundle\Fixture diff --git a/config/set/framework-migration/nette-to-symfony/kdyby-to-symfony.yaml b/config/set/framework-migration/nette-to-symfony/kdyby-to-symfony.yaml index ab3b385c078..f479fb8349a 100644 --- a/config/set/framework-migration/nette-to-symfony/kdyby-to-symfony.yaml +++ b/config/set/framework-migration/nette-to-symfony/kdyby-to-symfony.yaml @@ -10,7 +10,7 @@ services: Kdyby\RabbitMq\IConsumer: process: 'execute' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # Kdyby → Symfony Kdyby\RabbitMq\IConsumer: 'OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface' Kdyby\RabbitMq\IProducer: 'OldSound\RabbitMqBundle\RabbitMq\ProducerInterface' diff --git a/config/set/laravel/laravel50.yaml b/config/set/laravel/laravel50.yaml index ef424f81886..48e0d1a2885 100644 --- a/config/set/laravel/laravel50.yaml +++ b/config/set/laravel/laravel50.yaml @@ -1,6 +1,6 @@ # see: https://laravel.com/docs/5.0/upgrade services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Illuminate\Cache\CacheManager: 'Illuminate\Contracts\Cache\Repository' # https://stackoverflow.com/a/24949656/1348344 Illuminate\Database\Eloquent\SoftDeletingTrait: 'Illuminate\Database\Eloquent\SoftDeletes' diff --git a/config/set/laravel/laravel51.yaml b/config/set/laravel/laravel51.yaml index da7f6c08199..c1e1350172e 100644 --- a/config/set/laravel/laravel51.yaml +++ b/config/set/laravel/laravel51.yaml @@ -1,4 +1,4 @@ # see: https://laravel.com/docs/5.1/upgrade services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Illuminate\Validation\Validator: 'Illuminate\Contracts\Validation\Validator' diff --git a/config/set/laravel/laravel52.yaml b/config/set/laravel/laravel52.yaml index be5b1aa04ff..8eab454dede 100644 --- a/config/set/laravel/laravel52.yaml +++ b/config/set/laravel/laravel52.yaml @@ -1,6 +1,6 @@ # see: https://laravel.com/docs/5.2/upgrade services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Illuminate\Auth\Access\UnauthorizedException: 'Illuminate\Auth\Access\AuthorizationException' Illuminate\Http\Exception\HttpResponseException: 'Illuminate\Foundation\Validation\ValidationException' Illuminate\Foundation\Composer: 'Illuminate\Support\Composer' diff --git a/config/set/laravel/laravel54.yaml b/config/set/laravel/laravel54.yaml index 4c6218ce9e7..12f8749b027 100644 --- a/config/set/laravel/laravel54.yaml +++ b/config/set/laravel/laravel54.yaml @@ -5,7 +5,7 @@ services: locale.changed: ['Illuminate\Foundation\Events\LocaleUpdated', 'class'] illuminate.log: ['Illuminate\Log\Events\MessageLogged', 'class'] - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Illuminate\Console\AppNamespaceDetectorTrait: 'Illuminate\Console\DetectsApplicationNamespace' Illuminate\Http\Exception\HttpResponseException: 'Illuminate\Http\Exceptions\HttpResponseException' Illuminate\Http\Exception\PostTooLargeException: 'Illuminate\Http\Exceptions\PostTooLargeException' diff --git a/config/set/laravel/laravel55.yaml b/config/set/laravel/laravel55.yaml index 9c28f15ea7a..acd9fd55104 100644 --- a/config/set/laravel/laravel55.yaml +++ b/config/set/laravel/laravel55.yaml @@ -10,5 +10,5 @@ services: Illuminate\Database\Eloquent\Relations\Pivot: parent: 'pivotParent' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Illuminate\Translation\LoaderInterface: 'Illuminate\Contracts\Translation\Loader' diff --git a/config/set/php-code-sniffer/php-code-sniffer30.yaml b/config/set/php-code-sniffer/php-code-sniffer30.yaml index 5ad5930fac7..fe9db2b4c59 100644 --- a/config/set/php-code-sniffer/php-code-sniffer30.yaml +++ b/config/set/php-code-sniffer/php-code-sniffer30.yaml @@ -1,5 +1,5 @@ services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: 'PHP_CodeSniffer_Sniffs_Sniff': 'PHP_CodeSniffer\Sniffs\Sniff' 'PHP_CodeSniffer_File': 'PHP_CodeSniffer\Files\File' 'PHP_CodeSniffer_Tokens': 'PHP_CodeSniffer\Util\Tokens' diff --git a/config/set/phpspec/phpspec30.yaml b/config/set/phpspec/phpspec30.yaml index 4c1dda9d93e..d0621f89959 100644 --- a/config/set/phpspec/phpspec30.yaml +++ b/config/set/phpspec/phpspec30.yaml @@ -5,7 +5,7 @@ services: set: 'define' setShared: 'define' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: PhpSpec\Console\IO: 'PhpSpec\Console\ConsoleIO' PhpSpec\IO\IOInterface: 'PhpSpec\IO\IO' PhpSpec\Locator\ResourceInterface: 'PhpSpec\Locator\Resource' diff --git a/config/set/phpunit/phpunit80.yaml b/config/set/phpunit/phpunit80.yaml index 9c19580937a..a3682aee380 100644 --- a/config/set/phpunit/phpunit80.yaml +++ b/config/set/phpunit/phpunit80.yaml @@ -11,7 +11,7 @@ services: Rector\PHPUnit\Rector\MethodCall\SpecificAssertContainsRector: ~ Rector\PHPUnit\Rector\MethodCall\SpecificAssertInternalTypeRector: ~ - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # https://github.com/sebastianbergmann/phpunit/issues/3123 'PHPUnit_Framework_MockObject_MockObject': 'PHPUnit\Framework\MockObject\MockObject' Rector\PHPUnit\Rector\MethodCall\AssertEqualsParameterToSpecificMethodsTypeRector: ~ diff --git a/config/set/sylius/sylius10.yaml b/config/set/sylius/sylius10.yaml index 175a1700362..5ab6ee271c1 100644 --- a/config/set/sylius/sylius10.yaml +++ b/config/set/sylius/sylius10.yaml @@ -47,7 +47,7 @@ services: all: 'Zend\Stdlib\PriorityQueue': 'iterable' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: 'Sylius\Bundle\CoreBundle\Context\SessionAndChannelBasedCartContext': 'Sylius\Component\Core\Storage\CartStorageInterface' 'Sylius\Bundle\CoreBundle\EmailManager\ShipmentEmailManager': 'Sylius\Bundle\AdminBundle\EmailManager\ShipmentEmailManager' 'Sylius\Bundle\CoreBundle\EmailManager\ShipmentEmailManagerInterface': 'Sylius\Bundle\AdminBundle\EmailManager\ShipmentEmailManagerInterface' diff --git a/config/set/symfony/symfony30.yaml b/config/set/symfony/symfony30.yaml index e70753f1d2c..3542474b5e9 100644 --- a/config/set/symfony/symfony30.yaml +++ b/config/set/symfony/symfony30.yaml @@ -92,7 +92,7 @@ services: 'getMessageParameters': 'getParameters' 'getMessagePluralization': 'getPlural' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # class loader 'Symfony\Component\ClassLoader\UniversalClassLoader\UniversalClassLoader': 'Symfony\Component\ClassLoader\ClassLoader' # partial with method rename diff --git a/config/set/symfony/symfony33.yaml b/config/set/symfony/symfony33.yaml index 8a7c65073fc..1439a5673c3 100644 --- a/config/set/symfony/symfony33.yaml +++ b/config/set/symfony/symfony33.yaml @@ -19,7 +19,7 @@ services: Rector\Symfony\Rector\Console\ConsoleExceptionToErrorEventConstantRector: ~ - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # console 'Symfony\Component\Console\Event\ConsoleExceptionEvent': 'Symfony\Component\Console\Event\ConsoleErrorEvent' diff --git a/config/set/symfony/symfony40.yaml b/config/set/symfony/symfony40.yaml index dcc9257464b..da4ca0c1b37 100644 --- a/config/set/symfony/symfony40.yaml +++ b/config/set/symfony/symfony40.yaml @@ -8,6 +8,6 @@ services: Rector\Symfony\Rector\Process\ProcessBuilderInstanceRector: ~ Rector\Symfony\Rector\Process\ProcessBuilderGetProcessRector: ~ - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: 'Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest': 'Symfony\Component\Validator\Test\ConstraintValidatorTestCase' 'Symfony\Component\Process\ProcessBuilder': 'Symfony\Component\Process\Process' diff --git a/config/set/symfony/symfony41.yaml b/config/set/symfony/symfony41.yaml index 9eb3adcf279..df4f601637e 100644 --- a/config/set/symfony/symfony41.yaml +++ b/config/set/symfony/symfony41.yaml @@ -21,7 +21,7 @@ services: reset: 'clear' add: 'addWorkflow' - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # https://github.com/symfony/symfony/commit/07dd09db59e2f2a86a291d00d978169d9059e307 Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector: 'Symfony\Component\HttpKernel\DataCollector\RequestDataCollector' Symfony\Component\Workflow\SupportStrategy\SupportStrategyInterface: 'Symfony\Component\Workflow\SupportStrategy\WorkflowSupportStrategyInterface' diff --git a/config/set/symfony/symfony42.yaml b/config/set/symfony/symfony42.yaml index 68b0f4b418d..83dbc501e0f 100644 --- a/config/set/symfony/symfony42.yaml +++ b/config/set/symfony/symfony42.yaml @@ -3,7 +3,7 @@ services: Rector\Rector\New_\NewToStaticCallRector: Symfony\Component\HttpFoundation\Cookie: ['Symfony\Component\HttpFoundation\Cookie', 'create'] - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # https://github.com/symfony/symfony/commit/a7e319d9e1316e2e18843f8ce15b67a8693e5bf9 Symfony\Bundle\FrameworkBundle\Controller\Controller: 'Symfony\Bundle\FrameworkBundle\Controller\AbstractController' # https://github.com/symfony/symfony/commit/744bf0e7ac3ecf240d0bf055cc58f881bb0b3ec0 diff --git a/config/set/symfony/symfony43.yaml b/config/set/symfony/symfony43.yaml index 371066d0603..b06a8b9c3fb 100644 --- a/config/set/symfony/symfony43.yaml +++ b/config/set/symfony/symfony43.yaml @@ -13,7 +13,7 @@ services: Rector\Symfony\Rector\MethodCall\MakeDispatchFirstArgumentEventRector: ~ # https://symfony.com/blog/new-in-symfony-4-3-simpler-event-dispatching - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # Browser Kit Symfony\Component\BrowserKit\Client: 'Symfony\Component\BrowserKit\AbstractBrowser' diff --git a/config/set/twig/twig-underscore-to-namespace.yaml b/config/set/twig/twig-underscore-to-namespace.yaml index a167043e22c..a209604d149 100644 --- a/config/set/twig/twig-underscore-to-namespace.yaml +++ b/config/set/twig/twig-underscore-to-namespace.yaml @@ -1,5 +1,5 @@ services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: 'Twig_LoaderInterface': 'Twig\Loader\LoaderInterface' 'Twig_Extension_StringLoader': 'Twig\Extension\StringLoaderExtension' 'Twig_Extension_Optimizer': 'Twig\Extension\OptimizerExtension' diff --git a/config/set/twig/twig112.yaml b/config/set/twig/twig112.yaml index 71e731a96fc..3118745be0c 100644 --- a/config/set/twig/twig112.yaml +++ b/config/set/twig/twig112.yaml @@ -1,6 +1,6 @@ services: # see https://stackoverflow.com/a/43495506/1348344 - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: Twig_Function_Node: 'Twig_SimpleFunction' Twig_Function: 'Twig_SimpleFunction' Twig_Filter: 'Twig_SimpleFilter' diff --git a/config/set/twig/twig20.yaml b/config/set/twig/twig20.yaml index 6da946a3170..c8490d55a5f 100644 --- a/config/set/twig/twig20.yaml +++ b/config/set/twig/twig20.yaml @@ -1,5 +1,5 @@ services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: # see https://twig.symfony.com/doc/1.x/deprecated.html#filters Twig_SimpleFilter: 'Twig_Filter' # see https://twig.symfony.com/doc/1.x/deprecated.html#functions diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index de3e2a34bd9..ab101a41761 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7294,13 +7294,13 @@ services: ### `RenameClassRector` -- class: `Rector\Rector\Class_\RenameClassRector` +- class: `Rector\Renaming\Rector\Class_\RenameClassRector` Replaces defined classes by new ones. ```yaml services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: $oldToNewClasses: App\SomeOldClass: App\SomeNewClass ``` diff --git a/packages/PSR4/src/Extension/RenamedClassesReportExtension.php b/packages/PSR4/src/Extension/RenamedClassesReportExtension.php index 87fae92ca73..f7d74702ccc 100644 --- a/packages/PSR4/src/Extension/RenamedClassesReportExtension.php +++ b/packages/PSR4/src/Extension/RenamedClassesReportExtension.php @@ -12,7 +12,7 @@ use Rector\Contract\Extension\ReportingExtensionInterface; use Rector\PhpParser\Printer\BetterStandardPrinter; use Rector\PSR4\Collector\RenamedClassesCollector; use Rector\PSR4\ValueObject\ClassRenameValueObject; -use Rector\Rector\Class_\RenameClassRector; +use Rector\Renaming\Rector\Class_\RenameClassRector; use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Yaml\Yaml; diff --git a/src/Rector/Class_/RenameClassRector.php b/packages/Renaming/src/Rector/Class_/RenameClassRector.php similarity index 98% rename from src/Rector/Class_/RenameClassRector.php rename to packages/Renaming/src/Rector/Class_/RenameClassRector.php index a66a6472562..85c9efe9a8c 100644 --- a/src/Rector/Class_/RenameClassRector.php +++ b/packages/Renaming/src/Rector/Class_/RenameClassRector.php @@ -1,6 +1,6 @@ +----- + diff --git a/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc new file mode 100644 index 00000000000..462b7b6e352 --- /dev/null +++ b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc @@ -0,0 +1,31 @@ +") + */ + public $flights = []; +} + +?> +----- +") + */ + public $flights = []; +} + +?> diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc similarity index 71% rename from tests/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc index 5d43bf21de1..3b2996e883b 100644 --- a/tests/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc +++ b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/class_to_interface.php.inc @@ -1,6 +1,6 @@ +----- + diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc similarity index 70% rename from tests/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc index 5e739ff8c0a..095c1101c3d 100644 --- a/tests/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc +++ b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/interface_to_class.php.inc @@ -1,6 +1,6 @@ +----- + diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/rename_class.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class.php.inc similarity index 100% rename from tests/Rector/Class_/RenameClassRector/Fixture/rename_class.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class.php.inc diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_to_class_without_namespace.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_to_class_without_namespace.php.inc similarity index 100% rename from tests/Rector/Class_/RenameClassRector/Fixture/rename_class_to_class_without_namespace.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_to_class_without_namespace.php.inc diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace.php.inc similarity index 100% rename from tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace.php.inc diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc similarity index 100% rename from tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/rename_interface.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_interface.php.inc similarity index 100% rename from tests/Rector/Class_/RenameClassRector/Fixture/rename_interface.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_interface.php.inc diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/rename_trait.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_trait.php.inc similarity index 100% rename from tests/Rector/Class_/RenameClassRector/Fixture/rename_trait.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/rename_trait.php.inc diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc similarity index 50% rename from tests/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc rename to packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc index bbd6a86484f..7e63092d9ac 100644 --- a/tests/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc +++ b/packages/Renaming/tests/Rector/Class_/RenameClassRector/Fixture/underscore_doc.php.inc @@ -1,8 +1,8 @@ matchShortenedObjectType($node, $objectType); - if ($shortednedObjectType) { - return $shortednedObjectType; + $shortenedObjectType = $this->matchShortenedObjectType($node, $objectType); + if ($shortenedObjectType) { + return $shortenedObjectType; } $sameNamespacedObjectType = $this->matchSameNamespacedObjectType($node, $objectType); diff --git a/renames-rector.yaml b/renames-rector.yaml index 889580d739e..e658b23825f 100644 --- a/renames-rector.yaml +++ b/renames-rector.yaml @@ -1,5 +1,5 @@ services: - Rector\Rector\Class_\RenameClassRector: + Rector\Renaming\Rector\Class_\RenameClassRector: $oldToNewClasses: Rector\Symfony\Tests\FrameworkBundle\AbstractToConstructorInjectionRectorSource\SomeNonKernelClass: Rector\Symfony\Tests\Rector\FrameworkBundle\AbstractToConstructorInjectionRectorSource\SomeNonKernelClass Rector\Symfony\Tests\FrameworkBundle\AbstractToConstructorInjectionRectorSource\SomeKernelClass: Rector\Symfony\Tests\Rector\FrameworkBundle\AbstractToConstructorInjectionRectorSource\SomeKernelClass diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations.php.inc b/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations.php.inc deleted file mode 100644 index c7b0aa1af12..00000000000 --- a/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations.php.inc +++ /dev/null @@ -1,65 +0,0 @@ - ------ - diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc b/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc deleted file mode 100644 index ce5b5907bf0..00000000000 --- a/tests/Rector/Class_/RenameClassRector/Fixture/class_annotations_serializer_type.php.inc +++ /dev/null @@ -1,31 +0,0 @@ -") - */ - public $flights = []; -} - -?> ------ -") - */ - public $flights = []; -} - -?> diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/class_to_new.php.inc b/tests/Rector/Class_/RenameClassRector/Fixture/class_to_new.php.inc deleted file mode 100644 index 977d4077772..00000000000 --- a/tests/Rector/Class_/RenameClassRector/Fixture/class_to_new.php.inc +++ /dev/null @@ -1,21 +0,0 @@ - ------ - diff --git a/tests/Rector/Class_/RenameClassRector/Fixture/name_insensitive.php.inc b/tests/Rector/Class_/RenameClassRector/Fixture/name_insensitive.php.inc deleted file mode 100644 index 0909b1a47e1..00000000000 --- a/tests/Rector/Class_/RenameClassRector/Fixture/name_insensitive.php.inc +++ /dev/null @@ -1,31 +0,0 @@ - ------ - diff --git a/tests/Rector/Class_/RenameClassRector/Source/NewClass.php b/tests/Rector/Class_/RenameClassRector/Source/NewClass.php deleted file mode 100644 index 780a7e5a8e2..00000000000 --- a/tests/Rector/Class_/RenameClassRector/Source/NewClass.php +++ /dev/null @@ -1,8 +0,0 @@ -