[DeadCode] Ensure no stmts check on RemovePhpVersionIdCheckRector (#2260

) * [DeadCode] Ensure no stmts check on RemovePhpVersionIdCheckRector * [DeadCode] Ensure no stmts check on RemovePhpVersionIdCheckRector * Fixed 🎉 * more fixture
rectorphp · May 7, 2022 · fb8260c · fb8260c
1 parent 2dd8c6b
commit fb8260c
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 37 deletions.
diff --git a/...s-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/Fixture/no_stmts.php.inc b/...s-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/Fixture/no_stmts.php.inc
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector\Fixture;
+
+class NoStmts
+{
+    public function run()
+    {
+        if (PHP_VERSION_ID > 80000) {
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector\Fixture;
+
+class NoStmts
+{
+    public function run()
+    {
+    }
+}
+
+?>
diff --git a/...-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/Fixture/no_stmts2.php.inc b/...-tests/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector/Fixture/no_stmts2.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector\Fixture;
+
+class NoStmts2
+{
+    public function run()
+    {
+        if (80000 > PHP_VERSION_ID) {
+
+        }
+
+        echo 'do something';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector\Fixture;
+
+class NoStmts2
+{
+    public function run()
+    {
+        echo 'do something';
+    }
+}
+
+?>
diff --git a/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php b/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php
@@ -96,9 +96,9 @@ public function getNodeTypes(): array
 
     /**
      * @param If_ $node
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    public function refactor(Node $node): ?array
+    public function refactor(Node $node): null|If_|array
     {
         /**
          * $this->phpVersionProvider->provide() fallback is here as $currentFileProvider must be accessed after initialization
@@ -128,9 +128,9 @@ public function refactor(Node $node): ?array
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    private function processSmaller(ConstFetch $constFetch, Smaller $smaller, If_ $if): ?array
+    private function processSmaller(ConstFetch $constFetch, Smaller $smaller, If_ $if): null|If_|array
     {
         if ($smaller->left === $constFetch) {
             return $this->processSmallerLeft($smaller, $if);
@@ -144,13 +144,13 @@ private function processSmaller(ConstFetch $constFetch, Smaller $smaller, If_ $i
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
     private function processGreaterOrEqual(
         ConstFetch $constFetch,
         GreaterOrEqual $greaterOrEqual,
         If_ $if,
-    ): ?array {
+    ): null|If_|array {
         if ($greaterOrEqual->left === $constFetch) {
             return $this->processGreaterOrEqualLeft($greaterOrEqual, $if);
         }
@@ -162,10 +162,7 @@ private function processGreaterOrEqual(
         return null;
     }
 
-    /**
-     * @return null
-     */
-    private function processSmallerLeft(Smaller $smaller, If_ $if)
+    private function processSmallerLeft(Smaller $smaller, If_ $if): ?If_
     {
         $value = $smaller->right;
         if (! $value instanceof LNumber) {
@@ -174,49 +171,57 @@ private function processSmallerLeft(Smaller $smaller, If_ $if)
 
         if ($this->phpVersion >= $value->value) {
             $this->removeNode($if);
+            return $if;
         }
 
         return null;
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    private function processSmallerRight(Smaller $smaller, If_ $if): ?array
+    private function processSmallerRight(Smaller $smaller, If_ $if): null|If_|array
     {
         $value = $smaller->left;
         if (! $value instanceof LNumber) {
             return null;
         }
 
-        if ($this->phpVersion >= $value->value) {
-            return $if->stmts;
+        if ($this->phpVersion < $value->value) {
+            return null;
         }
 
-        return null;
+        if ($if->stmts === []) {
+            $this->removeNode($if);
+            return $if;
+        }
+
+        return $if->stmts;
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    private function processGreaterOrEqualLeft(GreaterOrEqual $greaterOrEqual, If_ $if): array|null
+    private function processGreaterOrEqualLeft(GreaterOrEqual $greaterOrEqual, If_ $if): null|If_|array
     {
         $value = $greaterOrEqual->right;
         if (! $value instanceof LNumber) {
             return null;
         }
 
-        if ($this->phpVersion >= $value->value) {
-            return $if->stmts;
+        if ($this->phpVersion < $value->value) {
+            return null;
         }
 
-        return null;
+        if ($if->stmts === []) {
+            $this->removeNode($if);
+            return $if;
+        }
+
+        return $if->stmts;
     }
 
-    /**
-     * @return null
-     */
-    private function processGreaterOrEqualRight(GreaterOrEqual $greaterOrEqual, If_ $if)
+    private function processGreaterOrEqualRight(GreaterOrEqual $greaterOrEqual, If_ $if): ?If_
     {
         $value = $greaterOrEqual->left;
         if (! $value instanceof LNumber) {
@@ -225,15 +230,16 @@ private function processGreaterOrEqualRight(GreaterOrEqual $greaterOrEqual, If_
 
         if ($this->phpVersion >= $value->value) {
             $this->removeNode($if);
+            return $if;
         }
 
         return null;
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    private function processGreater(ConstFetch $constFetch, Greater $greater, If_ $if): ?array
+    private function processGreater(ConstFetch $constFetch, Greater $greater, If_ $if): null|If_|array
     {
         if ($greater->left === $constFetch) {
             return $this->processGreaterLeft($greater, $if);
@@ -247,26 +253,28 @@ private function processGreater(ConstFetch $constFetch, Greater $greater, If_ $i
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    private function processGreaterLeft(Greater $greater, If_ $if): ?array
+    private function processGreaterLeft(Greater $greater, If_ $if): null|If_|array
     {
         $value = $greater->right;
         if (! $value instanceof LNumber) {
             return null;
         }
 
-        if ($this->phpVersion >= $value->value) {
-            return $if->stmts;
+        if ($this->phpVersion < $value->value) {
+            return null;
         }
 
-        return null;
+        if ($if->stmts === []) {
+            $this->removeNode($if);
+            return $if;
+        }
+
+        return $if->stmts;
     }
 
-    /**
-     * @return null
-     */
-    private function processGreaterRight(Greater $greater, If_ $if)
+    private function processGreaterRight(Greater $greater, If_ $if): ?If_
     {
         $value = $greater->left;
         if (! $value instanceof LNumber) {
@@ -275,15 +283,16 @@ private function processGreaterRight(Greater $greater, If_ $if)
 
         if ($this->phpVersion >= $value->value) {
             $this->removeNode($if);
+            return $if;
         }
 
         return null;
     }
 
     /**
-     * @return Stmt[]|null
+     * @return null|If_|Stmt[]
      */
-    private function refactorConstFetch(ConstFetch $constFetch, If_ $if, BinaryOp $binaryOp): ?array
+    private function refactorConstFetch(ConstFetch $constFetch, If_ $if, BinaryOp $binaryOp): null|If_|array
     {
         if ($binaryOp instanceof Smaller) {
             return $this->processSmaller($constFetch, $binaryOp, $if);