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

CHANGELOG.md

@@ -37,6 +37,7 @@ CHANGELOG
  * Add support for resetting container services after each messenger message
  * Add `configureContainer()`, `configureRoutes()`, `getConfigDir()` and `getBundlesPath()` to `MicroKernelTrait`
  * Add support for configuring log level, and status code by exception class
+ * Bind the `default_context` parameter onto serializer's encoders and normalizers
 
 5.3
 ---

DependencyInjection/Configuration.php

@@ -977,6 +977,12 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
                                 ->end()
                             ->end()
                         ->end()
+                        ->arrayNode('default_context')
+                            ->normalizeKeys(false)
+                            ->useAttributeAsKey('name')
+                            ->defaultValue([])
+                            ->prototype('variable')->end()
+                        ->end()
                     ->end()
                 ->end()
             ->end()

DependencyInjection/FrameworkExtension.php

@@ -1756,6 +1756,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $defaultContext += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
             $container->getDefinition('serializer.normalizer.object')->replaceArgument(6, $defaultContext);
         }
+
+        if (isset($config['default_context']) && $config['default_context']) {
+            $container->setParameter('serializer.default_context', $config['default_context']);
+        }
     }
 
     private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader)

Resources/config/schema/symfony-1.0.xsd

@@ -265,6 +265,7 @@
     <xsd:complexType name="serializer">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="mapping" type="file_mapping" />
+            <xsd:element name="default-context" type="metadata" minOccurs="0" maxOccurs="1" />
         </xsd:choice>
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="enable-annotations" type="xsd:boolean" />

Tests/DependencyInjection/ConfigurationTest.php

@@ -443,6 +443,7 @@ protected static function getBundleDefaultConfig()
                 'enabled' => true,
             ],
             'serializer' => [
+                'default_context' => [],
                 'enabled' => !class_exists(FullStack::class),
                 'enable_annotations' => !class_exists(FullStack::class),
                 'mapping' => ['paths' => []],

Tests/DependencyInjection/Fixtures/php/full.php

@@ -66,6 +66,7 @@
         'name_converter' => 'serializer.name_converter.camel_case_to_snake_case',
         'circular_reference_handler' => 'my.circular.reference.handler',
         'max_depth_handler' => 'my.max.depth.handler',
+        'default_context' => ['enable_max_depth' => true],
     ],
     'property_info' => true,
     'ide' => 'file%%link%%format',

Tests/DependencyInjection/Fixtures/xml/full.xml

@@ -33,7 +33,11 @@
         </framework:translator>
         <framework:validation enabled="true" />
         <framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
-        <framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" circular-reference-handler="my.circular.reference.handler" max-depth-handler="my.max.depth.handler" />
+        <framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" circular-reference-handler="my.circular.reference.handler" max-depth-handler="my.max.depth.handler">
+            <framework:default-context>
+                <framework:enable_max_depth>true</framework:enable_max_depth>
+            </framework:default-context>
+        </framework:serializer>
         <framework:property-info />
     </framework:config>
 </container>

Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -54,6 +54,8 @@ framework:
          name_converter:             serializer.name_converter.camel_case_to_snake_case
          circular_reference_handler: my.circular.reference.handler
          max_depth_handler:          my.max.depth.handler
+         default_context:
+             enable_max_depth: true
     property_info: ~
     ide: file%%link%%format
     request: