Replace xml with php config

CHANGELOG.md

@@ -4,6 +4,9 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 # Version 2
 
+# 2.2.0 - 2025-12-08
+- Replaced XML configuration with PHP configuration.
+
 # 2.1.0 - 2024-11-24
 
 - Added [PluginConfigurator](https://docs.php-http.org/en/latest/integrations/symfony-bundle.html#configure-a-custom-plugin)

src/DependencyInjection/HttplugExtension.php

@@ -33,7 +33,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\RateLimiter\LimiterInterface;
 use Twig\Environment as TwigEnvironment;
@@ -56,12 +56,12 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $loader->load('services.xml');
-        $loader->load('plugins.xml');
+        $loader->load('services.php');
+        $loader->load('plugins.php');
         if (\class_exists(MockClient::class)) {
-            $loader->load('mock-client.xml');
+            $loader->load('mock-client.php');
         }
 
         // Register default services
@@ -79,7 +79,7 @@ public function load(array $configs, ContainerBuilder $container): void
         // Configure toolbar
         $profilingEnabled = $this->isConfigEnabled($container, $config['profiling']);
         if ($profilingEnabled) {
-            $loader->load('data-collector.xml');
+            $loader->load('data-collector.php');
 
             if (!empty($config['profiling']['formatter'])) {
                 // Add custom formatter
@@ -117,7 +117,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 throw new InvalidConfigurationException('You need to require the VCR plugin to be able to use it: "composer require --dev php-http/vcr-plugin".');
             }
 
-            $loader->load('vcr-plugin.xml');
+            $loader->load('vcr-plugin.php');
         }
     }
 

src/Resources/config/data-collector.php

@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Http\HttplugBundle\Collector\Collector;
+use Http\HttplugBundle\Collector\Formatter;
+use Http\HttplugBundle\Collector\PluginClientFactory;
+use Http\HttplugBundle\Collector\PluginClientFactoryListener;
+use Http\HttplugBundle\Collector\ProfileClient;
+use Http\HttplugBundle\Collector\ProfileClientFactory;
+use Http\HttplugBundle\Collector\StackPlugin;
+use Http\HttplugBundle\Collector\Twig\HttpMessageMarkupExtension;
+use Http\Message\Formatter\CurlCommandFormatter;
+use Http\Message\Formatter\FullHttpMessageFormatter;
+
+return static function (ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set('httplug.formatter.full_http_message', FullHttpMessageFormatter::class);
+
+    $services->set('httplug.collector.formatter', Formatter::class)
+        ->args([
+            service('httplug.formatter.full_http_message'),
+            inline_service(CurlCommandFormatter::class),
+        ]);
+
+    $services->set('httplug.collector.collector', Collector::class)
+        ->tag('data_collector', [
+            'template' => '@Httplug/webprofiler.html.twig',
+            'priority' => 200,
+            'id' => 'httplug',
+        ])
+        ->tag('kernel.reset', ['method' => 'reset']);
+
+    $services->set('httplug.plugin.stack', StackPlugin::class)
+        ->args([
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+        ])
+        ->abstract();
+
+    $services->set('httplug.collector.twig.http_message', HttpMessageMarkupExtension::class)
+        ->args([
+            service('var_dumper.cloner')->nullOnInvalid(),
+            service('var_dumper.html_dumper')->nullOnInvalid(),
+        ])
+        ->tag('twig.extension');
+
+    // Discovered clients
+    $services->set('httplug.collector.auto_discovered_client', ProfileClient::class)
+        ->decorate('httplug.auto_discovery.auto_discovered_client')
+        ->args([
+            service('httplug.collector.auto_discovered_client.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.auto_discovered_async', ProfileClient::class)
+        ->decorate('httplug.auto_discovery.auto_discovered_async')
+        ->args([
+            service('httplug.collector.auto_discovered_async.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    // ClientFactories
+    $services->set('httplug.collector.factory.auto', ProfileClientFactory::class)
+        ->decorate('httplug.factory.auto')
+        ->args([
+            service('httplug.collector.factory.auto.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.factory.buzz', ProfileClientFactory::class)
+        ->decorate('httplug.factory.buzz')
+        ->args([
+            service('httplug.collector.factory.buzz.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.factory.curl', ProfileClientFactory::class)
+        ->decorate('httplug.factory.curl')
+        ->args([
+            service('httplug.collector.factory.curl.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.factory.guzzle6', ProfileClientFactory::class)
+        ->decorate('httplug.factory.guzzle6')
+        ->args([
+            service('httplug.collector.factory.guzzle6.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.factory.guzzle7', ProfileClientFactory::class)
+        ->decorate('httplug.factory.guzzle7')
+        ->args([
+            service('httplug.collector.factory.guzzle7.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.factory.react', ProfileClientFactory::class)
+        ->decorate('httplug.factory.react')
+        ->args([
+            service('httplug.collector.factory.react.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set('httplug.collector.factory.socket', ProfileClientFactory::class)
+        ->decorate('httplug.factory.socket')
+        ->args([
+            service('httplug.collector.factory.socket.inner'),
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set(\Http\Client\Common\PluginClientFactory::class, PluginClientFactory::class)
+        ->args([
+            service('httplug.collector.collector'),
+            service('httplug.collector.formatter'),
+            service('debug.stopwatch'),
+        ]);
+
+    $services->set(PluginClientFactoryListener::class)
+        ->args([
+            service(\Http\Client\Common\PluginClientFactory::class),
+        ])
+        ->tag('kernel.event_subscriber');
+};

src/Resources/config/mock-client.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Http\HttplugBundle\ClientFactory\MockFactory;
+use Http\Mock\Client;
+
+return static function (ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set('httplug.client.mock', Client::class)
+        ->public();
+
+    $services->alias(Client::class, 'httplug.client.mock')
+        ->public();
+
+    $services->set('httplug.factory.mock', MockFactory::class)
+        ->call('setClient', [
+            service('httplug.client.mock'),
+        ]);
+};