[DeadCode] Skip return false pseudo type in union on RemoveUselessRet…

…urnTagRector (#5172) * [DeadCode] Skip return false pseudo type in union on RemoveUselessReturnTagRector * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Oct 15, 2023 · e2ba601 · e2ba601
1 parent 9cf016c
commit e2ba601
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/.../ClassMethod/RemoveUselessReturnTagRector/Fixture/skip_return_false_in_union_bool.php.inc b/.../ClassMethod/RemoveUselessReturnTagRector/Fixture/skip_return_false_in_union_bool.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector\Fixture;
+
+final class SkipReturnFalseOnUnionBool
+{
+    /**
+     * @return false|\stdClass
+     */
+    function run(): bool|\stdClass
+    {
+        if (rand(0, 1)) {
+            return false;
+        }
+
+        return new \stdClass();
+    }
+}
diff --git a/rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php
@@ -68,10 +68,10 @@ public function isDead(ReturnTagValueNode $returnTagValueNode, ClassMethod $clas
             return false;
         }
 
-        return ! $this->hasTruePseudoType($returnTagValueNode->type);
+        return ! $this->hasTrueFalsePseudoType($returnTagValueNode->type);
     }
 
-    private function hasTruePseudoType(BracketsAwareUnionTypeNode $bracketsAwareUnionTypeNode): bool
+    private function hasTrueFalsePseudoType(BracketsAwareUnionTypeNode $bracketsAwareUnionTypeNode): bool
     {
         $unionTypes = $bracketsAwareUnionTypeNode->types;
 
@@ -81,7 +81,7 @@ private function hasTruePseudoType(BracketsAwareUnionTypeNode $bracketsAwareUnio
             }
 
             $name = strtolower((string) $unionType);
-            if ($name === 'true') {
+            if (in_array($name, ['true', 'false'], true)) {
                 return true;
             }
         }

diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\DeadCode\Rector\If_;
 
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
@@ -203,7 +204,7 @@ private function refactorIf(If_ $if, Scope $scope): ?Foreach_
 
     private function shouldSkipForeachExpr(Expr $foreachExpr, Scope $scope): bool
     {
-        if ($foreachExpr instanceof Expr\ArrayDimFetch && $foreachExpr->dim !== null) {
+        if ($foreachExpr instanceof ArrayDimFetch && $foreachExpr->dim !== null) {
             $exprType = $this->nodeTypeResolver->getNativeType($foreachExpr->var);
             $dimType = $this->nodeTypeResolver->getNativeType($foreachExpr->dim);
             if (! $exprType->hasOffsetValueType($dimType)->yes()) {