Fix Concat operations with variables sebastianbergmann#953

Author: Slamdunk

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -165,6 +165,14 @@ private function getLines(NodeAbstract $node, bool $fromReturns): array
         }
 
         if ($node instanceof BinaryOp) {
+            if ($node instanceof BinaryOp\Concat &&
+                (
+                    $node->left instanceof Node\Expr\Variable ||
+                $node->right instanceof Node\Expr\Variable
+                )) {
+                return [$node->right->getStartLine()];
+            }
+
             return $fromReturns ? $this->getLines($node->right, $fromReturns) : [];
         }
 

tests/_files/source_with_multiline_constant_return.php

@@ -396,7 +396,7 @@ public function unaryLogicalNotWithNotConstInTheMiddle(): bool
     public function unaryMinusWithNotConstInTheMiddle(): float
     {
         return -
-        (
+        (int) (
             ''
             .
             phpversion()
@@ -485,10 +485,30 @@ public function unaryMinusNowdoc(): float
     {
         return
             -
+            (int)
             <<<'EOF'
                 1.
                 2
                 EOF
         ;
     }
+
+    public function concatWithVar(): string
+    {
+        $var1 = 'start';
+
+        $var1 =
+            'right'
+            .
+            $var1
+        ;
+
+        $var1 =
+            $var1
+            .
+            'left'
+        ;
+
+        return $var1;
+    }
 }

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -497,7 +497,13 @@ public function testReturnStatementWithConstantExprOnlyReturnTheLineOfLast(): vo
                 456,
                 466,
                 478,
-                489,
+                490,
+                498,
+                500,
+                503,
+                506,
+                509, // This is correct: not the line with the $var1, but the right operand of the Concat
+                512,
             ],
             array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
         );