Future compat

Author: dvdoug

src/Extension.php

@@ -19,6 +19,7 @@
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverAvailableException;
 use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverWithPathCoverageSupportAvailableException;
+use SebastianBergmann\CodeCoverage\NoSupportedDriverAvailableException;
 use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\FileLocator;
@@ -233,7 +234,7 @@ public function process(ContainerBuilder $container): void
                 $filterDefinition = $container->getDefinition(Filter::class);
                 $codeCoverageDefinition->setFactory([new Reference(self::class), 'initCodeCoverage']);
                 $codeCoverageDefinition->setArguments([$filterDefinition, $filterConfig, $branchPathConfig, $cacheDir, $output]);
-            } catch (NoCodeCoverageDriverAvailableException|XdebugNotEnabledException|XdebugNotAvailableException $e) {
+            } catch (NoSupportedDriverAvailableException|NoCodeCoverageDriverAvailableException|XdebugNotEnabledException|XdebugNotAvailableException $e) {
                 $output->writeln("<comment>{$e->getMessage()}</comment>");
                 $canCollectCodeCoverage = false;
             }
@@ -279,7 +280,7 @@ public function initCodeCoverage(Filter $filter, array $filterConfig, ?bool $bra
         if ($branchPathConfig !== false) {
             try {
                 $driver = $selector->forLineAndPathCoverage($filter);
-            } catch (NoCodeCoverageDriverWithPathCoverageSupportAvailableException|XdebugNotAvailableException|XdebugNotEnabledException $e) {
+            } catch (NoSupportedDriverAvailableException|NoCodeCoverageDriverWithPathCoverageSupportAvailableException|XdebugNotAvailableException|XdebugNotEnabledException $e) {
                 // fallback driver is already set
                 if ($branchPathConfig === true) { // only warn if explicitly enabled
                     $output->writeln(sprintf('<info>%s does not support collecting branch and path data</info>', $driver->nameAndVersion()));

tests/ExtensionTest.php

@@ -17,11 +17,13 @@
 use ReflectionClass;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Driver\Driver;
+use SebastianBergmann\CodeCoverage\Driver\Granularity;
 use SebastianBergmann\CodeCoverage\Driver\Selector;
 use SebastianBergmann\CodeCoverage\Driver\Xdebug2NotEnabledException;
 use SebastianBergmann\CodeCoverage\Driver\Xdebug3NotEnabledException;
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\NoCodeCoverageDriverAvailableException;
+use SebastianBergmann\CodeCoverage\NoSupportedDriverAvailableException;
 use Symfony\Component\Config\Definition\NodeInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -30,6 +32,7 @@
 
 use function dirname;
 use function sys_get_temp_dir;
+use function class_exists;
 
 class ExtensionTest extends TestCase
 {
@@ -73,7 +76,7 @@ public function testContainerBuildsIncludingCoveredFiles(): void
         try {
             $selector = new Selector();
             $selector->forLineCoverage(new Filter());
-        } catch (NoCodeCoverageDriverAvailableException|Xdebug2NotEnabledException|Xdebug3NotEnabledException $e) {
+        } catch (NoSupportedDriverAvailableException|NoCodeCoverageDriverAvailableException|Xdebug2NotEnabledException|Xdebug3NotEnabledException $e) {
             $this->markTestSkipped('Requires code coverage enabled');
         }
 
@@ -129,7 +132,7 @@ public function testContainerBuildsExcludingCoveredFiles(): void
         try {
             $selector = new Selector();
             $selector->forLineCoverage(new Filter());
-        } catch (NoCodeCoverageDriverAvailableException|Xdebug2NotEnabledException|Xdebug3NotEnabledException $e) {
+        } catch (NoSupportedDriverAvailableException|NoCodeCoverageDriverAvailableException|Xdebug2NotEnabledException|Xdebug3NotEnabledException $e) {
             $this->markTestSkipped('Requires code coverage enabled');
         }
 
@@ -279,7 +282,11 @@ public function testContainerBuildsWithCoverageUnavailable(): void
         );
 
         $extension = $this->createPartialMock(Extension::class, ['initCodeCoverage']);
-        $extension->method('initCodeCoverage')->willThrowException(new NoCodeCoverageDriverAvailableException());
+        if (class_exists(NoSupportedDriverAvailableException::class)) {
+            $extension->method('initCodeCoverage')->willThrowException(new NoSupportedDriverAvailableException(Granularity::Line));
+        } else {
+            $extension->method('initCodeCoverage')->willThrowException(new NoCodeCoverageDriverAvailableException());
+        }
 
         $extension->process($container);