Stop stopwatch events in case of exception

Author: MatTheCat

Controller/TraceableArgumentResolver.php

@@ -35,10 +35,10 @@ public function getArguments(Request $request, callable $controller)
     {
         $e = $this->stopwatch->start('controller.get_arguments');
 
-        $ret = $this->resolver->getArguments($request, $controller);
-
-        $e->stop();
-
-        return $ret;
+        try {
+            return $this->resolver->getArguments($request, $controller);
+        } finally {
+            $e->stop();
+        }
     }
 }

Controller/TraceableControllerResolver.php

@@ -35,10 +35,10 @@ public function getController(Request $request)
     {
         $e = $this->stopwatch->start('controller.get_callable');
 
-        $ret = $this->resolver->getController($request);
-
-        $e->stop();
-
-        return $ret;
+        try {
+            return $this->resolver->getController($request);
+        } finally {
+            $e->stop();
+        }
     }
 }

Tests/Controller/TraceableArgumentResolverTest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Controller;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\Controller\TraceableArgumentResolver;
+use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\Stopwatch\StopwatchEvent;
+
+class TraceableArgumentResolverTest extends TestCase
+{
+    public function testStopwatchEventIsStoppedWhenResolverThrows()
+    {
+        $stopwatchEvent = $this->createMock(StopwatchEvent::class);
+        $stopwatchEvent->expects(self::once())->method('stop');
+
+        $stopwatch = $this->createStub(Stopwatch::class);
+        $stopwatch->method('start')->willReturn($stopwatchEvent);
+
+        $resolver = new class() implements ArgumentResolverInterface {
+            public function getArguments(Request $request, callable $controller)
+            {
+                throw new \Exception();
+            }
+        };
+
+        $traceableResolver = new TraceableArgumentResolver($resolver, $stopwatch);
+
+        try {
+            $traceableResolver->getArguments(new Request(), function () {});
+        } catch (\Exception $ex) {
+        }
+    }
+}

Tests/Controller/TraceableControllerResolverTest.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Controller;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\Controller\TraceableControllerResolver;
+use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\Stopwatch\StopwatchEvent;
+
+class TraceableControllerResolverTest extends TestCase
+{
+    public function testStopwatchEventIsStoppedWhenResolverThrows()
+    {
+        $stopwatchEvent = $this->createMock(StopwatchEvent::class);
+        $stopwatchEvent->expects(self::once())->method('stop');
+
+        $stopwatch = $this->createStub(Stopwatch::class);
+        $stopwatch->method('start')->willReturn($stopwatchEvent);
+
+        $resolver = new class() implements ControllerResolverInterface {
+            public function getController(Request $request)
+            {
+                throw new \Exception();
+            }
+        };
+
+        $traceableResolver = new TraceableControllerResolver($resolver, $stopwatch);
+        try {
+            $traceableResolver->getController(new Request());
+        } catch (\Exception $ex) {
+        }
+    }
+}