Merge branch '5.4' into 6.2

* 5.4:
  re-allow phpdocumentor/type-resolver 1.7
  skip test using attributes on PHP 7
  [HttpClient] Encode and decode curly brackets {}
  fix: GetSetMethodNormalizer::supportss should not check ignored methods
  Stop stopwatch events in case of exception
  add translations for the filename max length validator option
  [Validator] Update BIC validator IBAN mappings
  [String] Correct inflection of 'codes' and 'names'

Author: nicolas-grekas

Debug/WrappedListener.php

@@ -112,10 +112,12 @@ public function __invoke(object $event, string $eventName, EventDispatcherInterf
 
         $e = $this->stopwatch->start($this->name, 'event_listener');
 
-        ($this->optimizedListener ?? $this->listener)($event, $eventName, $dispatcher);
-
-        if ($e->isStarted()) {
-            $e->stop();
+        try {
+            ($this->optimizedListener ?? $this->listener)($event, $eventName, $dispatcher);
+        } finally {
+            if ($e->isStarted()) {
+                $e->stop();
+            }
         }
 
         if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {

Tests/Debug/WrappedListenerTest.php

@@ -15,6 +15,7 @@
 use Symfony\Component\EventDispatcher\Debug\WrappedListener;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\Stopwatch\StopwatchEvent;
 
 class WrappedListenerTest extends TestCase
 {
@@ -43,6 +44,25 @@ public static function provideListenersToDescribe()
             [[#[\Closure(name: FooListener::class)] static fn () => new FooListener(), 'listen'], 'Symfony\Component\EventDispatcher\Tests\Debug\FooListener::listen'],
         ];
     }
+
+    public function testStopwatchEventIsStoppedWhenListenerThrows()
+    {
+        $stopwatchEvent = $this->createMock(StopwatchEvent::class);
+        $stopwatchEvent->expects(self::once())->method('isStarted')->willReturn(true);
+        $stopwatchEvent->expects(self::once())->method('stop');
+
+        $stopwatch = $this->createStub(Stopwatch::class);
+        $stopwatch->method('start')->willReturn($stopwatchEvent);
+
+        $dispatcher = $this->createStub(EventDispatcherInterface::class);
+
+        $wrappedListener = new WrappedListener(function () { throw new \Exception(); }, null, $stopwatch, $dispatcher);
+
+        try {
+            $wrappedListener(new \stdClass(), 'foo', $dispatcher);
+        } catch (\Exception $ex) {
+        }
+    }
 }
 
 class FooListener