From 2b6f1e9a93d107990f86005c93aa08de4f396166 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 6 Apr 2020 10:23:42 +0200 Subject: [PATCH] Revert to container.dumper.inline_factories=false by default --- .../Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php | 4 ---- .../Component/DependencyInjection/Dumper/PhpDumper.php | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php index 84e0d35db8..73c2a0605c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php +++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php @@ -142,10 +142,6 @@ trait MicroKernelTrait } $container->setAlias(static::class, 'kernel')->setPublic(true); - - if (!$container->hasParameter('container.dumper.inline_factories')) { - $container->setParameter('container.dumper.inline_factories', false); - } }); } diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 3e38c0a91f..8f2db860ec 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -157,7 +157,7 @@ class PhpDumper extends Dumper $this->asFiles = $options['as_files']; $this->hotPathTag = $options['hot_path_tag']; $this->preloadTags = $options['preload_tags']; - $this->inlineFactories = $this->asFiles && $options['inline_factories_parameter'] && (!$this->container->hasParameter($options['inline_factories_parameter']) || $this->container->getParameter($options['inline_factories_parameter'])); + $this->inlineFactories = $this->asFiles && $options['inline_factories_parameter'] && $this->container->hasParameter($options['inline_factories_parameter']) && $this->container->getParameter($options['inline_factories_parameter']); $this->inlineRequires = $options['inline_class_loader_parameter'] && ($this->container->hasParameter($options['inline_class_loader_parameter']) ? $this->container->getParameter($options['inline_class_loader_parameter']) : (\PHP_VERSION_ID < 70400 || $options['debug'])); $this->serviceLocatorTag = $options['service_locator_tag'];