Switch to PHP config

Author: dvdoug

.php-cs-fixer.dist.php

@@ -34,6 +34,7 @@
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
+            ->in(__DIR__ . '/config')
             ->in(__DIR__ . '/features')
             ->in(__DIR__ . '/src')
             ->in(__DIR__ . '/tests')

config/services.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Behat Code Coverage
+ */
+declare(strict_types=1);
+
+use SebastianBergmann\CodeCoverage\CodeCoverage;
+use SebastianBergmann\CodeCoverage\Filter;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->defaults()
+        ->bind('$reportConfig', '%behat.code_coverage.config.reports%')
+        ->autowire()
+        ->autoconfigure()
+        ->private();
+
+    $services->load('DVDoug\\Behat\\CodeCoverage\\', __DIR__ . '/../src');
+
+    // Register underlying services used from dependencies
+    $services->set(CodeCoverage::class);
+    $services->set(Filter::class);
+};

src/Extension.php

@@ -6,7 +6,9 @@
 
 namespace DVDoug\Behat\CodeCoverage;
 
+use Behat\Testwork\Cli\Controller;
 use Behat\Testwork\Cli\ServiceContainer\CliExtension;
+use Behat\Testwork\EventDispatcher\ServiceContainer\EventDispatcherExtension;
 use Behat\Testwork\ServiceContainer\Extension as ExtensionInterface;
 use Behat\Testwork\ServiceContainer\ExtensionManager;
 use Composer\InstalledVersions;
@@ -27,7 +29,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 
 use function sprintf;
@@ -47,10 +49,11 @@ public function initialize(ExtensionManager $extensionManager): void
      */
     public function load(ContainerBuilder $container, array $config): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/Resources/config'));
+        $container->registerForAutoconfiguration(Controller::class)->addTag(CliExtension::CONTROLLER_TAG);
+        $container->registerForAutoconfiguration(EventSubscriber::class)->addTag(EventDispatcherExtension::SUBSCRIBER_TAG);
 
-        $servicesFile = 'services.xml';
-        $loader->load($servicesFile);
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader->load('services.php');
 
         $container->setParameter('behat.code_coverage.config.filter', $config['filter']);
         $container->setParameter('behat.code_coverage.config.branchAndPathCoverage', $config['branchAndPathCoverage']);