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/OptionsResolverTest.php

@@ -524,11 +524,13 @@ public function testDeprecationMessages(\Closure $configureOptions, array $optio
         });
         $e = error_reporting(0);
 
-        $configureOptions($this->resolver);
-        $this->resolver->resolve($options);
-
-        error_reporting($e);
-        restore_error_handler();
+        try {
+            $configureOptions($this->resolver);
+            $this->resolver->resolve($options);
+        } finally {
+            error_reporting($e);
+            restore_error_handler();
+        }
 
         $lastError = error_get_last();
         unset($lastError['file'], $lastError['line']);