From 2cb3f049456386aaa5ac260eefe3510d2865f221 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 6 Sep 2019 12:30:58 +0200 Subject: [PATCH] remove few PHP-Parser rules to prevent package-rules vs package-features confussion --- docs/AllRectorsOverview.md | 214 +++++++++--------- .../NodeAnalyzer/DocBlockManipulator.php | 2 +- .../Rector/CatchAndClosureUseNameRector.php | 65 ------ .../PhpParser/src/Rector/IdentifierRector.php | 94 -------- .../Rector/ParamAndStaticVarNameRector.php | 50 ---- .../PhpParser/src/Rector/RemoveNodeRector.php | 70 ------ .../PhpParser/src/Rector/SetLineRector.php | 53 ----- .../src/Rector/UseWithAliasRector.php | 53 ----- .../CatchAndClosureUseNameRectorTest.php | 19 -- .../Fixture/fixture.php.inc | 23 -- .../IdentifierRector/Fixture/fixture.php.inc | 19 -- .../IdentifierRector/Fixture/fixture2.php.inc | 33 --- .../IdentifierRector/IdentifierRectorTest.php | 19 -- .../Fixture/fixture.php.inc | 19 -- .../ParamAndStaticVarNameRectorTest.php | 19 -- .../RemoveNodeRector/Fixture/fixture.php.inc | 27 --- .../RemoveNodeRector/Fixture/fixture2.php.inc | 55 ----- .../RemoveNodeRector/Fixture/fixture3.php.inc | 37 --- .../RemoveNodeRector/Fixture/fixture4.php.inc | 27 --- .../RemoveNodeRector/RemoveNodeRectorTest.php | 24 -- .../SetLineRector/Fixture/fixture.php.inc | 27 --- .../SetLineRector/SetLineRectorTest.php | 19 -- .../Fixture/fixture.php.inc | 29 --- .../UseWithAliasRectorTest.php | 19 -- .../AbstractRector/NodeTypeResolverTrait.php | 4 +- .../Annotation/RenameAnnotationRector.php | 2 +- src/Rector/Argument/ArgumentAdderRector.php | 2 +- 27 files changed, 118 insertions(+), 906 deletions(-) delete mode 100644 packages/PhpParser/src/Rector/CatchAndClosureUseNameRector.php delete mode 100644 packages/PhpParser/src/Rector/IdentifierRector.php delete mode 100644 packages/PhpParser/src/Rector/ParamAndStaticVarNameRector.php delete mode 100644 packages/PhpParser/src/Rector/RemoveNodeRector.php delete mode 100644 packages/PhpParser/src/Rector/SetLineRector.php delete mode 100644 packages/PhpParser/src/Rector/UseWithAliasRector.php delete mode 100644 packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/CatchAndClosureUseNameRectorTest.php delete mode 100644 packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/Fixture/fixture.php.inc delete mode 100644 packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture.php.inc delete mode 100644 packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture2.php.inc delete mode 100644 packages/PhpParser/tests/Rector/IdentifierRector/IdentifierRectorTest.php delete mode 100644 packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/Fixture/fixture.php.inc delete mode 100644 packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/ParamAndStaticVarNameRectorTest.php delete mode 100644 packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture.php.inc delete mode 100644 packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture2.php.inc delete mode 100644 packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture3.php.inc delete mode 100644 packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture4.php.inc delete mode 100644 packages/PhpParser/tests/Rector/RemoveNodeRector/RemoveNodeRectorTest.php delete mode 100644 packages/PhpParser/tests/Rector/SetLineRector/Fixture/fixture.php.inc delete mode 100644 packages/PhpParser/tests/Rector/SetLineRector/SetLineRectorTest.php delete mode 100644 packages/PhpParser/tests/Rector/UseWithAliasRector/Fixture/fixture.php.inc delete mode 100644 packages/PhpParser/tests/Rector/UseWithAliasRector/UseWithAliasRectorTest.php diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index 86fd36951ce..d4d919a49da 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -1,4 +1,4 @@ -# All 336 Rectors Overview +# All 335 Rectors Overview - [Projects](#projects) - [General](#general) @@ -26,7 +26,6 @@ - [PHPUnitSymfony](#phpunitsymfony) - [PSR4](#psr4) - [Php](#php) -- [PhpParser](#phpparser) - [PhpSpecToPHPUnit](#phpspectophpunit) - [RemovingStatic](#removingstatic) - [Restoration](#restoration) @@ -1390,6 +1389,29 @@ services: ## DeadCode +### `RemoveAlwaysTrueIfConditionRector` + +- class: `Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector` + +Remove if condition that is always true + +```diff + final class SomeClass + { + public function go() + { +- if (1 === 1) { +- return 'yes'; +- } ++ return 'yes'; + + return 'no'; + } + } +``` + +
+ ### `RemoveAndTrueRector` - class: `Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector` @@ -1928,9 +1950,25 @@ Removes unneeded $a = $a assigns ## Doctrine -### `AliasToClassRector` +### `AddUuidMirrorForRelationPropertyRector` -- class: `Rector\Doctrine\Rector\AliasToClassRector` +- class: `Rector\Doctrine\Rector\Class_\AddUuidMirrorForRelationPropertyRector` + +Adds $uuid property to entities, that already have $id with integer type.Require for step-by-step migration from int to uuid. + +
+ +### `AddUuidToEntityWhereMissingRector` + +- class: `Rector\Doctrine\Rector\Class_\AddUuidToEntityWhereMissingRector` + +Adds $uuid property to entities, that already have $id with integer type.Require for step-by-step migration from int to uuid. In following step it should be renamed to $id and replace it + +
+ +### `EntityAliasToClassConstantReferenceRector` + +- class: `Rector\Doctrine\Rector\MethodCall\EntityAliasToClassConstantReferenceRector` Replaces doctrine alias with class. @@ -2721,6 +2759,72 @@ Removes non-existing @var annotations above the code ## PHPUnit +### `AddSeeTestAnnotationRector` + +- class: `Rector\PHPUnit\Rector\Class_\AddSeeTestAnnotationRector` + +Add @see annotation test of the class for faster jump to test. Make it FQN, so it stays in the annotation, not in the PHP source code. + +```diff ++/** ++ * @see \SomeServiceTest ++ */ + class SomeService + { + } + + class SomeServiceTest extends \PHPUnit\Framework\TestCase + { + } +``` + +
+ +### `ArrayArgumentInTestToDataProviderRector` + +- class: `Rector\PHPUnit\Rector\Class_\ArrayArgumentInTestToDataProviderRector` + +Move array argument from tests into data provider [configurable] + +```yaml +services: + Rector\PHPUnit\Rector\Class_\ArrayArgumentInTestToDataProviderRector: + $configuration: + - + class: PHPUnit\Framework\TestCase + old_method: doTestMultiple + new_method: doTestSingle +``` + +↓ + +```diff + class SomeServiceTest extends \PHPUnit\Framework\TestCase + { +- public function test() ++ /** ++ * @dataProvider provideDataForTest() ++ */ ++ public function test(int $value) + { +- $this->doTestMultiple([1, 2, 3]); ++ $this->doTestSingle($value); ++ } ++ ++ /** ++ * @return int[] ++ */ ++ public function provideDataForTest(): iterable ++ { ++ yield 1; ++ yield 2; ++ yield 3; + } + } +``` + +
+ ### `AssertCompareToSpecificMethodRector` - class: `Rector\PHPUnit\Rector\SpecificMethod\AssertCompareToSpecificMethodRector` @@ -4486,100 +4590,6 @@ each() function is deprecated, use foreach() instead.
-## PhpParser - -### `CatchAndClosureUseNameRector` - -- class: `Rector\PhpParser\Rector\CatchAndClosureUseNameRector` - -Turns `$catchNode->var` to its new `name` property in php-parser - -```diff --$catchNode->var; -+$catchNode->var->name -``` - -
- -### `IdentifierRector` - -- class: `Rector\PhpParser\Rector\IdentifierRector` - -Turns node string names to Identifier object in php-parser - -```diff - $constNode = new PhpParser\Node\Const_; --$name = $constNode->name; -+$name = $constNode->name->toString();' -``` - -
- -### `ParamAndStaticVarNameRector` - -- class: `Rector\PhpParser\Rector\ParamAndStaticVarNameRector` - -Turns old string `var` to `var->name` sub-variable in Node of PHP-Parser - -```diff --$paramNode->name; -+$paramNode->var->name; -``` - -```diff --$staticVarNode->name; -+$staticVarNode->var->name; -``` - -
- -### `RemoveNodeRector` - -- class: `Rector\PhpParser\Rector\RemoveNodeRector` - -Turns integer return to remove node to constant in NodeVisitor of PHP-Parser - -```diff - public function leaveNode() - { -- return false; -+ return NodeTraverser::REMOVE_NODE; - } -``` - -
- -### `SetLineRector` - -- class: `Rector\PhpParser\Rector\SetLineRector` - -Turns standalone line method to attribute in Node of PHP-Parser - -```diff --$node->setLine(5); -+$node->setAttribute("line", 5); -``` - -
- -### `UseWithAliasRector` - -- class: `Rector\PhpParser\Rector\UseWithAliasRector` - -Turns use property to method and `$node->alias` to last name in UseAlias Node of PHP-Parser - -```diff --$node->alias; -+$node->getAlias(); -``` - -```diff --$node->name->getLast(); -+$node->alias -``` - -
- ## PhpSpecToPHPUnit ### `AddMockPropertiesRector` @@ -6874,8 +6884,9 @@ Turns defined annotations above properties and methods to their new values. ```yaml services: Rector\Rector\Annotation\RenameAnnotationRector: - PHPUnit\Framework\TestCase: - test: scenario + $classToAnnotationMap: + PHPUnit\Framework\TestCase: + test: scenario ``` ↓ @@ -6953,7 +6964,8 @@ Replaces defined classes by new ones. ```yaml services: Rector\Rector\Class_\RenameClassRector: - App\SomeOldClass: App\SomeNewClass + $oldToNewClasses: + App\SomeOldClass: App\SomeNewClass ``` ↓ diff --git a/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php b/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php index e0048fa7901..169b304b2ae 100644 --- a/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php +++ b/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php @@ -2,7 +2,6 @@ namespace Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer; -use PhpParser\Node\Stmt\Use_; use Nette\Utils\Strings; use PhpParser\Comment\Doc; use PhpParser\Node; @@ -11,6 +10,7 @@ use PhpParser\Node\FunctionLike; use PhpParser\Node\Stmt\ClassLike; use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Function_; +use PhpParser\Node\Stmt\Use_; use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode; diff --git a/packages/PhpParser/src/Rector/CatchAndClosureUseNameRector.php b/packages/PhpParser/src/Rector/CatchAndClosureUseNameRector.php deleted file mode 100644 index b7dcc965848..00000000000 --- a/packages/PhpParser/src/Rector/CatchAndClosureUseNameRector.php +++ /dev/null @@ -1,65 +0,0 @@ -var` to its new `name` property in php-parser', [ - new CodeSample('$catchNode->var;', '$catchNode->var->name'), - ]); - } - - /** - * @return string[] - */ - public function getNodeTypes(): array - { - return [PropertyFetch::class]; - } - - /** - * @param PropertyFetch $node - */ - public function refactor(Node $node): ?Node - { - if (! $this->isObjectTypes($node->var, ['PhpParser\Node\Stmt\Catch_', 'PhpParser\Node\Expr\ClosureUse'])) { - return null; - } - - if (! $this->isName($node, 'var')) { - return null; - } - - $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE); - if ($parentNode instanceof PropertyFetch) { - return null; - } - - /** @var Variable $variableNode */ - $variableNode = $node->var; - - $variableName = $this->getName($variableNode); - if ($variableName === null) { - return null; - } - - $node->var = $this->createPropertyFetch($variableName, 'var'); - $node->name = new Identifier('name'); - - return $node; - } -} diff --git a/packages/PhpParser/src/Rector/IdentifierRector.php b/packages/PhpParser/src/Rector/IdentifierRector.php deleted file mode 100644 index 8dcad50625b..00000000000 --- a/packages/PhpParser/src/Rector/IdentifierRector.php +++ /dev/null @@ -1,94 +0,0 @@ - ['name'], - 'PhpParser\Node\NullableType' => ['type'], // sometimes only - 'PhpParser\Node\Param' => ['type'], // sometimes only - 'PhpParser\Node\Expr\ClassConstFetch' => ['name'], - 'PhpParser\Node\Expr\Closure' => ['returnType'], // sometimes only - 'PhpParser\Node\Expr\MethodCall' => ['name'], - 'PhpParser\Node\Expr\PropertyFetch' => ['name'], - 'PhpParser\Node\Expr\StaticCall' => ['name'], - 'PhpParser\Node\Expr\StaticPropertyFetch' => ['name'], - 'PhpParser\Node\Stmt\Class_' => ['name'], - 'PhpParser\Node\Stmt\ClassMethod' => ['name', 'returnType' /* sometimes only */], - 'PhpParser\Node\Stmt\Function' => ['name', 'returnType' /* sometimes only */], - 'PhpParser\Node\Stmt\Goto_' => ['name'], - 'PhpParser\Node\Stmt\Interface_' => ['name'], - 'PhpParser\Node\Stmt\Label' => ['name'], - 'PhpParser\Node\Stmt\PropertyProperty' => ['name'], - 'PhpParser\Node\Stmt\TraitUseAdaptation\Alias' => ['method', 'newName'], - 'PhpParser\Node\Stmt\TraitUseAdaptation\Precedence' => ['method'], - 'PhpParser\Node\Stmt\Trait_' => ['name'], - 'PhpParser\Node\Stmt\UseUse' => ['alias'], - ]; - - public function getDefinition(): RectorDefinition - { - return new RectorDefinition('Turns node string names to Identifier object in php-parser', [ - new CodeSample( - <<<'CODE_SAMPLE' -$constNode = new PhpParser\Node\Const_; -$name = $constNode->name; -CODE_SAMPLE - , - <<<'CODE_SAMPLE' -$constNode = new PhpParser\Node\Const_; -$name = $constNode->name->toString();' -CODE_SAMPLE - ), - ]); - } - - /** - * @return string[] - */ - public function getNodeTypes(): array - { - return [PropertyFetch::class]; - } - - /** - * @param PropertyFetch $node - */ - public function refactor(Node $node): ?Node - { - foreach ($this->typeToPropertiesMap as $type => $properties) { - if (! $this->isObjectType($node->var, $type)) { - continue; - } - - if (! $this->isNames($node, $properties)) { - continue; - } - - $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE); - if ($parentNode instanceof MethodCall) { - continue; - } - - return $this->createMethodCall($node, 'toString'); - } - - return null; - } -} diff --git a/packages/PhpParser/src/Rector/ParamAndStaticVarNameRector.php b/packages/PhpParser/src/Rector/ParamAndStaticVarNameRector.php deleted file mode 100644 index 78b38b91f6b..00000000000 --- a/packages/PhpParser/src/Rector/ParamAndStaticVarNameRector.php +++ /dev/null @@ -1,50 +0,0 @@ -name` sub-variable in Node of PHP-Parser', [ - new CodeSample('$paramNode->name;', '$paramNode->var->name;'), - new CodeSample('$staticVarNode->name;', '$staticVarNode->var->name;'), - ]); - } - - /** - * @return string[] - */ - public function getNodeTypes(): array - { - return [PropertyFetch::class]; - } - - /** - * @param PropertyFetch $node - */ - public function refactor(Node $node): ?Node - { - if (! $this->isObjectTypes($node->var, ['PhpParser\Node\Param', 'PhpParser\Node\Stmt\StaticVar'])) { - return null; - } - - if (! $this->isName($node, 'name')) { - return null; - } - - $node->name = new Identifier('var'); - - return new PropertyFetch($node, 'name'); - } -} diff --git a/packages/PhpParser/src/Rector/RemoveNodeRector.php b/packages/PhpParser/src/Rector/RemoveNodeRector.php deleted file mode 100644 index c7df9dfcc8e..00000000000 --- a/packages/PhpParser/src/Rector/RemoveNodeRector.php +++ /dev/null @@ -1,70 +0,0 @@ -expr instanceof ConstFetch) { - return null; - } - - $methodName = $node->getAttribute(AttributeKey::METHOD_NAME); - if ($methodName !== 'leaveNode') { - return null; - } - - if (! $this->isFalse($node->expr)) { - return null; - } - - $node->expr = $this->createClassConstant('PhpParser\NodeTraverser', 'REMOVE_NODE'); - - return $node; - } -} diff --git a/packages/PhpParser/src/Rector/SetLineRector.php b/packages/PhpParser/src/Rector/SetLineRector.php deleted file mode 100644 index 9b13c5b49d8..00000000000 --- a/packages/PhpParser/src/Rector/SetLineRector.php +++ /dev/null @@ -1,53 +0,0 @@ -setLine(5);', '$node->setAttribute("line", 5);'), - ]); - } - - /** - * @return string[] - */ - public function getNodeTypes(): array - { - return [MethodCall::class]; - } - - /** - * @param MethodCall $node - */ - public function refactor(Node $node): ?Node - { - if (! $this->isObjectType($node->var, 'PhpParser\Node')) { - return null; - } - - if (! $this->isName($node, 'setLine')) { - return null; - } - - $node->name = new Identifier('setAttribute'); - - $node->args[1] = $node->args[0]; - $node->args[0] = $this->createArg(new String_('line')); - - return $node; - } -} diff --git a/packages/PhpParser/src/Rector/UseWithAliasRector.php b/packages/PhpParser/src/Rector/UseWithAliasRector.php deleted file mode 100644 index 967720a5802..00000000000 --- a/packages/PhpParser/src/Rector/UseWithAliasRector.php +++ /dev/null @@ -1,53 +0,0 @@ -alias` to last name in UseAlias Node of PHP-Parser', - [ - new CodeSample('$node->alias;', '$node->getAlias();'), - new CodeSample('$node->name->getLast();', '$node->alias'), - ] - ); - } - - /** - * @return string[] - */ - public function getNodeTypes(): array - { - return [PropertyFetch::class]; - } - - /** - * @param PropertyFetch $node - */ - public function refactor(Node $node): ?Node - { - if (! $this->isObjectType($node->var, 'PhpParser\Node\Stmt\UseUse')) { - return null; - } - - if (! $this->isName($node, 'alias')) { - return null; - } - - $getAliasMethodCall = $this->createMethodCall($node->var, 'getAlias'); - - return $this->createMethodCall($getAliasMethodCall, 'toString'); - } -} diff --git a/packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/CatchAndClosureUseNameRectorTest.php b/packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/CatchAndClosureUseNameRectorTest.php deleted file mode 100644 index 0a7996e868f..00000000000 --- a/packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/CatchAndClosureUseNameRectorTest.php +++ /dev/null @@ -1,19 +0,0 @@ -doTestFiles([__DIR__ . '/Fixture/fixture.php.inc']); - } - - public function getRectorClass(): string - { - return CatchAndClosureUseNameRector::class; - } -} diff --git a/packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/Fixture/fixture.php.inc b/packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/Fixture/fixture.php.inc deleted file mode 100644 index 1fbeaebb3b6..00000000000 --- a/packages/PhpParser/tests/Rector/CatchAndClosureUseNameRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,23 +0,0 @@ -var; - - $string = $closureUseNode->var->name; -} - -?> ------ -var->name; - - $string = $closureUseNode->var->name; -} - -?> diff --git a/packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture.php.inc b/packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture.php.inc deleted file mode 100644 index c5d9cf9e2f4..00000000000 --- a/packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,19 +0,0 @@ -name; -} - -?> ------ -name->toString(); -} - -?> diff --git a/packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture2.php.inc b/packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture2.php.inc deleted file mode 100644 index a6dfbaedbe6..00000000000 --- a/packages/PhpParser/tests/Rector/IdentifierRector/Fixture/fixture2.php.inc +++ /dev/null @@ -1,33 +0,0 @@ -name) { - return 'className'; - } - - return $node->name->toString(); -} - -?> ------ -name->toString()) { - return 'className'; - } - - return $node->name->toString(); -} - -?> diff --git a/packages/PhpParser/tests/Rector/IdentifierRector/IdentifierRectorTest.php b/packages/PhpParser/tests/Rector/IdentifierRector/IdentifierRectorTest.php deleted file mode 100644 index f7baea5dcb4..00000000000 --- a/packages/PhpParser/tests/Rector/IdentifierRector/IdentifierRectorTest.php +++ /dev/null @@ -1,19 +0,0 @@ -doTestFiles([__DIR__ . '/Fixture/fixture.php.inc', __DIR__ . '/Fixture/fixture2.php.inc']); - } - - public function getRectorClass(): string - { - return IdentifierRector::class; - } -} diff --git a/packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/Fixture/fixture.php.inc b/packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/Fixture/fixture.php.inc deleted file mode 100644 index cae4b65c4c5..00000000000 --- a/packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,19 +0,0 @@ -name; -} - -?> ------ -var->name; -} - -?> diff --git a/packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/ParamAndStaticVarNameRectorTest.php b/packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/ParamAndStaticVarNameRectorTest.php deleted file mode 100644 index 7fc44d62dea..00000000000 --- a/packages/PhpParser/tests/Rector/ParamAndStaticVarNameRector/ParamAndStaticVarNameRectorTest.php +++ /dev/null @@ -1,19 +0,0 @@ -doTestFiles([__DIR__ . '/Fixture/fixture.php.inc']); - } - - public function getRectorClass(): string - { - return ParamAndStaticVarNameRector::class; - } -} diff --git a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture.php.inc b/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture.php.inc deleted file mode 100644 index 2bada948dd5..00000000000 --- a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture2.php.inc b/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture2.php.inc deleted file mode 100644 index abdecb7423d..00000000000 --- a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture2.php.inc +++ /dev/null @@ -1,55 +0,0 @@ - ------ - diff --git a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture3.php.inc b/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture3.php.inc deleted file mode 100644 index d0d1888c4b3..00000000000 --- a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture3.php.inc +++ /dev/null @@ -1,37 +0,0 @@ - ------ - diff --git a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture4.php.inc b/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture4.php.inc deleted file mode 100644 index d2cbc695ec9..00000000000 --- a/packages/PhpParser/tests/Rector/RemoveNodeRector/Fixture/fixture4.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/packages/PhpParser/tests/Rector/RemoveNodeRector/RemoveNodeRectorTest.php b/packages/PhpParser/tests/Rector/RemoveNodeRector/RemoveNodeRectorTest.php deleted file mode 100644 index dd6cc266701..00000000000 --- a/packages/PhpParser/tests/Rector/RemoveNodeRector/RemoveNodeRectorTest.php +++ /dev/null @@ -1,24 +0,0 @@ -doTestFiles([ - __DIR__ . '/Fixture/fixture.php.inc', - __DIR__ . '/Fixture/fixture2.php.inc', - __DIR__ . '/Fixture/fixture3.php.inc', - __DIR__ . '/Fixture/fixture4.php.inc', - ]); - } - - public function getRectorClass(): string - { - return RemoveNodeRector::class; - } -} diff --git a/packages/PhpParser/tests/Rector/SetLineRector/Fixture/fixture.php.inc b/packages/PhpParser/tests/Rector/SetLineRector/Fixture/fixture.php.inc deleted file mode 100644 index 1ad5b615be6..00000000000 --- a/packages/PhpParser/tests/Rector/SetLineRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,27 +0,0 @@ -setLine(5); -} - -?> ------ -setAttribute('line', 5); -} - -?> diff --git a/packages/PhpParser/tests/Rector/SetLineRector/SetLineRectorTest.php b/packages/PhpParser/tests/Rector/SetLineRector/SetLineRectorTest.php deleted file mode 100644 index 61b079904ed..00000000000 --- a/packages/PhpParser/tests/Rector/SetLineRector/SetLineRectorTest.php +++ /dev/null @@ -1,19 +0,0 @@ -doTestFiles([__DIR__ . '/Fixture/fixture.php.inc']); - } - - public function getRectorClass(): string - { - return SetLineRector::class; - } -} diff --git a/packages/PhpParser/tests/Rector/UseWithAliasRector/Fixture/fixture.php.inc b/packages/PhpParser/tests/Rector/UseWithAliasRector/Fixture/fixture.php.inc deleted file mode 100644 index fccb6f3872b..00000000000 --- a/packages/PhpParser/tests/Rector/UseWithAliasRector/Fixture/fixture.php.inc +++ /dev/null @@ -1,29 +0,0 @@ -alias; - }, null); -} - -?> ------ -getAlias()->toString(); - }, null); -} - -?> diff --git a/packages/PhpParser/tests/Rector/UseWithAliasRector/UseWithAliasRectorTest.php b/packages/PhpParser/tests/Rector/UseWithAliasRector/UseWithAliasRectorTest.php deleted file mode 100644 index eee56718155..00000000000 --- a/packages/PhpParser/tests/Rector/UseWithAliasRector/UseWithAliasRectorTest.php +++ /dev/null @@ -1,19 +0,0 @@ -doTestFiles([__DIR__ . '/Fixture/fixture.php.inc']); - } - - public function getRectorClass(): string - { - return UseWithAliasRector::class; - } -} diff --git a/src/Rector/AbstractRector/NodeTypeResolverTrait.php b/src/Rector/AbstractRector/NodeTypeResolverTrait.php index 4c6b0cf605d..005123c5584 100644 --- a/src/Rector/AbstractRector/NodeTypeResolverTrait.php +++ b/src/Rector/AbstractRector/NodeTypeResolverTrait.php @@ -2,11 +2,11 @@ namespace Rector\Rector\AbstractRector; -use PhpParser\Node\Expr\Variable; -use PhpParser\Node\Stmt\Class_; use PhpParser\Node; use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Expr\StaticCall; +use PhpParser\Node\Expr\Variable; +use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; use PHPStan\Type\ObjectType; use PHPStan\Type\Type; diff --git a/src/Rector/Annotation/RenameAnnotationRector.php b/src/Rector/Annotation/RenameAnnotationRector.php index e1e8f3aa60a..02ecdb5e3b8 100644 --- a/src/Rector/Annotation/RenameAnnotationRector.php +++ b/src/Rector/Annotation/RenameAnnotationRector.php @@ -2,8 +2,8 @@ namespace Rector\Rector\Annotation; -use PhpParser\Node\Stmt\Class_; use PhpParser\Node; +use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Property; use Rector\NodeTypeResolver\Node\AttributeKey; diff --git a/src/Rector/Argument/ArgumentAdderRector.php b/src/Rector/Argument/ArgumentAdderRector.php index 8a6d9a47c45..71ba56ec32e 100644 --- a/src/Rector/Argument/ArgumentAdderRector.php +++ b/src/Rector/Argument/ArgumentAdderRector.php @@ -2,7 +2,6 @@ namespace Rector\Rector\Argument; -use PhpParser\Node\Stmt\Class_; use PhpParser\BuilderHelpers; use PhpParser\Node; use PhpParser\Node\Arg; @@ -12,6 +11,7 @@ use PhpParser\Node\Expr\Variable; use PhpParser\Node\Identifier; use PhpParser\Node\Name\FullyQualified; use PhpParser\Node\Param; +use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\Rector\AbstractRector;