Merge branch '5.1'

Author: Tobion

DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php

@@ -28,8 +28,8 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         // routing
-        if ($container->has('router')) {
-            $definition = $container->findDefinition('router');
+        if ($container->has('router.default')) {
+            $definition = $container->findDefinition('router.default');
             foreach ($container->findTaggedServiceIds('routing.expression_language_provider', true) as $id => $attributes) {
                 $definition->addMethodCall('addExpressionLanguageProvider', [new Reference($id)]);
             }

Resources/config/serializer.xml

@@ -6,7 +6,6 @@
 
     <parameters>
         <parameter key="serializer.mapping.cache.file">%kernel.cache_dir%/serialization.php</parameter>
-        <parameter key="serializer.mapping.cache.prefix" />
     </parameters>
 
     <services>
@@ -103,7 +102,6 @@
         <!-- Class Metadata Factory -->
         <service id="serializer.mapping.class_metadata_factory" class="Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory">
             <argument type="service" id="serializer.mapping.chain_loader" />
-            <argument>null</argument>
         </service>
 
         <service id="Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface" alias="serializer.mapping.class_metadata_factory" />

Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php

@@ -22,16 +22,16 @@ class AddExpressionLanguageProvidersPassTest extends TestCase
     public function testProcessForRouter()
     {
         $container = new ContainerBuilder();
-        $container->addCompilerPass(new AddExpressionLanguageProvidersPass(false));
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
 
         $definition = new Definition('\stdClass');
         $definition->addTag('routing.expression_language_provider');
         $container->setDefinition('some_routing_provider', $definition->setPublic(true));
 
-        $container->register('router', '\stdClass')->setPublic(true);
+        $container->register('router.default', '\stdClass')->setPublic(true);
         $container->compile();
 
-        $router = $container->getDefinition('router');
+        $router = $container->getDefinition('router.default');
         $calls = $router->getMethodCalls();
         $this->assertCount(1, $calls);
         $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
@@ -41,14 +41,14 @@ public function testProcessForRouter()
     public function testProcessForRouterAlias()
     {
         $container = new ContainerBuilder();
-        $container->addCompilerPass(new AddExpressionLanguageProvidersPass(false));
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
 
         $definition = new Definition('\stdClass');
         $definition->addTag('routing.expression_language_provider');
         $container->setDefinition('some_routing_provider', $definition->setPublic(true));
 
         $container->register('my_router', '\stdClass')->setPublic(true);
-        $container->setAlias('router', 'my_router');
+        $container->setAlias('router.default', 'my_router');
         $container->compile();
 
         $router = $container->getDefinition('my_router');