From 980778d69b838f72f49929868d2d530dba88b9c1 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 23 Sep 2019 18:15:08 +0200 Subject: [PATCH] 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 b293155322d..a8b8d1eb102 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 4883afc3798..eba21b95bd0 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 81ac1b22f67..2b31ec7d6dd 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 55320e29d0a..123f6ddd67e 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\Foreach_; 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 b3fbe02ace4..d6229a2a78e 100644 --- a/packages/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php +++ b/packages/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php @@ -8,11 +8,11 @@ use PhpParser\Node\Expr\BinaryOp\Coalesce; 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 dc2c32c30cf..bdca6804c1c 100644 --- a/packages/NodeTypeResolver/src/StaticTypeMapper.php +++ b/packages/NodeTypeResolver/src/StaticTypeMapper.php @@ -47,13 +47,13 @@ use Rector\Exception\ShouldNotHappenException; 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 e4739288757..00000000000 --- 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 f46c33842c3..3ec29488cc3 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\Identical; 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 6a92dd19c00..f1ff637711b 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\Greater; 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 384a9098a1d..2aceb9af2e2 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 3ff941ed468..d00091d7d78 100644 --- a/packages/SymfonyCodeQuality/src/Rector/Class_/EventListenerToEventSubscriberRector.php +++ b/packages/SymfonyCodeQuality/src/Rector/Class_/EventListenerToEventSubscriberRector.php @@ -18,10 +18,10 @@ use PhpParser\Node\Stmt\Return_; 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 98af44637a4..8cc28ecc561 100644 --- a/packages/TypeDeclaration/src/Rector/Closure/AddClosureReturnTypeRector.php +++ b/packages/TypeDeclaration/src/Rector/Closure/AddClosureReturnTypeRector.php @@ -6,11 +6,11 @@ use PhpParser\Node; 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 883445ca080..a2ae1e2e640 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\ClassMethod; 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 310b8d075d7..8ceda80efe1 100644 --- a/packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php +++ b/packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php @@ -10,11 +10,11 @@ use PHPStan\Type\MixedType; 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 16fbe3448de..76b0017ccaf 100644 --- a/packages/Php/src/Rector/FuncCall/SwapFuncCallArgumentsRector.php +++ b/src/Rector/Argument/SwapFuncCallArgumentsRector.php @@ -1,6 +1,6 @@