symfony · nicolas-grekas · Aug 23, 2019 · Mar 8, 2019 · fabpot · Aug 7, 2019
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -35,6 +35,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'form.type',
         'form.type_extension',
         'form.type_guesser',
+        'http_client.client',
         'kernel.cache_clearer',
         'kernel.cache_warmer',
         'kernel.event_listener',

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -150,6 +150,7 @@ class FrameworkExtension extends Extension
     private $validatorConfigEnabled = false;
     private $messengerConfigEnabled = false;
     private $mailerConfigEnabled = false;
+    private $httpClientConfigEnabled = false;
 
     /**
      * Responds to the app.config configuration parameter.
@@ -311,6 +312,10 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('console.command.messenger_failed_messages_remove');
         }
 
+        if ($this->httpClientConfigEnabled = $this->isConfigEnabled($container, $config['http_client'])) {
+            $this->registerHttpClientConfiguration($config['http_client'], $container, $loader, $config['profiler']);
+        }
+
         $propertyInfoEnabled = $this->isConfigEnabled($container, $config['property_info']);
         $this->registerValidationConfiguration($config['validation'], $container, $loader, $propertyInfoEnabled);
         $this->registerEsiConfiguration($config['esi'], $container, $loader);
@@ -341,10 +346,6 @@ public function load(array $configs, ContainerBuilder $container)
             $this->registerLockConfiguration($config['lock'], $container, $loader);
         }
 
-        if ($this->isConfigEnabled($container, $config['http_client'])) {
-            $this->registerHttpClientConfiguration($config['http_client'], $container, $loader);
-        }
-
         if ($this->mailerConfigEnabled = $this->isConfigEnabled($container, $config['mailer'])) {
             $this->registerMailerConfiguration($config['mailer'], $container, $loader);
         }
@@ -562,6 +563,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             $loader->load('mailer_debug.xml');
         }
 
+        if ($this->httpClientConfigEnabled) {
+            $loader->load('http_client_debug.xml');
+        }
+
         $container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
         $container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
 
@@ -1915,7 +1920,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
         }
     }
 
-    private function registerHttpClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    private function registerHttpClientConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $profilerConfig)
     {
         $loader->load('http_client.xml');
 
@@ -1930,6 +1935,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             $container->removeDefinition(HttpClient::class);
         }
 
+        $httpClientId = $this->isConfigEnabled($container, $profilerConfig) ? '.debug.http_client.inner' : 'http_client';
+
         foreach ($config['scoped_clients'] as $name => $scopeConfig) {
             if ('http_client' === $name) {
                 throw new InvalidArgumentException(sprintf('Invalid scope name: "%s" is reserved.', $name));
@@ -1941,10 +1948,14 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             if (null === $scope) {
                 $container->register($name, ScopingHttpClient::class)
                     ->setFactory([ScopingHttpClient::class, 'forBaseUri'])
-                    ->setArguments([new Reference('http_client'), $scopeConfig['base_uri'], $scopeConfig]);
+                    ->setArguments([new Reference($httpClientId), $scopeConfig['base_uri'], $scopeConfig])
+                    ->addTag('http_client.client')
+                ;
             } else {
                 $container->register($name, ScopingHttpClient::class)
-                    ->setArguments([new Reference('http_client'), [$scope => $scopeConfig], $scope]);
+                    ->setArguments([new Reference($httpClientId), [$scope => $scopeConfig], $scope])
+                    ->addTag('http_client.client')
+                ;
             }
 
             $container->registerAliasForArgument($name, HttpClientInterface::class);

diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -36,6 +36,7 @@
 use Symfony\Component\ErrorRenderer\DependencyInjection\ErrorRendererPass;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 use Symfony\Component\Form\DependencyInjection\FormPass;
+use Symfony\Component\HttpClient\DependencyInjection\HttpClientPass;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
@@ -129,6 +130,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new TestServiceContainerRealRefPass(), PassConfig::TYPE_AFTER_REMOVING);
         $this->addCompilerPassIfExists($container, AddMimeTypeGuesserPass::class);
         $this->addCompilerPassIfExists($container, MessengerPass::class);
+        $this->addCompilerPassIfExists($container, HttpClientPass::class);
         $this->addCompilerPassIfExists($container, AddAutoMappingConfigurationPass::class);
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
         $container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.xml
@@ -7,6 +7,7 @@
     <services>
         <service id="http_client" class="Symfony\Contracts\HttpClient\HttpClientInterface">
             <tag name="monolog.logger" channel="http_client" />
+            <tag name="http_client.client" />
             <factory class="Symfony\Component\HttpClient\HttpClient" method="create" />
             <argument type="collection" /> <!-- default options -->
             <argument /> <!-- max host connections -->

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client_debug.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="data_collector.http_client" class="Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector">
+            <tag name="data_collector" template="@WebProfiler/Collector/http_client.html.twig" id="http_client" priority="250" />
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -40,7 +40,7 @@
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/form": "^4.3.4|^5.0",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
-        "symfony/http-client": "^4.3|^5.0",
+        "symfony/http-client": "^4.4|^5.0",
         "symfony/lock": "^4.4|^5.0",
         "symfony/mailer": "^4.4|^5.0",
         "symfony/messenger": "^4.3|^5.0",
@@ -71,6 +71,7 @@
         "symfony/console": "<4.3",
         "symfony/dotenv": "<4.2",
         "symfony/dom-crawler": "<4.3",
+        "symfony/http-client": "<4.4",
         "symfony/form": "<4.3",
         "symfony/lock": "<4.4",
         "symfony/mailer": "<4.4",

diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added support for the Mailer component
+ * added support for the HttpClient component
  * added button to clear the ajax request tab
  * deprecated the `ExceptionController::templateExists()` method
  * deprecated the `TemplateManager::templateExists()` method

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig
@@ -0,0 +1,98 @@
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
+
+{% block toolbar %}
+    {% if collector.requestCount %}
+        {% set icon %}
+            {{ include('@WebProfiler/Icon/http-client.svg') }}
+            {% set status_color = '' %}
+            <span class="sf-toolbar-value">{{ collector.requestCount }}</span>
+        {% endset %}
+
+        {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
+    {% endif %}
+{% endblock %}
+
+{% block menu %}
+<span class="label {{ collector.requestCount == 0 ? 'disabled' }}">
+    <span class="icon">{{ include('@WebProfiler/Icon/http-client.svg') }}</span>
+    <strong>HTTP Client</strong>
+    {% if collector.requestCount %}
+        <span class="count">
+            {{ collector.requestCount }}
+        </span>
+    {% endif %}
+</span>
+{% endblock %}
+
+{% block panel %}
+    <h2>HTTP Client</h2>
+    {% if collector.requestCount == 0 %}
+        <div class="empty">
+            <p>No HTTP requests were made.</p>
+        </div>
+    {% else %}
+        <div class="metrics">
+            <div class="metric">
+                <span class="value">{{ collector.requestCount }}</span>
+                <span class="label">Total requests</span>
+            </div>
+            <div class="metric">
+                <span class="value">{{ collector.errorCount }}</span>
+                <span class="label">HTTP errors</span>
+            </div>
+        </div>
+        <h2>Clients</h2>
+        <div class="sf-tabs">
+            {% for name, client in collector.clients %}
+                <div class="tab {{ client.traces|length == 0 ? 'disabled' }}">
+                    <h3 class="tab-title">{{ name }} <span class="badge">{{ client.traces|length }}</span></h3>
+                    <div class="tab-content">
+                        {% if client.traces|length == 0 %}
+                            <div class="empty">
+                                <p>No requests were made with the "{{ name }}" service.</p>
+                            </div>
+                        {% else %}
+                            <h4>Requests</h4>
+                            {% for trace in client.traces %}
+                                <table>
+                                    <thead>
+                                    <tr>
+                                        <th>
+                                            <span class="label">{{ trace.method }}</span>
+                                        </th>
+                                        <th class="full-width">
+                                            {{ trace.url }}
+                                            {% if trace.options is not empty %}
+                                                {{ profiler_dump(trace.options, maxDepth=1) }}
+                                            {% endif %}
+                                        </th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <th>
+                                            {% if trace.http_code >= 500 %}
+                                                {% set responseStatus = 'error' %}
+                                            {% elseif trace.http_code >= 400 %}
+                                                {% set responseStatus = 'warning' %}
+                                            {% else %}
+                                                {% set responseStatus = 'success' %}
+                                            {% endif %}
+                                            <span class="label status-{{ responseStatus }}">
+                                                {{ trace.http_code }}
+                                            </span>
+                                        </th>
+                                        <td>
+                                            {{ profiler_dump(trace.info, maxDepth=1) }}
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            {% endfor %}
+                        {% endif %}
+                    </div>
+                </div>
+            {% endfor %}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/http-client.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/http-client.svg
diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -6,10 +6,11 @@ CHANGELOG
 
  * added `StreamWrapper`
  * added `HttplugClient`
+ * added `max_duration` option
  * added support for NTLM authentication
  * added `$response->toStream()` to cast responses to regular PHP streams
  * made `Psr18Client` implement relevant PSR-17 factories and have streaming responses
- * added `max_duration` option
+ * added `TraceableHttpClient`, `HttpClientDataCollector` and `HttpClientPass` to integrate with the web profiler
 
 4.3.0
 -----