From 5eedea88aeb29cd8c3a834a7cd2e0c9734c11726 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Sat, 12 Aug 2017 13:43:13 +0200 Subject: [PATCH] change PropertyRector to InjectPropertyRector --- README.md | 12 +++++-- .../Contrib/Nette/FormCallbackRector.php | 6 ++-- .../Contrib/Nette/InjectPropertyRector.php} | 31 +++++++++++-------- 3 files changed, 31 insertions(+), 18 deletions(-) rename src/{NodeVisitor/DependencyInjection/InjectAnnotationToConstructor/PropertyRector.php => Rector/Contrib/Nette/InjectPropertyRector.php} (87%) diff --git a/README.md b/README.md index 6c337dac86b..79533042cde 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,16 @@ This tool will *reconstruct* (change) your code - **run it only in a new clean g ## All Reconstructors -- `InjectAnnotationToConstructorNodeTraverser` ([Nette](https://github.com/nette/)) -- `NamedServicesToConstructorNodeTraverser` ([Symfony](https://github.com/symfony/)) +### [Nette](https://github.com/nette/) + +- `FormCallbackRector` +- `InjectPropertyRector` +- `NetteObjectToSmartTraitRector` +- `RemoveConfiguratorConstantsRector` + +### [Symfony](https://github.com/symfony/) + +- `NamedServicesToConstructorNodeTraverser` ## Install diff --git a/src/Rector/Contrib/Nette/FormCallbackRector.php b/src/Rector/Contrib/Nette/FormCallbackRector.php index f530b9912ca..398b1802bc8 100644 --- a/src/Rector/Contrib/Nette/FormCallbackRector.php +++ b/src/Rector/Contrib/Nette/FormCallbackRector.php @@ -13,7 +13,7 @@ use Rector\Contract\Deprecation\DeprecationInterface; use Rector\Deprecation\SetNames; /** - * Covers https://doc.nette.org/en/2.4/migration-2-4#toc-nette-smartobject + * Covers https://doc.nette.org/en/2.4/migration-2-4#toc-nette-smartobject. */ final class FormCallbackRector extends NodeVisitorAbstract implements DeprecationInterface { @@ -80,9 +80,9 @@ final class FormCallbackRector extends NodeVisitorAbstract implements Deprecatio new String_( (string) $node->name ) - ) + ), ], [ - 'kind' => Array_::KIND_SHORT + 'kind' => Array_::KIND_SHORT, ]); } } diff --git a/src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructor/PropertyRector.php b/src/Rector/Contrib/Nette/InjectPropertyRector.php similarity index 87% rename from src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructor/PropertyRector.php rename to src/Rector/Contrib/Nette/InjectPropertyRector.php index 4fcd152239e..884fece37a6 100644 --- a/src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructor/PropertyRector.php +++ b/src/Rector/Contrib/Nette/InjectPropertyRector.php @@ -1,17 +1,18 @@ isCandidate($node)) { - return null; - } - - return $this->reconstructProperty($node); - } - public function isCandidate(Node $node): bool { if (! $node instanceof Property) { @@ -80,7 +72,10 @@ final class PropertyRector extends NodeVisitorAbstract return true; } - private function reconstructProperty(Property $propertyNode): Property + /** + * @param Property $propertyNode + */ + public function refactor($propertyNode): Node { $propertyDocBlock = $this->createDocBlockFromNode($propertyNode); $propertyNode = $this->removeInjectAnnotationFromProperty($propertyNode, $propertyDocBlock); @@ -92,6 +87,16 @@ final class PropertyRector extends NodeVisitorAbstract return $propertyNode; } + public function getSetName(): string + { + return SetNames::NETTE; + } + + public function sinceVersion(): float + { + return 2.1; + } + private function hasInjectAnnotation(Property $propertyNode): bool { $propertyDocBlock = $this->createDocBlockFromNode($propertyNode);