[ci-review] Rector Rectify

rectorphp · Mar 19, 2021 · 02cf396 · 02cf396
1 parent c8f532c
commit 02cf396
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 17 deletions.
diff --git a/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php b/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php
@@ -69,7 +69,7 @@ public function getNodeTypes(): array
     /**
      * @param FuncCall $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): FuncCall
     {
         foreach ($this->functionArgumentSwaps as $functionArgumentSwap) {
             if (! $this->isName($node, $functionArgumentSwap->getFunction())) {

diff --git a/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php b/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php
@@ -57,7 +57,7 @@ public function getNodeTypes(): array
     /**
      * @param NotEqual $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): NotEqual
     {
         // invoke override to default "!="
         $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);

diff --git a/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php b/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php
@@ -93,7 +93,7 @@ public function getNodeTypes(): array
     /**
      * @param ClassMethod $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): ClassMethod
     {
         foreach ($this->methodsByType as $type => $methods) {
             if (! $this->isObjectType($node, new ObjectType($type))) {

diff --git a/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php b/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php
@@ -65,7 +65,7 @@ public function getNodeTypes(): array
     /**
      * @param String_ $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): String_
     {
         $doubleQuoteCount = substr_count($node->value, '"');
         $singleQuoteCount = substr_count($node->value, "'");

diff --git a/...ctrineCodeQuality/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php b/...ctrineCodeQuality/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php
@@ -116,7 +116,7 @@ public function getNodeTypes(): array
     /**
      * @param Class_ $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Class_
     {
         foreach ($node->getProperties() as $property) {
             $this->refactorProperty($property, $node);

diff --git a/...s/DoctrineCodeQuality/Rector/Class_/RemoveRedundantDefaultClassAnnotationValuesRector.php b/...s/DoctrineCodeQuality/Rector/Class_/RemoveRedundantDefaultClassAnnotationValuesRector.php
@@ -70,7 +70,7 @@ public function getNodeTypes(): array
     /**
      * @param Class_ $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Class_
     {
         if ($node instanceof Class_) {
             $this->refactorClassAnnotations($node);

diff --git a/...trineCodeQuality/Rector/Property/RemoveRedundantDefaultPropertyAnnotationValuesRector.php b/...trineCodeQuality/Rector/Property/RemoveRedundantDefaultPropertyAnnotationValuesRector.php
@@ -102,7 +102,7 @@ public function getNodeTypes(): array
     /**
      * @param Property $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Property
     {
         if ($node instanceof Property) {
             $this->refactorPropertyAnnotations($node);

diff --git a/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php b/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php
@@ -54,7 +54,7 @@ public function getNodeTypes(): array
     /**
      * @param ClassConst $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): ClassConst
     {
         $this->visibilityManipulator->removeVisibility($node);
 

diff --git a/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php b/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php
@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrowFunction;
+use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Stmt\Return_;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Php72\NodeFactory\AnonymousFunctionFactory;
@@ -71,7 +72,7 @@ public function getNodeTypes(): array
     /**
      * @param ArrowFunction $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Closure
     {
         $stmts = [new Return_($node->expr)];
 

diff --git a/rules/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector.php b/rules/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector.php
@@ -46,7 +46,7 @@ public function getNodeTypes(): array
     /**
      * @param AssignCoalesce $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Assign
     {
         return new Assign($node->var, new Coalesce($node->var, $node->expr));
     }

diff --git a/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php b/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php
@@ -47,7 +47,7 @@ public function getNodeTypes(): array
     /**
      * @param NullsafeMethodCall|NullsafePropertyFetch $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Ternary
     {
         $called = $node instanceof NullsafeMethodCall
             ? new MethodCall($node->var, $node->name, $node->args)

diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php
@@ -56,7 +56,7 @@ public function getNodeTypes(): array
     /**
      * @param FuncCall $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): FuncCall
     {
         if ($this->isName($node, 'mysql_create_db')) {
             return $this->processMysqlCreateDb($node);

diff --git a/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php b/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php
@@ -69,7 +69,7 @@ public function getNodeTypes(): array
     /**
      * @param Switch_ $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Switch_
     {
         foreach ($node->cases as $case) {
             foreach ($case->stmts as $key => $caseStmt) {

diff --git a/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php b/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php
@@ -53,7 +53,7 @@ public function getNodeTypes(): array
     /**
      * @param FuncCall $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): FuncCall
     {
         foreach ($node->args as $nodeArg) {
             if ($nodeArg->byRef) {

diff --git a/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php b/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php
@@ -133,7 +133,7 @@ public function getNodeTypes(): array
     /**
      * @param Class_ $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): Class_
     {
         $this->matchedObjectTypes = [];
 

diff --git a/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php b/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php
@@ -71,7 +71,7 @@ public function getNodeTypes(): array
     /**
      * @param ClassConstFetch $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): ClassConstFetch
     {
         foreach ($this->renameClassConstFetches as $renameClassConstFetch) {
             if (! $this->isObjectType($node->class, $renameClassConstFetch->getOldObjectType())) {

diff --git a/rules/Renaming/Rector/ConstFetch/RenameConstantRector.php b/rules/Renaming/Rector/ConstFetch/RenameConstantRector.php
@@ -72,7 +72,7 @@ public function getNodeTypes(): array
     /**
      * @param ConstFetch $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): ConstFetch
     {
         foreach ($this->oldToNewConstants as $oldConstant => $newConstant) {
             if (! $this->isName($node, $oldConstant)) {