better fix

Author: mvorisek

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -137,29 +137,24 @@ private function computeReturns(): void
      */
     private function getLines(NodeAbstract $node, bool $fromReturns): array
     {
-        // ugly fix for non-fully AST based processing
-        // self::afterTraverse()/self::computeReturns() should be rewritten using self::leaveNode()
-        if ($node instanceof Array_ && [] !== $node->items) {
-            $parentNode = $node->getAttribute('parent');
-            if ($parentNode instanceof Return_ ||
-                $parentNode instanceof Expression ||
-                $parentNode instanceof Assign ||
-                $parentNode instanceof Array_
-            ) {
-                    return [];
-            }
-        }
-
-        if (!$fromReturns && (
-            $node instanceof Return_ ||
+        if ($node instanceof Return_ ||
             $node instanceof Expression ||
             $node instanceof Assign ||
             $node instanceof Array_
-        )
         ) {
-            $this->returns[] = $node;
+            if (!$fromReturns) {
+                $this->returns[] = $node;
 
-            return [];
+                return [];
+            }
+
+            // ugly fix for non-fully AST based processing
+            // self::afterTraverse()/self::computeReturns() should be rewritten using self::leaveNode()
+            foreach (range($node->getStartLine(), $node->getEndLine()) as $index) {
+                if (isset($this->executableLines[$index])) {
+                    return [];
+                }
+            }
         }
 
         if ($node instanceof Return_) {

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -483,15 +483,11 @@ public function testReturnStatementWithConstantExprOnlyReturnTheLineOfLast(): vo
                 327,
                 340,
                 351,
-                355,
                 370,
                 377,
                 390,
-                392,
                 402,
-                404,
                 414,
-                416,
                 425,
                 437,
                 442,