Fix false positive when exception|match is used in ternary (#79)

* Fix false positive when exception|match is used in ternary * keep yield from
shipmonk-rnd · Feb 1, 2023 · db7af1b · db7af1b
1 parent e15d2d7
commit db7af1b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/src/Visitor/UnusedExceptionVisitor.php b/src/Visitor/UnusedExceptionVisitor.php
@@ -11,7 +11,9 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Expr\Throw_ as ThrowExpr;
+use PhpParser\Node\Expr\Yield_;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Throw_;
 use PhpParser\NodeVisitorAbstract;
@@ -90,6 +92,8 @@ private function isUsed(Node $parent): bool
             || $parent instanceof Coalesce
             || $parent instanceof ArrayItem
             || $parent instanceof NullsafeMethodCall
+            || $parent instanceof Ternary
+            || $parent instanceof Yield_
             || $parent instanceof ThrowExpr;
     }
 

diff --git a/src/Visitor/UnusedMatchVisitor.php b/src/Visitor/UnusedMatchVisitor.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\Match_;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\NullsafeMethodCall;
+use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Expr\Throw_ as ThrowExpr;
 use PhpParser\Node\Expr\Yield_;
 use PhpParser\Node\Expr\YieldFrom;
@@ -80,6 +81,7 @@ private function isUsed(Node $parent): bool
             || $parent instanceof Coalesce
             || $parent instanceof ArrayItem
             || $parent instanceof NullsafeMethodCall
+            || $parent instanceof Ternary
             || $parent instanceof Yield_
             || $parent instanceof YieldFrom
             || $parent instanceof ThrowExpr;

diff --git a/tests/Rule/data/ForbidUnusedExceptionRule/code.php b/tests/Rule/data/ForbidUnusedExceptionRule/code.php
@@ -42,6 +42,16 @@ public function okUsage4(Throwable $throwable): void
         $this->okUsage4($throwable);
     }
 
+    public function okUsage5(bool $decide, ?Throwable $throwable): void
+    {
+        $this->okUsage5($decide, $decide ? new LogicException() : null);
+    }
+
+    public function okUsage6(): \Generator
+    {
+        yield new \OutOfBoundsException();
+    }
+
     public function getExceptionAtRuntime(): RuntimeException
     {
         return new RuntimeException();

diff --git a/tests/Rule/data/ForbidUnusedMatchResultRule/code.php b/tests/Rule/data/ForbidUnusedMatchResultRule/code.php
@@ -34,6 +34,11 @@ public function testUsed(bool $bool): mixed
             true => new RuntimeException(),
         };
 
+        yield from match ($bool) {
+            false => [],
+            true => [],
+        };
+
         try {
             match ($bool) {
                 false => throw new LogicException(),
@@ -46,6 +51,11 @@ public function testUsed(bool $bool): mixed
             1 => $b = 'y',
         };
 
+        $bool ? match ($int) {
+            0 => 'x',
+            1 => 'y',
+        } : null;
+
         return match ($bool) {
             false => 1,
             true => 2,