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

Author: kayw-geek

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -137,9 +137,11 @@ private function getLines(Node $node): array
     {
         if ($node instanceof BinaryOp) {
             if (($node->left instanceof Node\Scalar ||
-                $node->left instanceof Node\Expr\ConstFetch) &&
+                $node->left instanceof Node\Expr\ConstFetch ||
+                    $node->left instanceof Node\Expr\Variable) &&
                 ($node->right instanceof Node\Scalar ||
-                $node->right instanceof Node\Expr\ConstFetch)) {
+                $node->right instanceof Node\Expr\ConstFetch
+                || $node->right instanceof Node\Expr\Variable)) {
                 return [$node->right->getStartLine()];
             }
 

tests/_files/source_with_multiline_constant_return.php

@@ -244,4 +244,17 @@ public function Spaceship(): int
             1
         ;
     }
+
+    public function VariableInArray(): int
+    {
+        $n = 1;
+
+        return
+            [
+                2 + $n,
+                $n ,
+                2 . $n,
+            ]
+            ;
+    }
 }

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -417,6 +417,9 @@ public function testReturnStatementWithConstantExprOnlyReturnTheLineOfLast(): vo
                 226,
                 235,
                 244,
+                250,
+                254,
+                256,
             ],
             array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
         );