Skip to content

Commit 62277d3

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: [HttpKernel] Fix race condition when clearing old containers [DI] Fix infinite loop in InlineServiceDefinitionsPass [HttpKernel] Keep legacy container files for concurrent requests Do not cache cache attributes if `attributes` is in the context Test that it do not remove the new flashes when displaying the existing ones [HttpFoundation] AutExpireFlashBag should not clear new flashes [FrameworkBundle][Serializer] Remove YamlEncoder definition if Yaml component isn't installed [DI] Fix tracking of env vars in exceptions [Form] Don't rely on if http-foundation isn't in FileType Fix merge substitute aliases in inline mappings added ability for substitute aliases when mapping in YAML is on single line [Console] Fix global console flag when used in chain
2 parents c49dd1a + 81c120e commit 62277d3

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
use Symfony\Component\WebLink\HttpHeaderSerializer;
7575
use Symfony\Component\Workflow;
7676
use Symfony\Component\Yaml\Command\LintCommand as BaseYamlLintCommand;
77+
use Symfony\Component\Yaml\Yaml;
7778

7879
/**
7980
* FrameworkExtension.
@@ -1159,6 +1160,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
11591160
$container->removeDefinition('serializer.normalizer.object');
11601161
}
11611162

1163+
if (!class_exists(Yaml::class)) {
1164+
$container->removeDefinition('serializer.encoder.yaml');
1165+
}
1166+
11621167
$serializerLoaders = array();
11631168
if (isset($config['enable_annotations']) && $config['enable_annotations']) {
11641169
if (!$this->annotationsConfigEnabled) {

0 commit comments

Comments
 (0)