Fix concat with var, again

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -204,6 +204,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 [$this->getNodeStartLine($node->right)];
+            }
+
             return $fromReturns ? $this->getLines($node->right, $fromReturns) : [];
         }
 

tests/_files/source_with_multiline_constant_return.php

@@ -565,4 +565,27 @@ public function nestedArrayWithExecutableInKey(): array
             ]
         ];
     }
+
+    public function concatWithVar(): string
+    {
+        $var1 = 'start';
+
+        $var1 =
+            <<<'EOF'
+right
+EOF
+            .
+            $var1
+        ;
+
+        $var1 =
+            $var1
+            .
+            <<<'EOF'
+left
+EOF
+        ;
+
+        return $var1;
+    }
 }

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -538,6 +538,12 @@ public function testReturnStatementWithConstantExprOnlyReturnTheLineOfLast(): vo
                 537,
                 549,
                 562,
+                571,
+                573,
+                578,
+                581,
+                585,
+                589,
             ],
             array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
         );