review feedback

Author: chr-hertel

CHANGELOG.md

@@ -6,10 +6,12 @@
 
 - The real request method and target url are now displayed in the profiler.
 - Support the cache plugin configuration for `respect_response_cache_directives`.
+- Extended WebProfilerToolbar item to list request with details.
 
 ### Changed
 
 - The profiler design has been updated.
+- Removed stopwatch-plugin in favor of `ProfileClient`.
 
 ### Deprecated
 

Collector/ProfileClient.php

@@ -41,6 +41,11 @@ class ProfileClient implements HttpClient, HttpAsyncClient
      */
     private $stopwatch;
 
+    /**
+     * @var array
+     */
+    private $eventNames = [];
+
     /**
      * @param HttpClient|HttpAsyncClient $client    The client to profile. Client must implement both HttpClient and
      *                                              HttpAsyncClient interfaces.
@@ -81,6 +86,7 @@ function (ResponseInterface $response) use ($event, $stack) {
 
                 return $response;
             }, function (\Exception $exception) use ($event, $stack) {
+                $event->stop();
                 $this->collectExceptionInformations($exception, $event, $stack);
 
                 throw $exception;
@@ -173,6 +179,14 @@ private function collectExceptionInformations(\Exception $exception, StopwatchEv
      */
     private function getStopwatchEventName(RequestInterface $request)
     {
-        return sprintf('%s %s', $request->getMethod(), $request->getUri()->__toString());
+        $name = sprintf('%s %s', $request->getMethod(), $request->getUri());
+
+        if (isset($this->eventNames[$name])) {
+            $name .= sprintf(' [#%d]', ++$this->eventNames[$name]);
+        } else {
+            $this->eventNames[$name] = 1;
+        }
+
+        return $name;
     }
 }

Collector/ProfileClientFactory.php

@@ -41,6 +41,7 @@ class ProfileClientFactory implements ClientFactory
      * @param ClientFactory|callable $factory
      * @param Collector              $collector
      * @param Formatter              $formatter
+     * @param Stopwatch              $stopwatch
      */
     public function __construct($factory, Collector $collector, Formatter $formatter, Stopwatch $stopwatch)
     {

DependencyInjection/HttplugExtension.php

@@ -556,6 +556,7 @@ private function configureAutoDiscoveryFactory(ContainerBuilder $container, $dis
                     $factory,
                     new Reference('httplug.collector.collector'),
                     new Reference('httplug.collector.formatter'),
+                    new Reference('debug.stopwatch'),
                 ]);
             $factory = new Reference($factoryServiceId);
         }

Resources/views/webprofiler.html.twig

@@ -32,8 +32,8 @@
                                 <td>{{ stack.requestMethod }}</td>
                                 {% set target = stack.requestTarget %}
                                 <td title="{{ target }}">{{ target|length > 30 ? target[:30] ~ '...' : target }}</td>
-                                <td>{{ stack.duration|number_format ~ ' ms'}}</td>
-                                <td>{{ stack.failed ? 'FAILED' : stack.responseCode }}</td>
+                                <td>{{ stack.duration == 0 ? 'n/a' : stack.duration|number_format ~ ' ms'}}</td>
+                                <td>{{ stack.failed ? 'FAILED' : stack.responseCode|default('n/a') }}</td>
                             </tr>
                         {% endfor %}
                     </tbody>