8000 Add default mapping path for serializer component · symfony/symfony@a644a46 · GitHub
[go: up one dir, main page]
Skip to content

Commit a644a46

Browse files
ycerutoyceruto
committed
Add default mapping path for serializer component
1 parent 8e5b3b1 commit a644a46

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,11 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
11871187
}
11881188
}
11891189

1190+
$rootDir = $container->getParameter('kernel.root_dir');
1191+
if ($container->fileExists($dir = $rootDir.'/Resources/config/serialization', '/^$/')) {
1192+
$this->registerMappingFilesFromDir($dir, $fileRecorder);
1193+
}
1194+
11901195
$this->registerMappingFilesFromConfig($container, $config, $fileRecorder);
11911196

11921197
$chainLoader->replaceArgument(0, $serializerLoaders);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ public function testSerializerEnabled()
742742

743743
$argument = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
744744

745-
$this->assertCount(1, $argument);
745+
$this->assertCount(2, $argument);
746746
$this->assertEquals('Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader', $argument[0]->getClass());
747747
$this->assertNull($container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
748748
$this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
@@ -839,11 +839,13 @@ public function testSerializerCacheDisabled()
839839
public function testSerializerMapping()
840840
{
841841
$container = $this->createContainerFromFile('serializer_mapping', array('kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle'))));
842+
$rootDir = $container->getParameter('kernel.root_dir');
842843
$configDir = __DIR__.'/Fixtures/TestBundle/Resources/config';
843844
$expectedLoaders = array(
844845
new Definition(AnnotationLoader::class, array(new Reference('annotation_reader'))),
845846
new Definition(XmlFileLoader::class, array($configDir.'/serialization.xml')),
846847
new Definition(YamlFileLoader::class, array($configDir.'/serialization.yml')),
848+
new Definition(YamlFileLoader::class, array($rootDir.'/Resources/config/serialization/foo.yml')),
847849
new Definition(XmlFileLoader::class, array($configDir.'/serializer_mapping/files/foo.xml')),
848850
new Definition(YamlFileLoader::class, array($configDir.'/serializer_mapping/files/foo.yml')),
849851
new Definition(YamlFileLoader::class, array($configDir.'/serializer_mapping/serialization.yml')),
@@ -855,7 +857,10 @@ public function testSerializerMapping()
855857
}
856858

857859
$loaders = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
858-
$this->assertEquals(sort($expectedLoaders), sort($loaders));
860+
861+
sort($expectedLoaders);
862+
sort($loaders);
863+
$this->assertEquals($expectedLoaders, $loaders);
859864
}
860865

861866
public function testAssetHelperWhenAssetsAreEnabled()

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Resources/config/serialization/foo.yml

Whitespace-only changes.

0 commit comments

Comments
 (0)
0