From 419da7704b147b8c781a5e5303d23ccc9d2cf425 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 23 Sep 2019 16:36:58 +0200 Subject: [PATCH 01/14] [Renaming] init new package --- composer.json | 2 ++ config/set/database-migration/mysql-to-mysqli.yaml | 2 +- ecs.yaml | 2 +- packages/Php/tests/EregToPcreTransformerTest.php | 2 +- packages/Php70/config/config.yaml | 8 ++++++++ packages/{Php => Php70}/src/EregToPcreTransformer.php | 2 +- .../Php70/src/Rector/FuncCall/EregToPregMatchRector.php | 2 +- .../src/Rector/ConstFetch/RenameConstantRector.php | 4 ++-- .../RenameConstantRector/Fixture/fixture.php.inc | 4 ++-- .../RenameConstantRector/Fixture/spaghetti.php.inc | 4 ++-- .../RenameConstantRector/RenameConstantRectorTest.php | 4 ++-- phpstan.neon | 2 +- 12 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 packages/Php70/config/config.yaml rename packages/{Php => Php70}/src/EregToPcreTransformer.php (99%) rename packages/{Php => Renaming}/src/Rector/ConstFetch/RenameConstantRector.php (91%) rename packages/{Php => Renaming}/tests/Rector/ConstFetch/RenameConstantRector/Fixture/fixture.php.inc (57%) rename packages/{Php => Renaming}/tests/Rector/ConstFetch/RenameConstantRector/Fixture/spaghetti.php.inc (61%) rename packages/{Php => Renaming}/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php (87%) diff --git a/composer.json b/composer.json index 03f157ce1346..30d8b655cb7f 100644 --- a/composer.json +++ b/composer.json @@ -83,6 +83,7 @@ "Rector\\Php73\\": "packages/Php73/src", "Rector\\Php74\\": "packages/Php74/src", "Rector\\RemovingStatic\\": "packages/RemovingStatic/src", + "Rector\\Renaming\\": "packages/Renaming/src", "Rector\\Restoration\\": "packages/Restoration/src", "Rector\\Refactoring\\": "packages/Refactoring/src", "Rector\\SOLID\\": "packages/SOLID/src", @@ -140,6 +141,7 @@ "Rector\\Php73\\Tests\\": "packages/Php73/tests", "Rector\\Php74\\Tests\\": "packages/Php74/tests", "Rector\\RemovingStatic\\Tests\\": "packages/RemovingStatic/tests", + "Rector\\Renaming\\Tests\\": "packages/Renaming/tests", "Rector\\Restoration\\Tests\\": "packages/Restoration/tests", "Rector\\SOLID\\Tests\\": "packages/SOLID/tests", "Rector\\Sensio\\Tests\\": "packages/Sensio/tests", diff --git a/config/set/database-migration/mysql-to-mysqli.yaml b/config/set/database-migration/mysql-to-mysqli.yaml index 16c422de25a6..7c4e1cd2e576 100644 --- a/config/set/database-migration/mysql-to-mysqli.yaml +++ b/config/set/database-migration/mysql-to-mysqli.yaml @@ -51,7 +51,7 @@ services: # http://php.net/manual/en/mysql.constants.php ↓ # http://php.net/manual/en/mysqli.constants.php - Rector\Php\Rector\ConstFetch\RenameConstantRector: + Rector\Renaming\Rector\ConstFetch\RenameConstantRector: MYSQL_ASSOC: 'MYSQLI_ASSOC' MYSQL_NUM: 'MYSQLI_NUM' MYSQL_BOTH: 'MYSQLI_BOTH' diff --git a/ecs.yaml b/ecs.yaml index 4c5b70105b86..4bc383887250 100644 --- a/ecs.yaml +++ b/ecs.yaml @@ -150,7 +150,7 @@ parameters: - 'packages/CodingStyle/src/Rector/Namespace_/ImportFullyQualifiedNamesRector.php' # copied 3rd party logic - - 'packages/Php/src/EregToPcreTransformer.php' + - 'packages/Php70/src/EregToPcreTransformer.php' # dev - 'packages/TypeDeclaration/src/Rector/FunctionLike/*TypeDeclarationRector.php' - 'packages/Php70/src/Rector/If_/IfToSpaceshipRector.php' diff --git a/packages/Php/tests/EregToPcreTransformerTest.php b/packages/Php/tests/EregToPcreTransformerTest.php index c5c2a48e8f99..0a9d6f401493 100644 --- a/packages/Php/tests/EregToPcreTransformerTest.php +++ b/packages/Php/tests/EregToPcreTransformerTest.php @@ -4,7 +4,7 @@ use Iterator; use PHPUnit\Framework\TestCase; -use Rector\Php\EregToPcreTransformer; +use Rector\Php70\EregToPcreTransformer; final class EregToPcreTransformerTest extends TestCase { diff --git a/packages/Php70/config/config.yaml b/packages/Php70/config/config.yaml new file mode 100644 index 000000000000..376ab2523959 --- /dev/null +++ b/packages/Php70/config/config.yaml @@ -0,0 +1,8 @@ +services: + _defaults: + public: true + autowire: true + + Rector\Php70\: + resource: '../src' + exclude: '../src/{Rector/**/*Rector.php}' diff --git a/packages/Php/src/EregToPcreTransformer.php b/packages/Php70/src/EregToPcreTransformer.php similarity index 99% rename from packages/Php/src/EregToPcreTransformer.php rename to packages/Php70/src/EregToPcreTransformer.php index 824b1cbe71d8..479e3576399c 100644 --- a/packages/Php/src/EregToPcreTransformer.php +++ b/packages/Php70/src/EregToPcreTransformer.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 16:40:54 +0200 Subject: [PATCH 02/14] move RenameFunctionRector to Renaming package --- config/set/celebrity/celebrity.yaml | 2 +- config/set/database-migration/mysql-to-mysqli.yaml | 2 +- config/set/php/php54.yaml | 2 +- config/set/php/php56.yaml | 2 +- config/set/php/php72.yaml | 2 +- config/set/php/php73.yaml | 2 +- config/set/php/php74.yaml | 2 +- docs/AllRectorsOverview.md | 4 ++-- .../Renaming/src}/Rector/Function_/RenameFunctionRector.php | 2 +- .../RenameFunctionRector/Fixture/double_function.php.inc | 0 .../Function_/RenameFunctionRector/Fixture/fixture.php.inc | 0 .../Function_/RenameFunctionRector/Fixture/fixture2.php.inc | 0 .../RenameFunctionRector/RenameFunctionRectorTest.php | 4 ++-- 13 files changed, 12 insertions(+), 12 deletions(-) rename {src => packages/Renaming/src}/Rector/Function_/RenameFunctionRector.php (98%) rename {tests => packages/Renaming/tests}/Rector/Function_/RenameFunctionRector/Fixture/double_function.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Function_/RenameFunctionRector/Fixture/fixture.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Function_/RenameFunctionRector/Fixture/fixture2.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Function_/RenameFunctionRector/RenameFunctionRectorTest.php (88%) diff --git a/config/set/celebrity/celebrity.yaml b/config/set/celebrity/celebrity.yaml index f75ac49fcdaa..2e57d8be8ff6 100644 --- a/config/set/celebrity/celebrity.yaml +++ b/config/set/celebrity/celebrity.yaml @@ -2,7 +2,7 @@ services: # <> → != Rector\Celebrity\Rector\NotEqual\CommonNotEqualRector: ~ - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: split: 'explode' join: 'implode' diff --git a/config/set/database-migration/mysql-to-mysqli.yaml b/config/set/database-migration/mysql-to-mysqli.yaml index 7c4e1cd2e576..4883afc3798f 100644 --- a/config/set/database-migration/mysql-to-mysqli.yaml +++ b/config/set/database-migration/mysql-to-mysqli.yaml @@ -14,7 +14,7 @@ services: mysql_query: [1, 0] mysql_fetch_row: [1, 0] - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: mysql_affected_rows: 'mysqli_affected_rows' mysql_close: 'mysqli_close' mysql_data_seek: 'mysqli_data_seek' diff --git a/config/set/php/php54.yaml b/config/set/php/php54.yaml index bd34a5875523..5e2af80fb218 100644 --- a/config/set/php/php54.yaml +++ b/config/set/php/php54.yaml @@ -1,5 +1,5 @@ services: - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: mysqli_param_count: 'mysqli_stmt_param_count' Rector\Php54\Rector\FuncCall\RemoveReferenceFromCallRector: ~ diff --git a/config/set/php/php56.yaml b/config/set/php/php56.yaml index 614e8beb42be..c285a28a13d1 100644 --- a/config/set/php/php56.yaml +++ b/config/set/php/php56.yaml @@ -1,7 +1,7 @@ services: Rector\Php56\Rector\FuncCall\PowToExpRector: ~ - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: mcrypt_generic_end: 'mcrypt_generic_deinit' set_socket_blocking: 'stream_set_blocking' ocibindbyname: 'oci_bind_by_name' diff --git a/config/set/php/php72.yaml b/config/set/php/php72.yaml index 4994686c3c5d..ae016dcbc597 100644 --- a/config/set/php/php72.yaml +++ b/config/set/php/php72.yaml @@ -8,7 +8,7 @@ services: Rector\Php72\Rector\Unset_\UnsetCastRector: ~ Rector\Php72\Rector\ConstFetch\BarewordStringRector: ~ - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: jpeg2wbmp: 'imagecreatefromjpeg' # and imagewbmp png2wbmp: 'imagecreatefrompng' # or imagewbmp # http://php.net/manual/en/migration72.deprecated.php#migration72.deprecated.gmp_random-function diff --git a/config/set/php/php73.yaml b/config/set/php/php73.yaml index b72207b5bfaa..5eeff7b7762f 100644 --- a/config/set/php/php73.yaml +++ b/config/set/php/php73.yaml @@ -6,7 +6,7 @@ services: Rector\Php73\Rector\String_\SensitiveHereNowDocRector: ~ # https://wiki.php.net/rfc/deprecations_php_7_3 - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: image2wbmp: 'imagewbmp' mbregex_encoding: 'mb_regex_encoding' mbereg: 'mb_ereg' diff --git a/config/set/php/php74.yaml b/config/set/php/php74.yaml index d97fa7548ff4..a0e63c20a97f 100644 --- a/config/set/php/php74.yaml +++ b/config/set/php/php74.yaml @@ -1,7 +1,7 @@ services: Rector\Php74\Rector\Property\TypedPropertyRector: ~ - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: # https://wiki.php.net/rfc/deprecations_php_7_4#the_real_type is_real: 'is_float' # https://wiki.php.net/rfc/deprecations_php_7_4#apache_request_headers_function diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index b1fff35220c3..bf7fe75ef508 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7328,13 +7328,13 @@ services: ### `RenameFunctionRector` -- class: `Rector\Rector\Function_\RenameFunctionRector` +- class: `Rector\Renaming\Rector\Function_\RenameFunctionRector` Turns defined function call new one. ```yaml services: - Rector\Rector\Function_\RenameFunctionRector: + Rector\Renaming\Rector\Function_\RenameFunctionRector: view: Laravel\Templating\render ``` diff --git a/src/Rector/Function_/RenameFunctionRector.php b/packages/Renaming/src/Rector/Function_/RenameFunctionRector.php similarity index 98% rename from src/Rector/Function_/RenameFunctionRector.php rename to packages/Renaming/src/Rector/Function_/RenameFunctionRector.php index b276ef1879f8..3476f2e4b9d4 100644 --- a/src/Rector/Function_/RenameFunctionRector.php +++ b/packages/Renaming/src/Rector/Function_/RenameFunctionRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 16:53:46 +0200 Subject: [PATCH 03/14] move RenameMethodCallRector to Renaming package --- docs/AllRectorsOverview.md | 4 ++-- .../src}/Rector/MethodCall/RenameMethodCallRector.php | 4 ++-- .../RenameMethodCallRector/Fixture/fixture.php.inc | 4 ++-- .../RenameMethodCallRector/Fixture/fixture2.php.inc | 4 ++-- .../RenameMethodCallRector/Fixture/fixture3.php.inc | 4 ++-- .../RenameMethodCallRector/Fixture/fixture4.php.inc | 8 ++++---- .../RenameMethodCallRector/RenameMethodCallRectorTest.php | 6 +++--- .../Source/ClassMethodToBeSkipped.php | 8 ++++++++ .../Source/ClassMethodToBeSkipped.php | 8 -------- 9 files changed, 25 insertions(+), 25 deletions(-) rename {src => packages/Renaming/src}/Rector/MethodCall/RenameMethodCallRector.php (94%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodCallRector/Fixture/fixture.php.inc (69%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodCallRector/Fixture/fixture2.php.inc (65%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodCallRector/Fixture/fixture3.php.inc (67%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodCallRector/Fixture/fixture4.php.inc (53%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodCallRector/RenameMethodCallRectorTest.php (85%) create mode 100644 packages/Renaming/tests/Rector/MethodCall/RenameMethodCallRector/Source/ClassMethodToBeSkipped.php delete mode 100644 tests/Rector/MethodCall/RenameMethodCallRector/Source/ClassMethodToBeSkipped.php diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index bf7fe75ef508..27396d153f5e 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7349,13 +7349,13 @@ services: ### `RenameMethodCallRector` -- class: `Rector\Rector\MethodCall\RenameMethodCallRector` +- class: `Rector\Renaming\Rector\MethodCall\RenameMethodCallRector` Turns method call names to new ones. ```yaml services: - Rector\Rector\MethodCall\RenameMethodCallRector: + Rector\Renaming\Rector\MethodCall\RenameMethodCallRector: SomeExampleClass: oldMethod: newMethod ``` diff --git a/src/Rector/MethodCall/RenameMethodCallRector.php b/packages/Renaming/src/Rector/MethodCall/RenameMethodCallRector.php similarity index 94% rename from src/Rector/MethodCall/RenameMethodCallRector.php rename to packages/Renaming/src/Rector/MethodCall/RenameMethodCallRector.php index 2ef5659f806c..c1540bf2b788 100644 --- a/src/Rector/MethodCall/RenameMethodCallRector.php +++ b/packages/Renaming/src/Rector/MethodCall/RenameMethodCallRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 16:58:54 +0200 Subject: [PATCH 04/14] move RenameAnnotationRector to Renaming package --- docs/AllRectorsOverview.md | 4 ++-- .../src}/Rector/Annotation/RenameAnnotationRector.php | 2 +- .../Annotation/RenameAnnotationRector/Fixture/fixture.php.inc | 4 ++-- .../RenameAnnotationRector/RenameAnnotationRectorTest.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename {src => packages/Renaming/src}/Rector/Annotation/RenameAnnotationRector.php (98%) rename {tests => packages/Renaming/tests}/Rector/Annotation/RenameAnnotationRector/Fixture/fixture.php.inc (63%) rename {tests => packages/Renaming/tests}/Rector/Annotation/RenameAnnotationRector/RenameAnnotationRectorTest.php (86%) diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 27396d153f5e..b8bcf612d5ee 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7214,13 +7214,13 @@ Remove specific traits from code ### `RenameAnnotationRector` -- class: `Rector\Rector\Annotation\RenameAnnotationRector` +- class: `Rector\Renaming\Rector\Annotation\RenameAnnotationRector` Turns defined annotations above properties and methods to their new values. ```yaml services: - Rector\Rector\Annotation\RenameAnnotationRector: + Rector\Renaming\Rector\Annotation\RenameAnnotationRector: $classToAnnotationMap: PHPUnit\Framework\TestCase: test: scenario diff --git a/src/Rector/Annotation/RenameAnnotationRector.php b/packages/Renaming/src/Rector/Annotation/RenameAnnotationRector.php similarity index 98% rename from src/Rector/Annotation/RenameAnnotationRector.php rename to packages/Renaming/src/Rector/Annotation/RenameAnnotationRector.php index c74bbcb5c42e..2658b872376b 100644 --- a/src/Rector/Annotation/RenameAnnotationRector.php +++ b/packages/Renaming/src/Rector/Annotation/RenameAnnotationRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 17:03:23 +0200 Subject: [PATCH 05/14] move RenameMethodRector to Renaming package --- docs/AllRectorsOverview.md | 4 ++-- docs/HowItWorks.md | 2 +- .../src}/Rector/MethodCall/RenameMethodRector.php | 4 ++-- .../RenameMethodRector/Fixture/SomeClass.php | 4 ++-- .../RenameMethodRector/Fixture/fixture.php.inc | 8 ++++++-- .../RenameMethodRector/Fixture/fixture2.php.inc | 4 ++++ .../RenameMethodRector/Fixture/fixture3.php.inc | 4 ++-- .../RenameMethodRector/Fixture/fixture4.php.inc | 4 ++-- .../RenameMethodRector/Fixture/fixture5.php.inc | 12 ++++++------ .../RenameMethodRector/Fixture/fixture6.php.inc | 12 ++++++------ .../Fixture/nette_to_symfony_presenter.php.inc | 4 ++-- .../Fixture/under_anonymous_class.php.inc | 2 +- .../RenameMethodRector/RenameMethodRectorTest.php | 8 ++++---- .../RenameMethodRector/Source/AbstractType.php | 8 ++++++++ .../RenameMethodRector/Source/FormMacros.php | 8 ++++++++ .../RenameMethodRector/Source/Something.php | 8 ++++++++ .../RenameMethodRector/Source/AbstractType.php | 8 -------- .../RenameMethodRector/Source/FormMacros.php | 8 -------- .../RenameMethodRector/Source/Something.php | 8 -------- 19 files changed, 64 insertions(+), 56 deletions(-) rename {src => packages/Refactoring/src}/Rector/MethodCall/RenameMethodRector.php (95%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/SomeClass.php (73%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/fixture.php.inc (66%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/fixture2.php.inc (69%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/fixture3.php.inc (67%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/fixture4.php.inc (68%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/fixture5.php.inc (51%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/fixture6.php.inc (51%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/nette_to_symfony_presenter.php.inc (50%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/Fixture/under_anonymous_class.php.inc (85%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameMethodRector/RenameMethodRectorTest.php (87%) create mode 100644 packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/Source/AbstractType.php create mode 100644 packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/Source/FormMacros.php create mode 100644 packages/Renaming/tests/Rector/MethodCall/RenameMethodRector/Source/Something.php delete mode 100644 tests/Rector/MethodCall/RenameMethodRector/Source/AbstractType.php delete mode 100644 tests/Rector/MethodCall/RenameMethodRector/Source/FormMacros.php delete mode 100644 tests/Rector/MethodCall/RenameMethodRector/Source/Something.php diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index b8bcf612d5ee..343ae5624caa 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7372,13 +7372,13 @@ services: ### `RenameMethodRector` -- class: `Rector\Rector\MethodCall\RenameMethodRector` +- class: `Rector\Refactoring\Rector\MethodCall\RenameMethodRector` Turns method names to new ones. ```yaml services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Refactoring\Rector\MethodCall\RenameMethodRector: SomeExampleClass: oldMethod: newMethod ``` diff --git a/docs/HowItWorks.md b/docs/HowItWorks.md index 40adfc4d127a..a80d238e235a 100644 --- a/docs/HowItWorks.md +++ b/docs/HowItWorks.md @@ -63,7 +63,7 @@ E.g. in this case, first will be changed `@expectedException` annotation to meth services: Rector\PHPUnit\Rector\ExceptionAnnotationRector: ~ - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Refactoring\Rector\MethodCall\RenameMethodRector: $perClassOldToNewMethods: 'PHPUnit\Framework\TestClass': 'setExpectedException': 'expectedException' diff --git a/src/Rector/MethodCall/RenameMethodRector.php b/packages/Refactoring/src/Rector/MethodCall/RenameMethodRector.php similarity index 95% rename from src/Rector/MethodCall/RenameMethodRector.php rename to packages/Refactoring/src/Rector/MethodCall/RenameMethodRector.php index e6d14053a919..840fa42a0037 100644 --- a/src/Rector/MethodCall/RenameMethodRector.php +++ b/packages/Refactoring/src/Rector/MethodCall/RenameMethodRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 17:09:26 +0200 Subject: [PATCH 06/14] update configs --- config/set/cakephp/cakephp34.yaml | 2 +- config/set/cakephp/cakephp35.yaml | 2 +- config/set/cakephp/cakephp36.yaml | 2 +- config/set/cakephp/cakephp37.yaml | 2 +- config/set/cakephp/cakephp38.yaml | 2 +- config/set/cakephp/cakephp40.yaml | 2 +- config/set/framework-migration/nette-to-symfony.yaml | 2 +- .../nette-to-symfony/kdyby-to-symfony.yaml | 2 +- config/set/guzzle/guzzle50.yaml | 3 ++- config/set/laravel/laravel50.yaml | 2 +- config/set/laravel/laravel54.yaml | 2 +- config/set/laravel/laravel55.yaml | 2 +- config/set/laravel/laravel56.yaml | 2 +- config/set/phpspec/phpspec30.yaml | 2 +- config/set/phpunit/phpunit-exception.yaml | 2 +- config/set/phpunit/phpunit70.yaml | 2 +- config/set/shopware/shopware56.yaml | 4 +++- config/set/sylius/sylius10.yaml | 2 +- config/set/symfony/symfony30.yaml | 2 +- config/set/symfony/symfony33.yaml | 2 +- config/set/symfony/symfony41.yaml | 2 +- config/set/symfony/symfony42.yaml | 2 +- config/set/symfony/symfony43.yaml | 2 +- config/set/twig/twig127.yaml | 2 +- docs/AllRectorsOverview.md | 4 ++-- docs/HowItWorks.md | 2 +- .../src/Rector/MethodCall/RenameMethodRector.php | 2 +- .../MethodCall/RenameMethodRector/RenameMethodRectorTest.php | 2 +- 28 files changed, 32 insertions(+), 29 deletions(-) rename packages/{Refactoring => Renaming}/src/Rector/MethodCall/RenameMethodRector.php (98%) diff --git a/config/set/cakephp/cakephp34.yaml b/config/set/cakephp/cakephp34.yaml index d4e4ec095a57..c9cdf3db8dee 100644 --- a/config/set/cakephp/cakephp34.yaml +++ b/config/set/cakephp/cakephp34.yaml @@ -186,7 +186,7 @@ services: set: 'enableAutoLayout' get: 'isAutoLayoutEnabled' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Cake\Network\Request: param: 'getParam' data: 'getData' diff --git a/config/set/cakephp/cakephp35.yaml b/config/set/cakephp/cakephp35.yaml index 26a7ff9bc07d..403bfb332489 100644 --- a/config/set/cakephp/cakephp35.yaml +++ b/config/set/cakephp/cakephp35.yaml @@ -5,7 +5,7 @@ services: Cake\Http\Client\CookieCollection: 'Cake\Http\Cookie\CookieCollection' Cake\Console\ShellDispatcher: 'Cake\Console\CommandRunner' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Cake\Database\Schema\TableSchema: column: 'getColumn' constraint: 'getConstraint' diff --git a/config/set/cakephp/cakephp36.yaml b/config/set/cakephp/cakephp36.yaml index e06ff167b6d6..e3ea170f78ed 100644 --- a/config/set/cakephp/cakephp36.yaml +++ b/config/set/cakephp/cakephp36.yaml @@ -1,7 +1,7 @@ # source: https://book.cakephp.org/3.0/en/appendices/3-6-migration-guide.html services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: 'Cake\ORM\Table': 'association': 'getAssociation' 'Cake\Validation\ValidationSet': diff --git a/config/set/cakephp/cakephp37.yaml b/config/set/cakephp/cakephp37.yaml index e58bb4776b28..11dfcaf1580a 100644 --- a/config/set/cakephp/cakephp37.yaml +++ b/config/set/cakephp/cakephp37.yaml @@ -1,7 +1,7 @@ # source: https://book.cakephp.org/3.0/en/appendices/3-7-migration-guide.html services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Cake\Form\Form: 'errors': 'getErrors' Cake\Validation\Validation: diff --git a/config/set/cakephp/cakephp38.yaml b/config/set/cakephp/cakephp38.yaml index 2110beff541a..7da80f4ee0fc 100644 --- a/config/set/cakephp/cakephp38.yaml +++ b/config/set/cakephp/cakephp38.yaml @@ -1,6 +1,6 @@ # source: https://book.cakephp.org/3.0/en/appendices/3-8-migration-guide.html services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Cake\ORM\Entity: 'visibleProperties': 'getVisible' diff --git a/config/set/cakephp/cakephp40.yaml b/config/set/cakephp/cakephp40.yaml index 8c923c61b1d8..77b9a554d632 100644 --- a/config/set/cakephp/cakephp40.yaml +++ b/config/set/cakephp/cakephp40.yaml @@ -14,7 +14,7 @@ services: MESSAGE_BOTH: 'Cake\Mailer\Message::MESSAGE_BOTH' EMAIL_PATTERN: 'Cake\Mailer\Message::EMAIL_PATTERN' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Cake\Form\Form: errors: 'getErrors' Cake\Mailer\Email: diff --git a/config/set/framework-migration/nette-to-symfony.yaml b/config/set/framework-migration/nette-to-symfony.yaml index 87dff6aeb245..ab1a93d48260 100644 --- a/config/set/framework-migration/nette-to-symfony.yaml +++ b/config/set/framework-migration/nette-to-symfony.yaml @@ -23,7 +23,7 @@ services: # Nette\Application\IResponse-> Symfony\Component\HttpFoundation\Response Nette\Application\IResponse: Symfony\Component\HttpFoundation\Response - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: # IPresenter::run() -> IPresenter->__invoke Nette\Application\IPresenter: run: __invoke 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 9894f9d4ce5b..ab3b385c0789 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 @@ -3,7 +3,7 @@ services: Kdyby\Events\Subscriber: getSubscribedEvents: 'static' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: # Kdyby → Symfony Kdyby\Translation\Translator: translate: 'trans' diff --git a/config/set/guzzle/guzzle50.yaml b/config/set/guzzle/guzzle50.yaml index a45a31fee94c..99a390023e4e 100644 --- a/config/set/guzzle/guzzle50.yaml +++ b/config/set/guzzle/guzzle50.yaml @@ -22,6 +22,7 @@ services: batch: 'GuzzleHttp\Pool\batch' Rector\Guzzle\Rector\MethodCall\MessageAsArrayRector: ~ - Rector\Rector\MethodCall\RenameMethodRector: + + Rector\Renaming\Rector\MethodCall\RenameMethodRector: GuzzleHttp\Message\MessageInterface: getHeaderLines: 'getHeaderAsArray' diff --git a/config/set/laravel/laravel50.yaml b/config/set/laravel/laravel50.yaml index 48110292a702..ef424f818865 100644 --- a/config/set/laravel/laravel50.yaml +++ b/config/set/laravel/laravel50.yaml @@ -5,7 +5,7 @@ services: # https://stackoverflow.com/a/24949656/1348344 Illuminate\Database\Eloquent\SoftDeletingTrait: 'Illuminate\Database\Eloquent\SoftDeletes' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Illuminate\Contracts\Pagination\Paginator: links: 'render' getFrom: 'firstItem' diff --git a/config/set/laravel/laravel54.yaml b/config/set/laravel/laravel54.yaml index 9209e7f9c945..4c6218ce9e7c 100644 --- a/config/set/laravel/laravel54.yaml +++ b/config/set/laravel/laravel54.yaml @@ -12,7 +12,7 @@ services: Illuminate\Foundation\Http\Middleware\VerifyPostSize: 'Illuminate\Foundation\Http\Middleware\ValidatePostSize' Symfony\Component\HttpFoundation\Session\SessionInterface: 'Illuminate\Contracts\Session\Session' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Illuminate\Support\Collection: every: 'nth' Illuminate\Database\Eloquent\Relations\BelongsToMany: diff --git a/config/set/laravel/laravel55.yaml b/config/set/laravel/laravel55.yaml index d308462543ad..9c28f15ea7a5 100644 --- a/config/set/laravel/laravel55.yaml +++ b/config/set/laravel/laravel55.yaml @@ -1,6 +1,6 @@ # see: https://laravel.com/docs/5.5/upgrade services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Illuminate\Console\Command: fire: 'handle' diff --git a/config/set/laravel/laravel56.yaml b/config/set/laravel/laravel56.yaml index 00a8d58c7dcc..8e7af839296f 100644 --- a/config/set/laravel/laravel56.yaml +++ b/config/set/laravel/laravel56.yaml @@ -1,6 +1,6 @@ # see: https://laravel.com/docs/5.6/upgrade services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Illuminate\Validation\ValidatesWhenResolvedTrait: validate: 'validateResolved' Illuminate\Contracts\Validation\ValidatesWhenResolved: diff --git a/config/set/phpspec/phpspec30.yaml b/config/set/phpspec/phpspec30.yaml index 36995cbd66d9..4c1dda9d93e0 100644 --- a/config/set/phpspec/phpspec30.yaml +++ b/config/set/phpspec/phpspec30.yaml @@ -1,6 +1,6 @@ # @see http://www.phpspec.net/en/stable/manual/upgrading-to-phpspec-3.html services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: PhpSpec\ServiceContainer: set: 'define' setShared: 'define' diff --git a/config/set/phpunit/phpunit-exception.yaml b/config/set/phpunit/phpunit-exception.yaml index b857378606f7..ad8296c556b0 100644 --- a/config/set/phpunit/phpunit-exception.yaml +++ b/config/set/phpunit/phpunit-exception.yaml @@ -5,7 +5,7 @@ services: # @expectedException → $this->expectException() Rector\PHPUnit\Rector\ExceptionAnnotationRector: ~ - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: PHPUnit\Framework\TestClass: setExpectedException: 'expectedException' setExpectedExceptionRegExp: 'expectedException' diff --git a/config/set/phpunit/phpunit70.yaml b/config/set/phpunit/phpunit70.yaml index 8ea9231d3055..9602144a2074 100644 --- a/config/set/phpunit/phpunit70.yaml +++ b/config/set/phpunit/phpunit70.yaml @@ -2,6 +2,6 @@ imports: - { resource: 'phpunit-exception.yaml' } services: - Rector\Rector\Annotation\RenameAnnotationRector: + Rector\Renaming\Rector\Annotation\RenameAnnotationRector: PHPUnit\Framework\TestCase: scenario: 'test' diff --git a/config/set/shopware/shopware56.yaml b/config/set/shopware/shopware56.yaml index 3e9955594157..c55cbf1d4c11 100644 --- a/config/set/shopware/shopware56.yaml +++ b/config/set/shopware/shopware56.yaml @@ -5,11 +5,13 @@ imports: services: Rector\Shopware\Rector\MethodCall\ReplaceEnlightResponseWithSymfonyResponseRector: ~ - Rector\Rector\MethodCall\RenameMethodCallRector: + + Rector\Renaming\Rector\MethodCall\RenameMethodCallRector: Enlight_Controller_Response_Response: getHttpResponseCode: getStatusCode setHttpResponseCode: setStatusCode sendCookies: sendHeaders setBody: setContent + Rector\Shopware\Rector\ClassConstFetch\ShopwareVersionConstsRector: ~ Rector\Shopware\Rector\MethodCall\ShopRegistrationServiceRector: ~ diff --git a/config/set/sylius/sylius10.yaml b/config/set/sylius/sylius10.yaml index 4eef7c3cbabf..175a17003627 100644 --- a/config/set/sylius/sylius10.yaml +++ b/config/set/sylius/sylius10.yaml @@ -3,7 +3,7 @@ services: Rector\Sylius\Rector\Review\ReplaceCreateMethodWithoutReviewerRector: ~ - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: 'Sylius\Component\Core\Repository\OrderRepositoryInterface': 'count': 'countPlacedOrders' 'countByChannel': 'countFulfilledByChannel' diff --git a/config/set/symfony/symfony30.yaml b/config/set/symfony/symfony30.yaml index 35d48e624dd9..577210b0c872 100644 --- a/config/set/symfony/symfony30.yaml +++ b/config/set/symfony/symfony30.yaml @@ -21,7 +21,7 @@ services: 'ROUND_HALFUP': 'ROUND_HALF_UP' 'ROUND_HALFDOWN': 'ROUND_HALF_DOWN' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: # class loader 'Symfony\Component\ClassLoader\UniversalClassLoader\UniversalClassLoader': 'registerNamespaces': 'addPrefixes' diff --git a/config/set/symfony/symfony33.yaml b/config/set/symfony/symfony33.yaml index e36c750f33be..8a7c65073fcd 100644 --- a/config/set/symfony/symfony33.yaml +++ b/config/set/symfony/symfony33.yaml @@ -38,7 +38,7 @@ services: 'Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass': 'Symfony\Component\Config\DependencyInjection\ConfigCachePass' 'Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PropertyInfoPass': 'Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass' - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: # dependency-injection Symfony\Component\DependencyInjection\Container: isFrozen: 'isCompiled' diff --git a/config/set/symfony/symfony41.yaml b/config/set/symfony/symfony41.yaml index a095a41ae0ad..9eb3adcf279c 100644 --- a/config/set/symfony/symfony41.yaml +++ b/config/set/symfony/symfony41.yaml @@ -1,6 +1,6 @@ services: # https://github.com/symfony/symfony/blob/master/UPGRADE-4.1.md - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: # https://github.com/symfony/symfony/commit/463f986c28a497571967e37c1314e9911f1ef6ba Symfony\Component\Console\Helper\TableStyle: setHorizontalBorderChar: 'setHorizontalBorderChars' diff --git a/config/set/symfony/symfony42.yaml b/config/set/symfony/symfony42.yaml index 067b0bd032c8..68b0f4b418d5 100644 --- a/config/set/symfony/symfony42.yaml +++ b/config/set/symfony/symfony42.yaml @@ -77,7 +77,7 @@ services: default_value: [] scope: ['method_call'] - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Symfony\Component\Cache\CacheItem: getPreviousTags: 'getMetadata' Symfony\Component\Form\AbstractTypeExtension: diff --git a/config/set/symfony/symfony43.yaml b/config/set/symfony/symfony43.yaml index e118f9c47bb5..371066d06035 100644 --- a/config/set/symfony/symfony43.yaml +++ b/config/set/symfony/symfony43.yaml @@ -4,7 +4,7 @@ services: # https://symfony.com/blog/new-in-symfony-4-3-better-test-assertions Rector\Symfony\Rector\MethodCall\SimplifyWebTestCaseAssertionsRector: ~ - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: Symfony\Component\BrowserKit\Response: getStatus: 'getStatusCode' Symfony\Component\Security\Http\Firewall: diff --git a/config/set/twig/twig127.yaml b/config/set/twig/twig127.yaml index 1fcb62d95047..beb5550aaa14 100644 --- a/config/set/twig/twig127.yaml +++ b/config/set/twig/twig127.yaml @@ -1,5 +1,5 @@ services: - Rector\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: 'Twig_Node': 'getLine': 'getTemplateLine' 'getFilename': 'getTemplateName' diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 343ae5624caa..ab73b5f59ab9 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7372,13 +7372,13 @@ services: ### `RenameMethodRector` -- class: `Rector\Refactoring\Rector\MethodCall\RenameMethodRector` +- class: `Rector\Renaming\Rector\MethodCall\RenameMethodRector` Turns method names to new ones. ```yaml services: - Rector\Refactoring\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: SomeExampleClass: oldMethod: newMethod ``` diff --git a/docs/HowItWorks.md b/docs/HowItWorks.md index a80d238e235a..2f7010b59c7a 100644 --- a/docs/HowItWorks.md +++ b/docs/HowItWorks.md @@ -63,7 +63,7 @@ E.g. in this case, first will be changed `@expectedException` annotation to meth services: Rector\PHPUnit\Rector\ExceptionAnnotationRector: ~ - Rector\Refactoring\Rector\MethodCall\RenameMethodRector: + Rector\Renaming\Rector\MethodCall\RenameMethodRector: $perClassOldToNewMethods: 'PHPUnit\Framework\TestClass': 'setExpectedException': 'expectedException' diff --git a/packages/Refactoring/src/Rector/MethodCall/RenameMethodRector.php b/packages/Renaming/src/Rector/MethodCall/RenameMethodRector.php similarity index 98% rename from packages/Refactoring/src/Rector/MethodCall/RenameMethodRector.php rename to packages/Renaming/src/Rector/MethodCall/RenameMethodRector.php index 840fa42a0037..492ceaa1bc3d 100644 --- a/packages/Refactoring/src/Rector/MethodCall/RenameMethodRector.php +++ b/packages/Renaming/src/Rector/MethodCall/RenameMethodRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 17:14:48 +0200 Subject: [PATCH 07/14] move RenameClassConstantRector to Renaming package --- config/set/cakephp/cakephp40.yaml | 2 +- .../framework-migration/nette-to-symfony.yaml | 2 +- config/set/symfony/symfony30.yaml | 2 +- docs/AllRectorsOverview.md | 4 +- .../Constant/RenameClassConstantRector.php | 4 +- .../Fixture/fixture.php.inc | 39 +++++++++++++++++++ .../RenameClassConstantRectorTest.php | 8 ++-- .../Source/DifferentClass.php | 2 +- .../Source/LocalFormEvents.php | 8 ++++ .../Fixture/fixture.php.inc | 39 ------------------- .../Source/LocalFormEvents.php | 8 ---- 11 files changed, 59 insertions(+), 59 deletions(-) rename {src => packages/Renaming/src}/Rector/Constant/RenameClassConstantRector.php (94%) create mode 100644 packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/Fixture/fixture.php.inc rename {tests => packages/Renaming/tests}/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php (76%) rename {tests => packages/Renaming/tests}/Rector/Constant/RenameClassConstantRector/Source/DifferentClass.php (55%) create mode 100644 packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/Source/LocalFormEvents.php delete mode 100644 tests/Rector/Constant/RenameClassConstantRector/Fixture/fixture.php.inc delete mode 100644 tests/Rector/Constant/RenameClassConstantRector/Source/LocalFormEvents.php diff --git a/config/set/cakephp/cakephp40.yaml b/config/set/cakephp/cakephp40.yaml index 77b9a554d632..988a58c149d7 100644 --- a/config/set/cakephp/cakephp40.yaml +++ b/config/set/cakephp/cakephp40.yaml @@ -4,7 +4,7 @@ services: Rector\Rector\Class_\RenameClassRector: Cake\Database\Type: 'Cake\Database\TypeFactory' - Rector\Rector\Constant\RenameClassConstantRector: + Rector\Renaming\Rector\Constant\RenameClassConstantRector: Cake\View\View: NAME_ELEMENT: TYPE_ELEMENT NAME_LAYOUT: TYPE_LAYOUT diff --git a/config/set/framework-migration/nette-to-symfony.yaml b/config/set/framework-migration/nette-to-symfony.yaml index ab1a93d48260..e027c522946b 100644 --- a/config/set/framework-migration/nette-to-symfony.yaml +++ b/config/set/framework-migration/nette-to-symfony.yaml @@ -41,7 +41,7 @@ services: # Removes "implements IPresenter" - Nette\Application\IPresenter - Rector\Rector\Constant\RenameClassConstantRector: + Rector\Renaming\Rector\Constant\RenameClassConstantRector: Nette\Http\*Response: S100_CONTINUE: Symfony\Component\HttpFoundation\Response::HTTP_CONTINUE S101_SWITCHING_PROTOCOLS: Symfony\Component\HttpFoundation\Response::HTTP_SWITCHING_PROTOCOLS diff --git a/config/set/symfony/symfony30.yaml b/config/set/symfony/symfony30.yaml index 577210b0c872..e70753f1d2c9 100644 --- a/config/set/symfony/symfony30.yaml +++ b/config/set/symfony/symfony30.yaml @@ -10,7 +10,7 @@ services: Rector\Symfony\Rector\MethodCall\CascadeValidationFormBuilderRector: ~ # general - Rector\Rector\Constant\RenameClassConstantRector: + Rector\Renaming\Rector\Constant\RenameClassConstantRector: # form 'Symfony\Component\Form\FormEvents': 'PRE_BIND': 'PRE_SUBMIT' diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index ab73b5f59ab9..de3e2a34bd9f 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7246,13 +7246,13 @@ services: ### `RenameClassConstantRector` -- class: `Rector\Rector\Constant\RenameClassConstantRector` +- class: `Rector\Renaming\Rector\Constant\RenameClassConstantRector` Replaces defined class constants in their calls. ```yaml services: - Rector\Rector\Constant\RenameClassConstantRector: + Rector\Renaming\Rector\Constant\RenameClassConstantRector: SomeClass: OLD_CONSTANT: NEW_CONSTANT OTHER_OLD_CONSTANT: 'DifferentClass::NEW_CONSTANT' diff --git a/src/Rector/Constant/RenameClassConstantRector.php b/packages/Renaming/src/Rector/Constant/RenameClassConstantRector.php similarity index 94% rename from src/Rector/Constant/RenameClassConstantRector.php rename to packages/Renaming/src/Rector/Constant/RenameClassConstantRector.php index ea8056b4c552..185834af5238 100644 --- a/src/Rector/Constant/RenameClassConstantRector.php +++ b/packages/Renaming/src/Rector/Constant/RenameClassConstantRector.php @@ -1,6 +1,6 @@ +----- + diff --git a/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php b/packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php similarity index 76% rename from tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php rename to packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php index a28b33ba9a6e..9a02d2661528 100644 --- a/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php +++ b/packages/Renaming/tests/Rector/Constant/RenameClassConstantRector/RenameClassConstantRectorTest.php @@ -1,11 +1,11 @@ ------ - diff --git a/tests/Rector/Constant/RenameClassConstantRector/Source/LocalFormEvents.php b/tests/Rector/Constant/RenameClassConstantRector/Source/LocalFormEvents.php deleted file mode 100644 index 47ceb662016c..000000000000 --- a/tests/Rector/Constant/RenameClassConstantRector/Source/LocalFormEvents.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Mon, 23 Sep 2019 17:21:55 +0200 Subject: [PATCH 08/14] 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 30d8b655cb7f..b293155322d3 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 c9cdf3db8dee..86dbcfce10b9 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 403bfb332489..e1b20a5b6c0b 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 e3ea170f78ed..b86924c19471 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 988a58c149d7..f056c1a04c5f 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 fe3af1c8c5f1..344705ea7c3b 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 59cbb7443ec5..c494ac1b8b77 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 e027c522946b..295b5a9aa91f 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 eb09da37a2d7..04098d51dc0f 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 ab3b385c0789..f479fb8349ad 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 ef424f818865..48e0d1a2885e 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 da7f6c08199d..c1e1350172e6 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 be5b1aa04ff1..8eab454deded 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 4c6218ce9e7c..12f8749b0274 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 9c28f15ea7a5..acd9fd551043 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 5ad5930fac72..fe9db2b4c599 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 4c1dda9d93e0..d0621f899592 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 9c19580937a1..a3682aee3802 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 175a17003627..5ab6ee271c1d 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 e70753f1d2c9..3542474b5e90 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 8a7c65073fcd..1439a5673c3f 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 dcc9257464b0..da4ca0c1b37f 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 9eb3adcf279c..df4f601637e1 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 68b0f4b418d5..83dbc501e0fb 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 371066d06035..b06a8b9c3fb3 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 a167043e22c3..a209604d1491 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 71e731a96fcf..3118745be0c8 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 6da946a31709..c8490d55a5fe 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 de3e2a34bd9f..ab101a417613 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 87fae92ca732..f7d74702ccc1 100644 --- a/packages/PSR4/src/Extension/RenamedClassesReportExtension.php +++ b/packages/PSR4/src/Extension/RenamedClassesReportExtension.php @@ -12,7 +12,7 @@ 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 a66a64725627..85c9efe9a8ca 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 000000000000..462b7b6e352c --- /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 5d43bf21de1f..3b2996e883bd 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 5e739ff8c0a0..095c1101c3d3 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 bbd6a86484f1..7e63092d9ac2 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 889580d739e5..e658b23825f9 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 c7b0aa1af122..000000000000 --- 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 ce5b5907bf08..000000000000 --- 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 977d40777727..000000000000 --- 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 0909b1a47e14..000000000000 --- 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 780a7e5a8e27..000000000000 --- a/tests/Rector/Class_/RenameClassRector/Source/NewClass.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Mon, 23 Sep 2019 17:35:23 +0200 Subject: [PATCH 09/14] move RenameStaticMethodRector to Renaming package --- config/set/cakephp/cakephp40.yaml | 2 +- docs/AllRectorsOverview.md | 6 +++--- .../src}/Rector/MethodCall/RenameStaticMethodRector.php | 4 ++-- .../RenameStaticMethodRector/Fixture/fixture.php.inc | 0 .../RenameStaticMethodRector/Fixture/fixture2.php.inc | 4 ++-- .../RenameStaticMethodRectorTest.php | 6 +++--- .../RenameStaticMethodRector/Source/FormMacros.php | 8 ++++++++ .../RenameStaticMethodRector/Source/FormMacros.php | 8 -------- 8 files changed, 19 insertions(+), 19 deletions(-) rename {src => packages/Renaming/src}/Rector/MethodCall/RenameStaticMethodRector.php (94%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameStaticMethodRector/Fixture/fixture.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameStaticMethodRector/Fixture/fixture2.php.inc (67%) rename {tests => packages/Renaming/tests}/Rector/MethodCall/RenameStaticMethodRector/RenameStaticMethodRectorTest.php (82%) create mode 100644 packages/Renaming/tests/Rector/MethodCall/RenameStaticMethodRector/Source/FormMacros.php delete mode 100644 tests/Rector/MethodCall/RenameStaticMethodRector/Source/FormMacros.php diff --git a/config/set/cakephp/cakephp40.yaml b/config/set/cakephp/cakephp40.yaml index f056c1a04c5f..b4f05a86363b 100644 --- a/config/set/cakephp/cakephp40.yaml +++ b/config/set/cakephp/cakephp40.yaml @@ -28,7 +28,7 @@ services: Cake\Validation\Validator: containsNonAlphaNumeric: notAlphaNumeric - Rector\Rector\MethodCall\RenameStaticMethodRector: + Rector\Renaming\Rector\MethodCall\RenameStaticMethodRector: $oldToNewMethodByClasses: Router: pushRequest: setRequest diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index ab101a417613..ea4e4c1c9323 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7440,13 +7440,13 @@ services: ### `RenameStaticMethodRector` -- class: `Rector\Rector\MethodCall\RenameStaticMethodRector` +- class: `Rector\Renaming\Rector\MethodCall\RenameStaticMethodRector` Turns method names to new ones. ```yaml services: - Rector\Rector\MethodCall\RenameStaticMethodRector: + Rector\Renaming\Rector\MethodCall\RenameStaticMethodRector: SomeClass: oldMethod: - AnotherExampleClass @@ -7462,7 +7462,7 @@ services: ```yaml services: - Rector\Rector\MethodCall\RenameStaticMethodRector: + Rector\Renaming\Rector\MethodCall\RenameStaticMethodRector: $oldToNewMethodByClasses: SomeClass: oldMethod: newStaticMethod diff --git a/src/Rector/MethodCall/RenameStaticMethodRector.php b/packages/Renaming/src/Rector/MethodCall/RenameStaticMethodRector.php similarity index 94% rename from src/Rector/MethodCall/RenameStaticMethodRector.php rename to packages/Renaming/src/Rector/MethodCall/RenameStaticMethodRector.php index 26df620d2875..89f703b1f94d 100644 --- a/src/Rector/MethodCall/RenameStaticMethodRector.php +++ b/packages/Renaming/src/Rector/MethodCall/RenameStaticMethodRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 17:40:14 +0200 Subject: [PATCH 10/14] move RenameNamespaceRector to Renaming package --- docs/AllRectorsOverview.md | 4 +- .../Namespace_/RenameNamespaceRector.php | 4 +- .../Fixture/fixture.php.inc | 0 .../Fixture/fixture2.php.inc | 0 .../Fixture/fixture3.php.inc | 0 .../Fixture/fixture4.php.inc | 0 .../Fixture/fixture5.php.inc | 0 .../RenameNamespaceRectorTest.php | 4 +- rector.yaml | 67 ------------------- 9 files changed, 6 insertions(+), 73 deletions(-) rename {src => packages/Renaming/src}/Rector/Namespace_/RenameNamespaceRector.php (96%) rename {tests => packages/Renaming/tests}/Rector/Namespace_/RenameNamespaceRector/Fixture/fixture.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Namespace_/RenameNamespaceRector/Fixture/fixture2.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Namespace_/RenameNamespaceRector/Fixture/fixture3.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Namespace_/RenameNamespaceRector/Fixture/fixture4.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Namespace_/RenameNamespaceRector/Fixture/fixture5.php.inc (100%) rename {tests => packages/Renaming/tests}/Rector/Namespace_/RenameNamespaceRector/RenameNamespaceRectorTest.php (90%) diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index ea4e4c1c9323..852b6d82bfcb 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -7395,13 +7395,13 @@ services: ### `RenameNamespaceRector` -- class: `Rector\Rector\Namespace_\RenameNamespaceRector` +- class: `Rector\Renaming\Rector\Namespace_\RenameNamespaceRector` Replaces old namespace by new one. ```yaml services: - Rector\Rector\Namespace_\RenameNamespaceRector: + Rector\Renaming\Rector\Namespace_\RenameNamespaceRector: $oldToNewNamespaces: SomeOldNamespace: SomeNewNamespace ``` diff --git a/src/Rector/Namespace_/RenameNamespaceRector.php b/packages/Renaming/src/Rector/Namespace_/RenameNamespaceRector.php similarity index 96% rename from src/Rector/Namespace_/RenameNamespaceRector.php rename to packages/Renaming/src/Rector/Namespace_/RenameNamespaceRector.php index ead64fd587c0..98bd5759b375 100644 --- a/src/Rector/Namespace_/RenameNamespaceRector.php +++ b/packages/Renaming/src/Rector/Namespace_/RenameNamespaceRector.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 17:58:49 +0200 Subject: [PATCH 11/14] move PregReplaceEModifierRector to Php55 --- docs/AllRectorsOverview.md | 2 +- packages/Php/src/Rector/Name/ReservedObjectRector.php | 10 ++++++++-- .../src/Rector/FuncCall/PregReplaceEModifierRector.php | 6 ++++-- .../Fixture/call_function.php.inc | 4 ++-- .../PregReplaceEModifierRector/Fixture/fixture.php.inc | 4 ++-- .../PregReplaceEModifierRector/Fixture/slashes.php.inc | 4 ++-- .../PregReplaceEModifierRectorTest.php | 4 ++-- packages/Php70/config/config.yaml | 2 +- packages/Php70/src/EregToPcreTransformer.php | 2 +- .../Php70}/Exception/InvalidEregException.php | 2 +- 10 files changed, 24 insertions(+), 16 deletions(-) rename packages/{Php => Php55}/src/Rector/FuncCall/PregReplaceEModifierRector.php (94%) rename packages/{Php => Php55}/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/call_function.php.inc (80%) rename packages/{Php => Php55}/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/fixture.php.inc (70%) rename packages/{Php => Php55}/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc (70%) rename packages/{Php => Php55}/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php (82%) rename {packages/Php/src => src/Php70}/Exception/InvalidEregException.php (75%) diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 852b6d82bfcb..1ef85835fba5 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -4269,7 +4269,7 @@ services: ### `PregReplaceEModifierRector` -- class: `Rector\Php\Rector\FuncCall\PregReplaceEModifierRector` +- class: `Rector\Php55\Rector\FuncCall\PregReplaceEModifierRector` The /e modifier is no longer supported, use preg_replace_callback instead diff --git a/packages/Php/src/Rector/Name/ReservedObjectRector.php b/packages/Php/src/Rector/Name/ReservedObjectRector.php index 11c55b8bbbbd..f4c522173fee 100644 --- a/packages/Php/src/Rector/Name/ReservedObjectRector.php +++ b/packages/Php/src/Rector/Name/ReservedObjectRector.php @@ -72,9 +72,13 @@ public function refactor(Node $node): ?Node private function processIdentifier(Identifier $identifier): Identifier { foreach ($this->reservedKeywordsToReplacements as $reservedKeyword => $replacement) { - if ($this->isName($identifier, $reservedKeyword)) { - $identifier->name = $replacement; + if (! $this->isName($identifier, $reservedKeyword)) { + continue; } + + $identifier->name = $replacement; + + return $identifier; } return $identifier; @@ -93,6 +97,8 @@ private function processName(Name $name): Name foreach ($this->reservedKeywordsToReplacements as $reservedKeyword => $replacement) { if (strtolower($name->getLast()) === strtolower($reservedKeyword)) { $name->parts[count($name->parts) - 1] = $replacement; + + // invoke override $name->setAttribute(AttributeKey::ORIGINAL_NODE, null); } } diff --git a/packages/Php/src/Rector/FuncCall/PregReplaceEModifierRector.php b/packages/Php55/src/Rector/FuncCall/PregReplaceEModifierRector.php similarity index 94% rename from packages/Php/src/Rector/FuncCall/PregReplaceEModifierRector.php rename to packages/Php55/src/Rector/FuncCall/PregReplaceEModifierRector.php index 8a1e45fef2da..2272f0fa8ec3 100644 --- a/packages/Php/src/Rector/FuncCall/PregReplaceEModifierRector.php +++ b/packages/Php55/src/Rector/FuncCall/PregReplaceEModifierRector.php @@ -1,6 +1,6 @@ diff --git a/packages/Php/src/Exception/InvalidEregException.php b/src/Php70/Exception/InvalidEregException.php similarity index 75% rename from packages/Php/src/Exception/InvalidEregException.php rename to src/Php70/Exception/InvalidEregException.php index 773a20fa4b63..fc7471f06f35 100644 --- a/packages/Php/src/Exception/InvalidEregException.php +++ b/src/Php70/Exception/InvalidEregException.php @@ -1,6 +1,6 @@ Date: Mon, 23 Sep 2019 18:05:19 +0200 Subject: [PATCH 12/14] move ReserverObjectRector to Php71 --- config/set/php/php71.yaml | 2 +- docs/AllRectorsOverview.md | 2 +- .../Fixture/ReservedObject.php | 61 ------------------- .../Fixture/skip_type_declaration_object.php | 8 --- .../tests/EregToPcreTransformerTest.php | 2 +- .../src/IsArrayAndDualCheckToAble.php | 2 +- .../src/Rector/BinaryOp/IsIterableRector.php | 2 +- .../Fixture/ReservedObject.php | 61 +++++++++++++++++++ .../Fixture/skip_type_declaration_object.php | 8 +++ .../ReservedObjectRectorTest.php | 4 +- .../src/Rector/BinaryOp/IsCountableRector.php | 2 +- .../Rector/Name/ReservedObjectRector.php | 2 +- 12 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php delete mode 100644 packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php rename packages/{Php => Php70}/tests/EregToPcreTransformerTest.php (98%) rename packages/{Php => Php71}/src/IsArrayAndDualCheckToAble.php (98%) create mode 100644 packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php create mode 100644 packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php rename packages/{Php => Php71}/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php (88%) rename {packages/Php/src => src/Php71}/Rector/Name/ReservedObjectRector.php (98%) diff --git a/config/set/php/php71.yaml b/config/set/php/php71.yaml index 811d4cb7a341..6cbc69e5f2f8 100644 --- a/config/set/php/php71.yaml +++ b/config/set/php/php71.yaml @@ -1,7 +1,7 @@ services: Rector\Php71\Rector\BinaryOp\IsIterableRector: ~ - Rector\Php\Rector\Name\ReservedObjectRector: + Rector\Php71\Rector\Name\ReservedObjectRector: $reservedKeywordsToReplacements: Object: 'BaseObject' diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 1ef85835fba5..9f4a630d8ba2 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -4487,7 +4487,7 @@ Change fn() function name, since it will be reserved keyword ### `ReservedObjectRector` -- class: `Rector\Php\Rector\Name\ReservedObjectRector` +- class: `Rector\Php71\Rector\Name\ReservedObjectRector` Changes reserved "Object" name to "Object" where can be configured diff --git a/packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php b/packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php deleted file mode 100644 index 191b82eb6944..000000000000 --- a/packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php +++ /dev/null @@ -1,61 +0,0 @@ - ------ - diff --git a/packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php b/packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php deleted file mode 100644 index 8b1322eee4d9..000000000000 --- a/packages/Php/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php +++ /dev/null @@ -1,8 +0,0 @@ - +----- + diff --git a/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php b/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php new file mode 100644 index 000000000000..3f521d49c33a --- /dev/null +++ b/packages/Php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php @@ -0,0 +1,8 @@ + Date: Mon, 23 Sep 2019 18:09:22 +0200 Subject: [PATCH 13/14] move PreferThisOrSelfMethodCall to CodingStyle --- docs/AllRectorsOverview.md | 4 +-- .../PreferThisOrSelfMethodCallRector.php | 4 +-- .../Fixture/to_self.php.inc | 35 +++++++++++++++++++ .../Fixture/to_this.php.inc | 8 ++--- .../PreferThisOrSelfMethodCallRectorTest.php | 8 ++--- .../Source/AbstractTestCase.php | 8 +++++ .../Source/BeLocalClass.php | 8 +++++ .../Fixture/to_self.php.inc | 35 ------------------- .../Source/AbstractTestCase.php | 8 ----- .../Source/BeLocalClass.php | 8 ----- .../src}/Exception/InvalidEregException.php | 0 packages/Php71/config/config.yaml | 8 +++++ .../src}/Rector/Name/ReservedObjectRector.php | 2 +- 13 files changed, 72 insertions(+), 64 deletions(-) rename packages/{Php => CodingStyle}/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php (95%) create mode 100644 packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc rename packages/{Php => CodingStyle}/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc (53%) rename packages/{Php => CodingStyle}/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php (71%) create mode 100644 packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php create mode 100644 packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php delete mode 100644 packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_self.php.inc delete mode 100644 packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php delete mode 100644 packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/BeLocalClass.php rename {src/Php70 => packages/Php70/src}/Exception/InvalidEregException.php (100%) create mode 100644 packages/Php71/config/config.yaml rename {src/Php71 => packages/Php71/src}/Rector/Name/ReservedObjectRector.php (96%) diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 9f4a630d8ba2..81ac1b22f67d 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -4242,13 +4242,13 @@ Changes pow(val, val2) to ** (exp) parameter ### `PreferThisOrSelfMethodCallRector` -- class: `Rector\Php\Rector\MethodCall\PreferThisOrSelfMethodCallRector` +- class: `Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector` Changes $this->... to self:: or vise versa for specific types ```yaml services: - Rector\Php\Rector\MethodCall\PreferThisOrSelfMethodCallRector: + Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector: PHPUnit\TestCase: self ``` diff --git a/packages/Php/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php b/packages/CodingStyle/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php similarity index 95% rename from packages/Php/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php rename to packages/CodingStyle/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php index 935632dae862..74bcdbbe1c1c 100644 --- a/packages/Php/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php +++ b/packages/CodingStyle/src/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php @@ -1,6 +1,6 @@ assertThis(); + self::assertThis(); + parent::assertThis(); + } +} + +?> +----- + diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc similarity index 53% rename from packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc rename to packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc index 280b911b218d..735f551f913a 100644 --- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc +++ b/packages/CodingStyle/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Fixture/to_this.php.inc @@ -1,8 +1,8 @@ assertThis(); - self::assertThis(); - parent::assertThis(); - } -} - -?> ------ - diff --git a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php b/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php deleted file mode 100644 index 26d3cbd5f334..000000000000 --- a/packages/Php/tests/Rector/MethodCall/PreferThisOrSelfMethodCallRector/Source/AbstractTestCase.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Mon, 23 Sep 2019 18:15:08 +0200 Subject: [PATCH 14/14] move SwapFuncCallArgumentsRector to Argument --- composer.json | 2 -- config/set/database-migration/mysql-to-mysqli.yaml | 2 +- docs/AllRectorsOverview.md | 2 +- .../Rector/Foreach_/SimplifyForeachToCoalescingRector.php | 2 +- ...ecutiveNullCompareReturnsToNullCoalesceQueueRector.php | 2 +- packages/NodeTypeResolver/src/StaticTypeMapper.php | 2 +- packages/Php/config/config.yaml | 8 -------- .../src/Rector/Ternary/TernaryToNullCoalescingRector.php | 2 +- .../Php70/src/Rector/Ternary/TernaryToSpaceshipRector.php | 2 +- .../BinaryOp/IsIterableRector/PolyfillRectorTest.php | 2 +- .../Class_/EventListenerToEventSubscriberRector.php | 2 +- .../src/Rector/Closure/AddClosureReturnTypeRector.php | 2 +- .../Rector/FunctionLike/ParamTypeDeclarationRector.php | 2 +- .../Rector/FunctionLike/ReturnTypeDeclarationRector.php | 2 +- .../Rector/Argument}/SwapFuncCallArgumentsRector.php | 4 ++-- .../Php/src => src}/ValueObject/PhpVersionFeature.php | 2 +- .../SwapFuncCallArgumentsRector/Fixture/fixture.php.inc | 4 ++-- .../SwapFuncCallArgumentsRectorTest.php | 4 ++-- 18 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 packages/Php/config/config.yaml rename {packages/Php/src/Rector/FuncCall => src/Rector/Argument}/SwapFuncCallArgumentsRector.php (93%) rename {packages/Php/src => src}/ValueObject/PhpVersionFeature.php (93%) rename {packages/Php/tests/Rector/FuncCall => tests/Rector/Argument}/SwapFuncCallArgumentsRector/Fixture/fixture.php.inc (62%) rename {packages/Php/tests/Rector/FuncCall => tests/Rector/Argument}/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php (85%) diff --git a/composer.json b/composer.json index b293155322d3..a8b8d1eb1021 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,6 @@ "Rector\\PHPUnit\\": "packages/PHPUnit/src", "Rector\\PSR4\\": "packages/PSR4/src", "Rector\\PhpSpecToPHPUnit\\": "packages/PhpSpecToPHPUnit/src", - "Rector\\Php\\": "packages/Php/src", "Rector\\Php52\\": "packages/Php52/src", "Rector\\Php53\\": "packages/Php53/src", "Rector\\Php54\\": "packages/Php54/src", @@ -129,7 +128,6 @@ "Rector\\PHPUnit\\Tests\\": "packages/PHPUnit/tests", "Rector\\PSR4\\Tests\\": "packages/PSR4/tests", "Rector\\PhpSpecToPHPUnit\\Tests\\": "packages/PhpSpecToPHPUnit/tests", - "Rector\\Php\\Tests\\": "packages/Php/tests", "Rector\\Php52\\Tests\\": "packages/Php52/tests", "Rector\\Php53\\Tests\\": "packages/Php53/tests", "Rector\\Php54\\Tests\\": "packages/Php54/tests", diff --git a/config/set/database-migration/mysql-to-mysqli.yaml b/config/set/database-migration/mysql-to-mysqli.yaml index 4883afc3798f..eba21b95bd03 100644 --- a/config/set/database-migration/mysql-to-mysqli.yaml +++ b/config/set/database-migration/mysql-to-mysqli.yaml @@ -7,7 +7,7 @@ services: Rector\MysqlToMysqli\Rector\FuncCall\MysqlPConnectToMysqliConnectRector: ~ # first swap arguments, then rename - Rector\Php\Rector\FuncCall\SwapFuncCallArgumentsRector: + Rector\Rector\Argument\SwapFuncCallArgumentsRector: mysql_real_escape_string: [1, 0] mysql_select_db: [1, 0] mysql_set_charset: [1, 0] diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 81ac1b22f67d..2b31ec7d6dd9 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -4647,7 +4647,7 @@ String asserts must be passed directly to assert() ### `SwapFuncCallArgumentsRector` -- class: `Rector\Php\Rector\FuncCall\SwapFuncCallArgumentsRector` +- class: `Rector\Rector\Argument\SwapFuncCallArgumentsRector` Swap arguments in function calls diff --git a/packages/CodeQuality/src/Rector/Foreach_/SimplifyForeachToCoalescingRector.php b/packages/CodeQuality/src/Rector/Foreach_/SimplifyForeachToCoalescingRector.php index 55320e29d0a5..123f6ddd67ea 100644 --- a/packages/CodeQuality/src/Rector/Foreach_/SimplifyForeachToCoalescingRector.php +++ b/packages/CodeQuality/src/Rector/Foreach_/SimplifyForeachToCoalescingRector.php @@ -12,11 +12,11 @@ use PhpParser\Node\Stmt\If_; use PhpParser\Node\Stmt\Return_; use Rector\NodeTypeResolver\Node\AttributeKey; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\PhpParser\Node\Manipulator\ForeachManipulator; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; +use Rector\ValueObject\PhpVersionFeature; /** * @see \Rector\CodeQuality\Tests\Rector\Foreach_\SimplifyForeachToCoalescingRector\SimplifyForeachToCoalescingRectorTest diff --git a/packages/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php b/packages/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php index b3fbe02ace48..d6229a2a78e1 100644 --- a/packages/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php +++ b/packages/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php @@ -8,11 +8,11 @@ use PhpParser\Node\Stmt\If_; use PhpParser\Node\Stmt\Return_; use Rector\NodeTypeResolver\Node\AttributeKey; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\PhpParser\Node\Manipulator\IfManipulator; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; +use Rector\ValueObject\PhpVersionFeature; /** * @see \Rector\CodeQuality\Tests\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector\ConsecutiveNullCompareReturnsToNullCoalesceQueueRectorTest diff --git a/packages/NodeTypeResolver/src/StaticTypeMapper.php b/packages/NodeTypeResolver/src/StaticTypeMapper.php index dc2c32c30cf2..bdca6804c1c2 100644 --- a/packages/NodeTypeResolver/src/StaticTypeMapper.php +++ b/packages/NodeTypeResolver/src/StaticTypeMapper.php @@ -47,13 +47,13 @@ use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory; use Rector\Php\PhpVersionProvider; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\PHPStan\Type\AliasedObjectType; use Rector\PHPStan\Type\FullyQualifiedObjectType; use Rector\PHPStan\Type\ParentStaticType; use Rector\PHPStan\Type\SelfObjectType; use Rector\PHPStan\Type\ShortenedObjectType; use Rector\TypeDeclaration\PHPStan\Type\ObjectTypeSpecifier; +use Rector\ValueObject\PhpVersionFeature; use Traversable; /** diff --git a/packages/Php/config/config.yaml b/packages/Php/config/config.yaml deleted file mode 100644 index e4739288757c..000000000000 --- a/packages/Php/config/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -services: - _defaults: - public: true - autowire: true - - Rector\Php\: - resource: '../src' - exclude: '../src/{Rector/**/*Rector.php,ValueObject/*}' diff --git a/packages/Php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php b/packages/Php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php index f46c33842c39..3ec29488cc32 100644 --- a/packages/Php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php +++ b/packages/Php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php @@ -8,10 +8,10 @@ use PhpParser\Node\Expr\BinaryOp\NotIdentical; use PhpParser\Node\Expr\Isset_; use PhpParser\Node\Expr\Ternary; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; +use Rector\ValueObject\PhpVersionFeature; /** * @see \Rector\Php70\Tests\Rector\Ternary\TernaryToNullCoalescingRector\TernaryToNullCoalescingRectorTest diff --git a/packages/Php70/src/Rector/Ternary/TernaryToSpaceshipRector.php b/packages/Php70/src/Rector/Ternary/TernaryToSpaceshipRector.php index 6a92dd19c00b..f1ff637711b3 100644 --- a/packages/Php70/src/Rector/Ternary/TernaryToSpaceshipRector.php +++ b/packages/Php70/src/Rector/Ternary/TernaryToSpaceshipRector.php @@ -8,10 +8,10 @@ use PhpParser\Node\Expr\BinaryOp\Smaller; use PhpParser\Node\Expr\BinaryOp\Spaceship; use PhpParser\Node\Expr\Ternary; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; +use Rector\ValueObject\PhpVersionFeature; /** * @see https://wiki.php.net/rfc/combined-comparison-operator diff --git a/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php b/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php index 384a9098a1d3..2aceb9af2e28 100644 --- a/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php +++ b/packages/Php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php @@ -2,9 +2,9 @@ namespace Rector\Php71\Tests\Rector\BinaryOp\IsIterableRector; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\Php71\Rector\BinaryOp\IsIterableRector; use Rector\Testing\PHPUnit\AbstractRectorTestCase; +use Rector\ValueObject\PhpVersionFeature; final class PolyfillRectorTest extends AbstractRectorTestCase { diff --git a/packages/SymfonyCodeQuality/src/Rector/Class_/EventListenerToEventSubscriberRector.php b/packages/SymfonyCodeQuality/src/Rector/Class_/EventListenerToEventSubscriberRector.php index 3ff941ed4684..d00091d7d780 100644 --- a/packages/SymfonyCodeQuality/src/Rector/Class_/EventListenerToEventSubscriberRector.php +++ b/packages/SymfonyCodeQuality/src/Rector/Class_/EventListenerToEventSubscriberRector.php @@ -18,10 +18,10 @@ use PHPStan\Type\ArrayType; use PHPStan\Type\MixedType; use Rector\Bridge\Contract\AnalyzedApplicationContainerInterface; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; +use Rector\ValueObject\PhpVersionFeature; use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher; /** diff --git a/packages/TypeDeclaration/src/Rector/Closure/AddClosureReturnTypeRector.php b/packages/TypeDeclaration/src/Rector/Closure/AddClosureReturnTypeRector.php index 98af44637a44..8cc28ecc561e 100644 --- a/packages/TypeDeclaration/src/Rector/Closure/AddClosureReturnTypeRector.php +++ b/packages/TypeDeclaration/src/Rector/Closure/AddClosureReturnTypeRector.php @@ -6,11 +6,11 @@ use PhpParser\Node\Expr\Closure; use PHPStan\Analyser\Scope; use Rector\NodeTypeResolver\Node\AttributeKey; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; +use Rector\ValueObject\PhpVersionFeature; /** * @see \Rector\TypeDeclaration\Tests\Rector\Closure\AddClosureReturnTypeRector\AddClosureReturnTypeRectorTest diff --git a/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php b/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php index 883445ca0805..a2ae1e2e640f 100644 --- a/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php +++ b/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php @@ -11,9 +11,9 @@ use PhpParser\Node\Stmt\Function_; use PHPStan\Type\Type; use Rector\NodeTypeResolver\Node\AttributeKey; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; +use Rector\ValueObject\PhpVersionFeature; /** * @see \Rector\TypeDeclaration\Tests\Rector\FunctionLike\ParamTypeDeclarationRector\ParamTypeDeclarationRectorTest diff --git a/packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php b/packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php index 310b8d075d7b..8ceda80efe1b 100644 --- a/packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php +++ b/packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php @@ -10,11 +10,11 @@ use PHPStan\Type\Type; use Rector\Exception\ShouldNotHappenException; use Rector\NodeTypeResolver\Node\AttributeKey; -use Rector\Php\ValueObject\PhpVersionFeature; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer\ReturnTypeDeclarationReturnTypeInferer; +use Rector\ValueObject\PhpVersionFeature; /** * @sponsor Thanks https://spaceflow.io/ for sponsoring this rule - visit them on https://github.com/SpaceFlow-app diff --git a/packages/Php/src/Rector/FuncCall/SwapFuncCallArgumentsRector.php b/src/Rector/Argument/SwapFuncCallArgumentsRector.php similarity index 93% rename from packages/Php/src/Rector/FuncCall/SwapFuncCallArgumentsRector.php rename to src/Rector/Argument/SwapFuncCallArgumentsRector.php index 16fbe3448de3..76b0017ccaf6 100644 --- a/packages/Php/src/Rector/FuncCall/SwapFuncCallArgumentsRector.php +++ b/src/Rector/Argument/SwapFuncCallArgumentsRector.php @@ -1,6 +1,6 @@