Make the codepath for Xdebug < 2.9.6 explicit

Author: dvdoug

src/Driver/XdebugDriver.php

@@ -18,6 +18,11 @@
  */
 final class XdebugDriver extends Driver
 {
+    /**
+     * @var bool
+     */
+    private $pathCoverageIsMixedCoverage;
+
     /**
      * @throws RuntimeException
      */
@@ -35,6 +40,8 @@ public function __construct(Filter $filter)
             \xdebug_set_filter(\XDEBUG_FILTER_CODE_COVERAGE, \XDEBUG_PATH_WHITELIST, $filter->getWhitelist());
         }
 
+        $this->pathCoverageIsMixedCoverage = \version_compare(\phpversion('xdebug'), '2.9.6', '<');
+
         $this->enableDeadCodeDetection();
     }
 
@@ -70,6 +77,10 @@ public function stop(): RawCodeCoverageData
         \xdebug_stop_code_coverage();
 
         if ($this->collectsBranchAndPathCoverage()) {
+            if ($this->pathCoverageIsMixedCoverage) {
+                return RawCodeCoverageData::fromXdebugWithMixedCoverage($data);
+            }
+
             return RawCodeCoverageData::fromXdebugWithPathCoverage($data);
         }
 

src/RawCodeCoverageData.php

@@ -41,6 +41,22 @@ public static function fromXdebugWithPathCoverage(array $rawCoverage): self
         $lineCoverage     = [];
         $functionCoverage = [];
 
+        foreach ($rawCoverage as $file => $fileCoverageData) {
+            $lineCoverage[$file]     = $fileCoverageData['lines'];
+            $functionCoverage[$file] = $fileCoverageData['functions'];
+        }
+
+        return new self($lineCoverage, $functionCoverage);
+    }
+
+    /**
+     * @deprecated
+     */
+    public static function fromXdebugWithMixedCoverage(array $rawCoverage): self
+    {
+        $lineCoverage     = [];
+        $functionCoverage = [];
+
         foreach ($rawCoverage as $file => $fileCoverageData) {
             if (!isset($fileCoverageData['functions'])) {
                 // Current file does not have functions, so line coverage

tests/tests/RawCodeCoverageDataTest.php

@@ -30,8 +30,7 @@ public function testLineDataFromStandardXDebugFormat(): void
     }
 
     /**
-     * In the path-coverage XDebug format, the line data exists inside a "lines" array key where the file has
-     * classes or functions. For files without them, the data is stored in the line-only format.
+     * In the path-coverage XDebug format, the line data exists inside a "lines" array key.
      */
     public function testLineDataFromPathCoverageXDebugFormat(): void
     {
@@ -46,6 +45,53 @@ public function testLineDataFromPathCoverageXDebugFormat(): void
 
                 ],
             ],
+            '/some/path/justAScript.php' => [
+                'lines' => [
+                    18  => 1,
+                    19  => -2,
+                    113 => -1,
+                ],
+                'functions' => [
+
+                ],
+            ],
+        ];
+
+        $lineData = [
+            '/some/path/SomeClass.php' => [
+                8  => 1,
+                9  => -2,
+                13 => -1,
+            ],
+            '/some/path/justAScript.php' => [
+                18  => 1,
+                19  => -2,
+                113 => -1,
+            ],
+        ];
+
+        $dataObject = RawCodeCoverageData::fromXdebugWithPathCoverage($rawDataFromDriver);
+
+        $this->assertEquals($lineData, $dataObject->lineCoverage());
+    }
+
+    /**
+     * In the path-coverage XDebug format for Xdebug < 2.9.6, the line data exists inside a "lines" array key where the
+     * file has classes or functions. For files without them, the data is stored in the line-only format.
+     */
+    public function testLineDataFromMixedCoverageXDebugFormat(): void
+    {
+        $rawDataFromDriver = [
+            '/some/path/SomeClass.php' => [
+                'lines' => [
+                    8  => 1,
+                    9  => -2,
+                    13 => -1,
+                ],
+                'functions' => [
+
+                ],
+            ],
             '/some/path/justAScript.php' => [
                 18  => 1,
                 19  => -2,
@@ -66,7 +112,7 @@ public function testLineDataFromPathCoverageXDebugFormat(): void
             ],
         ];
 
-        $dataObject = RawCodeCoverageData::fromXdebugWithPathCoverage($rawDataFromDriver);
+        $dataObject = RawCodeCoverageData::fromXdebugWithMixedCoverage($rawDataFromDriver);
 
         $this->assertEquals($lineData, $dataObject->lineCoverage());
     }