Fix return with multiline variable in array and with expr not be coverage

Author: kayw-geek

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -172,8 +172,43 @@ private function getLines(Node $node): array
                 return [$node->getEndLine()];
             }
 
-            if ($node->items[0] instanceof ArrayItem) {
-                return [$node->items[0]->getStartLine()];
+            $lines = [];
+
+            foreach ($node->items as $index => $item) {
+                if ($index === 0) {
+                    $lines[] = $item->getStartLine();
+
+                    continue;
+                }
+
+                if ($item->key instanceof BinaryOp || $item->value instanceof BinaryOp) {
+                    continue;
+                }
+
+                if ($item->key instanceof Node\Expr\Variable ||
+                    $item->key instanceof Node\Expr\ClassConstFetch
+                ) {
+                    $lines[] = $item->key->getStartLine();
+
+                    continue;
+                }
+
+                if ($item->value instanceof Node\Expr\Variable ||
+                    $item->value instanceof Node\Expr\ClassConstFetch
+                ) {
+                    $lines[] = $item->value->getStartLine();
+
+                    continue;
+                }
+            }
+
+            return $lines;
+        }
+
+        if ($node instanceof ArrayItem) {
+            if (($node->left instanceof Node\Expr\Variable && !$node->right instanceof Node\Expr\BinaryOp) ||
+                ($node->right instanceof Node\Expr\Variable && !$node->left instanceof Node\Expr\BinaryOp)) {
+                return [$node->left->getStartLine()];
             }
         }
 

tests/_files/source_with_multiline_constant_return.php

@@ -244,4 +244,5 @@ public function Spaceship(): int
             1
         ;
     }
+
 }

tests/_files/source_with_return_array_with_variable_or_class_const.php

@@ -0,0 +1,21 @@
+<?php
+namespace SebastianBergmann\CodeCoverage\TestFixture;
+
+class Foo
+{
+    private const BAR = 'bar';
+
+    public function one(): array
+    {
+        $name = 'Rain';
+        $number = 2;
+        return [
+            $name,
+            $name => $number,
+            $name . '2' => $number + 2,
+            $number,
+            self::BAR,
+            self::BAR .'2',
+        ];
+    }
+}

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -384,6 +384,23 @@ public function testReturnStatementWithOnlyAnArrayWithScalarReturnsTheFirstEleme
         );
     }
 
+    public function testReturnArrayWithVariableOrClassConst(): void
+    {
+        $file = TEST_FILES_PATH . 'source_with_return_array_with_variable_or_class_const.php';
+
+        $this->assertEquals(
+            [
+                10,
+                11,
+                13,
+                14,
+                16,
+                17,
+            ],
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
+        );
+    }
+
     public function testReturnStatementWithConstantExprOnlyReturnTheLineOfLast(): void
     {
         $file = TEST_FILES_PATH . 'source_with_multiline_constant_return.php';