Closes sebastianbergmann#1091

Author: sebastianbergmann

ChangeLog-12.3.md

@@ -2,6 +2,12 @@
 
 All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [12.3.6] - 2025-MM-DD
+
+### Fixed
+
+* [#1091](https://github.com/sebastianbergmann/php-code-coverage/issues/1091): HTML report renderer uses code coverage driver
+
 ## [12.3.5] - 2025-09-01
 
 ### Changed
@@ -44,6 +50,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 
 * [#1080](https://github.com/sebastianbergmann/php-code-coverage/pull/1080): Support for reporting code coverage information in OpenClover XML format; unlike the existing Clover XML reporter, which remains unchanged, the XML documents generated by this new reporter validate against the OpenClover project's XML schema definition, with one exception: we do not generate the `<testproject>` element. This feature is experimental and the generated XML might change in order to improve compliance with the OpenClover project's XML schema definition further. Such changes will be made in bugfix and/or minor releases even if they break backward compatibility.
 
+[12.3.6]: https://github.com/sebastianbergmann/php-code-coverage/compare/12.3.5...main
 [12.3.5]: https://github.com/sebastianbergmann/php-code-coverage/compare/12.3.4...12.3.5
 [12.3.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/12.3.3...12.3.4
 [12.3.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/12.3.2...12.3.3

src/CodeCoverage.php

@@ -68,6 +68,7 @@ final class CodeCoverage
     private ?FileAnalyser $analyser                                         = null;
     private ?string $cacheDirectory                                         = null;
     private ?Directory $cachedReport                                        = null;
+    private bool $collectBranchAndPathCoverage                              = false;
 
     public function __construct(Driver $driver, Filter $filter)
     {
@@ -384,16 +385,20 @@ public function excludeSubclassesOfThisClassFromUnintentionallyCoveredCodeCheck(
     public function enableBranchAndPathCoverage(): void
     {
         $this->driver->enableBranchAndPathCoverage();
+
+        $this->collectBranchAndPathCoverage = true;
     }
 
     public function disableBranchAndPathCoverage(): void
     {
         $this->driver->disableBranchAndPathCoverage();
+
+        $this->collectBranchAndPathCoverage = false;
     }
 
     public function collectsBranchAndPathCoverage(): bool
     {
-        return $this->driver->collectsBranchAndPathCoverage();
+        return $this->collectBranchAndPathCoverage;
     }
 
     public function validate(TargetCollection $targets): ValidationResult

tests/src/TestCase.php

@@ -1083,8 +1083,6 @@ protected function getPathCoverageForBankAccount(): CodeCoverage
 
         $stub = $this->createStub(Driver::class);
 
-        $stub->method('collectsBranchAndPathCoverage')->willReturn(true);
-
         $stub->method('stop')
             ->willReturn(...$data);
 
@@ -1093,6 +1091,8 @@ protected function getPathCoverageForBankAccount(): CodeCoverage
 
         $coverage = new CodeCoverage($stub, $filter);
 
+        $coverage->enableBranchAndPathCoverage();
+
         $coverage->start(
             'BankAccountTest::testBalanceIsInitiallyZero',
             null,
@@ -1162,8 +1162,6 @@ protected function getPathCoverageForSourceWithoutNamespace(): CodeCoverage
 
         $stub = $this->createStub(Driver::class);
 
-        $stub->method('collectsBranchAndPathCoverage')->willReturn(true);
-
         $stub->method('stop')
             ->willReturn(...$data);
 
@@ -1172,6 +1170,8 @@ protected function getPathCoverageForSourceWithoutNamespace(): CodeCoverage
 
         $coverage = new CodeCoverage($stub, $filter);
 
+        $coverage->enableBranchAndPathCoverage();
+
         $coverage->start(
             'faketest',
             null,
@@ -1472,6 +1472,8 @@ protected function getPathCoverageForBankAccountForFirstTwoTests(): CodeCoverage
 
         $coverage = new CodeCoverage($stub, $filter);
 
+        $coverage->enableBranchAndPathCoverage();
+
         $coverage->start(
             'BankAccountTest::testBalanceIsInitiallyZero',
             null,
@@ -1519,6 +1521,8 @@ protected function getPathCoverageForBankAccountForLastTwoTests(): CodeCoverage
 
         $coverage = new CodeCoverage($stub, $filter);
 
+        $coverage->enableBranchAndPathCoverage();
+
         $coverage->start(
             'BankAccountTest::testBalanceCannotBecomeNegative2',
         );