symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
Lines changed: 12 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
Lines changed: 12 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/serializer/foo.yml b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/serializer/foo.yml
@@ -1187,6 +1187,11 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             }
         }
 
+        $projectDir = $container->getParameter('kernel.project_dir');
+        if ($container->fileExists($dir = $projectDir.'/config/serializer', '/^$/')) {
+            $this->registerMappingFilesFromDir($dir, $fileRecorder);
+        }
+
         $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);
 
         $chainLoader->replaceArgument(0, $serializerLoaders);
 
@@ -742,7 +742,7 @@ public function testSerializerEnabled()
 
         $argument = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
 
-        $this->assertCount(1, $argument);
+        $this->assertCount(2, $argument);
         $this->assertEquals('Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader', $argument[0]->getClass());
         $this->assertNull($container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
@@ -839,23 +839,33 @@ public function testSerializerCacheDisabled()
     public function testSerializerMapping()
     {
         $container = $this->createContainerFromFile('serializer_mapping', array('kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle'))));
+        $projectDir = $container->getParameter('kernel.project_dir');
         $configDir = __DIR__.'/Fixtures/TestBundle/Resources/config';
         $expectedLoaders = array(
             new Definition(AnnotationLoader::class, array(new Reference('annotation_reader'))),
             new Definition(XmlFileLoader::class, array($configDir.'/serialization.xml')),
             new Definition(YamlFileLoader::class, array($configDir.'/serialization.yml')),
+            new Definition(YamlFileLoader::class, array($projectDir.'/config/serializer/foo.yml')),
             new Definition(XmlFileLoader::class, array($configDir.'/serializer_mapping/files/foo.xml')),
             new Definition(YamlFileLoader::class, array($configDir.'/serializer_mapping/files/foo.yml')),
             new Definition(YamlFileLoader::class, array($configDir.'/serializer_mapping/serialization.yml')),
             new Definition(YamlFileLoader::class, array($configDir.'/serializer_mapping/serialization.yaml')),
         );
 
         foreach ($expectedLoaders as $definition) {
+            if (is_file($arg = $definition->getArgument(0))) {
+                $definition->replaceArgument(0, str_replace('/', DIRECTORY_SEPARATOR, $arg));
+            }
             $definition->setPublic(false);
         }
 
         $loaders = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
-        $this->assertEquals(sort($expectedLoaders), sort($loaders));
+        foreach ($loaders as $loader) {
+            if (is_file($arg = $loader->getArgument(0))) {
+                $loader->replaceArgument(0, str_replace('/', DIRECTORY_SEPARATOR, $arg));
+            }
+        }
+        $this->assertEquals($expectedLoaders, $loaders);
     }
 
     public function testAssetHelperWhenAssetsAreEnabled()
Original file line number	Diff line number	Diff line change
`@@ -1187,6 +1187,11 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1187`	`1187`	`}`
`1188`	`1188`	`}`
`1189`	`1189`
	`1190`	`+ $projectDir = $container->getParameter('kernel.project_dir');`
	`1191`	`+ if ($container->fileExists($dir = $projectDir.'/config/serializer', '/^$/')) {`
	`1192`	`+ $this->registerMappingFilesFromDir($dir, $fileRecorder);`
	`1193`	`+ }`
	`1194`	`+`
`1190`	`1195`	`$this->registerMappingFilesFromConfig($container, $config, $fileRecorder);`
`1191`	`1196`
`1192`	`1197`	`$chainLoader->replaceArgument(0, $serializerLoaders);`