minor #36354 Revert to container.dumper.inline_factories=false by default (nicolas-grekas)

fabpot · fabpot · commit dadb5d819849 · 2020-04-06T11:54:21.000+02:00
This PR was merged into the 5.1-dev branch. Discussion ---------- Revert to container.dumper.inline_factories=false by default | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As spotted by @Tobion in #36193 (review) Commits ------- 2b6f1e9 Revert to container.dumper.inline_factories=false by default
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -142,10 +142,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
             }
 
             $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
@@ -157,7 +157,7 @@ public function dump(array $options = [])
         $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'];
 

Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`$container->setAlias(static::class, 'kernel')->setPublic(true);`
`145`		`-`
`146`		`- if (!$container->hasParameter('container.dumper.inline_factories')) {`
`147`		`- $container->setParameter('container.dumper.inline_factories', false);`
`148`		`- }`
`149`	`145`	`});`
`150`	`146`	`}`
`151`	`147`