Merge branch '5.4' into 6.0

* 5.4:
  [DependencyInjection] Add `SubscribedService` attribute, deprecate current `ServiceSubscriberTrait` usage
  Use try/finally to restore error handlers
  Allow serializer default context configuration

Author: nicolas-grekas

Tests/EventListener/DebugHandlersListenerTest.php

@@ -47,9 +47,10 @@ public function testConfigure()
         try {
             $listener->configure();
         } catch (\Exception $exception) {
+        } finally {
+            restore_exception_handler();
+            restore_error_handler();
         }
-        restore_exception_handler();
-        restore_error_handler();
 
         if (null !== $exception) {
             throw $exception;
@@ -113,9 +114,10 @@ public function testConsoleEvent()
         try {
             $dispatcher->dispatch($event, ConsoleEvents::COMMAND);
         } catch (\Exception $exception) {
+        } finally {
+            restore_exception_handler();
+            restore_error_handler();
         }
-        restore_exception_handler();
-        restore_error_handler();
 
         if (null !== $exception) {
             throw $exception;