Use phpunit/php-code-coverage 14.2-dev

Author: sebastianbergmann

composer.json

@@ -26,6 +26,7 @@
         "issues": "https://github.com/sebastianbergmann/phpunit/issues",
         "security": "https://github.com/sebastianbergmann/phpunit/security/policy"
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=8.4.1",
@@ -38,7 +39,7 @@
         "myclabs/deep-copy": "^1.13.4",
         "phar-io/manifest": "^2.0.4",
         "phar-io/version": "^3.2.1",
-        "phpunit/php-code-coverage": "^14.1.6",
+        "phpunit/php-code-coverage": "^14.2",
         "phpunit/php-file-iterator": "^7.0.0",
         "phpunit/php-invoker": "^7.0.0",
         "phpunit/php-text-template": "^6.0.0",

composer.lock

@@ -21,6 +21,7 @@
 use PHPUnit\TextUI\Output\Printer;
 use PHPUnit\Util\Filesystem;
 use SebastianBergmann\CodeCoverage\Driver\Driver;
+use SebastianBergmann\CodeCoverage\Driver\Granularity;
 use SebastianBergmann\CodeCoverage\Driver\Selector;
 use SebastianBergmann\CodeCoverage\Exception as CodeCoverageException;
 use SebastianBergmann\CodeCoverage\Filter;
@@ -489,11 +490,13 @@ private function activate(Filter $filter, bool $pathCoverage): void
     {
         try {
             if ($pathCoverage) {
-                $this->driver = (new Selector)->forLineAndPathCoverage($filter);
+                $granularity = Granularity::LineBranchAndPath;
             } else {
-                $this->driver = (new Selector)->forLineCoverage($filter);
+                $granularity = Granularity::Line;
             }
 
+            $this->driver = (new Selector)->select($filter, $granularity);
+
             $this->codeCoverage = new \SebastianBergmann\CodeCoverage\CodeCoverage(
                 $this->driver,
                 $filter,

src/Runner/CodeCoverage.php

@@ -84,14 +84,20 @@ public function renderForCoverage(string &$job, bool $pathCoverage, ?string $cod
             $codeCoverageCacheDirectory = "'" . $codeCoverageCacheDirectory . "'";
         }
 
+        if ($pathCoverage) {
+            $granularity = 'Granularity::LineBranchAndPath';
+        } else {
+            $granularity = 'Granularity::Line';
+        }
+
         $template->setVar(
             [
                 'bootstrap'                  => $bootstrap,
                 'composerAutoload'           => $composerAutoload,
                 'phar'                       => $phar,
                 'job'                        => $files['job'],
                 'coverageFile'               => $files['coverage'],
-                'driverMethod'               => $pathCoverage ? 'forLineAndPathCoverage' : 'forLineCoverage',
+                'granularity'                => $granularity,
                 'codeCoverageCacheDirectory' => $codeCoverageCacheDirectory,
             ],
         );

src/Runner/Phpt/Renderer.php

@@ -1,5 +1,6 @@
 <?php declare(strict_types=1);
 use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Driver\Granularity;
 use SebastianBergmann\CodeCoverage\Driver\Selector;
 use SebastianBergmann\CodeCoverage\Filter;
 
@@ -28,7 +29,7 @@ if (class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) {
     $__phpunit_filter = new Filter;
 
     $__phpunit_coverage = new CodeCoverage(
-        (new Selector)->{driverMethod}($__phpunit_filter),
+        (new Selector)->select($__phpunit_filter, {granularity}),
         $__phpunit_filter
     );
 

src/Runner/Phpt/templates/phpt.tpl

@@ -23,7 +23,7 @@ Configuration: %s
 
 There was 1 PHPUnit test runner warning:
 
-1) No code coverage driver available
+1) No code coverage driver available that supports line coverage
 
 No tests executed!
 

tests/end-to-end/_files/coverage/coverage-no-tests-when-missing-coverage-driver.phpt

@@ -64,7 +64,7 @@ public function testRenderForCoverageWritesJobFileAndUpdatesJobVariable(): void
         );
 
         $this->assertStringEqualsFile($files['job'], '<?php echo 1;');
-        $this->assertStringContainsString('forLineCoverage', $job);
+        $this->assertStringContainsString('Granularity::Line', $job);
         $this->assertStringContainsString($files['coverage'], $job);
         $this->assertStringContainsString('if (null)', $job);
     }
@@ -82,7 +82,7 @@ public function testRenderForCoverageWithPathCoverage(): void
             $files,
         );
 
-        $this->assertStringContainsString('forLineAndPathCoverage', $job);
+        $this->assertStringContainsString('Granularity::LineBranchAndPath', $job);
     }
 
     public function testRenderForCoverageWithCacheDirectory(): void