Extract class

Author: sebastianbergmann

build.xml

@@ -376,11 +376,6 @@
             <arg path="${basedir}/build/tmp/phar" />
         </exec>
 
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Runner/Phpt/templates/phpt.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\CodeCoverage"/>
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Runner/Phpt/templates/phpt.tpl" token="SebastianBergmann\CodeCoverage\Driver\Selector" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\Driver\Selector"/>
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Runner/Phpt/templates/phpt.tpl" token="SebastianBergmann\CodeCoverage\Driver\Granularity" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\Driver\Granularity"/>
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Runner/Phpt/templates/phpt.tpl" token="SebastianBergmann\CodeCoverage\Filter" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\Filter"/>
-
         <exec executable="${basedir}/tools/phpab" taskname="phpab" failonerror="true">
             <arg value="--all" />
             <arg value="--tolerant" />

src/Runner/Phpt/CodeCoverageBootstrapper.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Runner\Phpt;
+
+use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Driver\Granularity;
+use SebastianBergmann\CodeCoverage\Driver\Selector;
+use SebastianBergmann\CodeCoverage\Filter;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final readonly class CodeCoverageBootstrapper
+{
+    /**
+     * @param ?non-empty-string $codeCoverageCacheDirectory
+     */
+    public static function bootstrap(?string $codeCoverageCacheDirectory, bool $pathCoverage): CodeCoverage
+    {
+        $filter = new Filter;
+
+        if ($pathCoverage) {
+            $granularity = Granularity::LineBranchAndPath;
+        } else {
+            $granularity = Granularity::Line;
+        }
+
+        $coverage = new CodeCoverage(
+            (new Selector)->select($filter, $granularity),
+            $filter,
+        );
+
+        if ($codeCoverageCacheDirectory !== null) {
+            $coverage->cacheStaticAnalysis($codeCoverageCacheDirectory);
+        }
+
+        return $coverage;
+    }
+}

src/Runner/Phpt/Renderer.php

@@ -85,9 +85,9 @@ public function renderForCoverage(string &$job, bool $pathCoverage, ?string $cod
         }
 
         if ($pathCoverage) {
-            $granularity = 'Granularity::LineBranchAndPath';
+            $pathCoverageValue = 'true';
         } else {
-            $granularity = 'Granularity::Line';
+            $pathCoverageValue = 'false';
         }
 
         $template->setVar(
@@ -97,7 +97,7 @@ public function renderForCoverage(string &$job, bool $pathCoverage, ?string $cod
                 'phar'                       => $phar,
                 'job'                        => $files['job'],
                 'coverageFile'               => $files['coverage'],
-                'granularity'                => $granularity,
+                'pathCoverage'               => $pathCoverageValue,
                 'codeCoverageCacheDirectory' => $codeCoverageCacheDirectory,
             ],
         );

src/Runner/Phpt/templates/phpt.tpl

@@ -1,8 +1,5 @@
 <?php declare(strict_types=1);
-use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Driver\Granularity;
-use SebastianBergmann\CodeCoverage\Driver\Selector;
-use SebastianBergmann\CodeCoverage\Filter;
+use PHPUnit\Runner\Phpt\CodeCoverageBootstrapper;
 
 $__phpunit_composerAutoload = {composerAutoload};
 $__phpunit_phar             = {phar};
@@ -19,32 +16,21 @@ if ($__phpunit_composerAutoload) {
     require $__phpunit_phar;
 }
 
-$__phpunit_coverage = null;
-
 if ('{bootstrap}' !== '') {
     require_once '{bootstrap}';
 }
 
-if (class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) {
-    $__phpunit_filter = new Filter;
-
-    $__phpunit_coverage = new CodeCoverage(
-        (new Selector)->select($__phpunit_filter, {granularity}),
-        $__phpunit_filter
-    );
-
-    if ({codeCoverageCacheDirectory}) {
-        $__phpunit_coverage->cacheStaticAnalysis({codeCoverageCacheDirectory});
-    }
+$__phpunit_coverage = CodeCoverageBootstrapper::bootstrap({codeCoverageCacheDirectory}, {pathCoverage});
 
+if ($__phpunit_coverage !== null) {
     $__phpunit_coverage->start(__FILE__);
 }
 
 register_shutdown_function(
     function() use ($__phpunit_coverage) {
         $output = null;
 
-        if ($__phpunit_coverage) {
+        if ($__phpunit_coverage !== null) {
             $output = $__phpunit_coverage->stop();
         }
 

tests/unit/Runner/Phpt/RendererTest.php

@@ -64,9 +64,8 @@ public function testRenderForCoverageWritesJobFileAndUpdatesJobVariable(): void
         );
 
         $this->assertStringEqualsFile($files['job'], '<?php echo 1;');
-        $this->assertStringContainsString('Granularity::Line', $job);
+        $this->assertStringContainsString('CodeCoverageBootstrapper::bootstrap(null, false)', $job);
         $this->assertStringContainsString($files['coverage'], $job);
-        $this->assertStringContainsString('if (null)', $job);
     }
 
     public function testRenderForCoverageWithPathCoverage(): void
@@ -82,7 +81,7 @@ public function testRenderForCoverageWithPathCoverage(): void
             $files,
         );
 
-        $this->assertStringContainsString('Granularity::LineBranchAndPath', $job);
+        $this->assertStringContainsString('CodeCoverageBootstrapper::bootstrap(null, true)', $job);
     }
 
     public function testRenderForCoverageWithCacheDirectory(): void
@@ -98,7 +97,7 @@ public function testRenderForCoverageWithCacheDirectory(): void
             $files,
         );
 
-        $this->assertStringContainsString("if ('/tmp/cache')", $job);
+        $this->assertStringContainsString("CodeCoverageBootstrapper::bootstrap('/tmp/cache', false)", $job);
     }
 
     public function testRenderForCoverageWithBootstrap(): void