don't load translator services if not required

xabbuh · xabbuh · commit 7e9151a6f0e7 · 2016-12-14T22:05:29.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -87,7 +87,7 @@ public function load(array $configs, ContainerBuilder $container)
         // A translator must always be registered (as support is included by
         // default in the Form component). If disabled, an identity translator
         // will be used and everything will still work as expected.
-        if (class_exists('Symfony\Component\Translation\Translator') || $this->isConfigEnabled($container, $config['form'])) {
+        if ($this->isConfigEnabled($container, $config['translator']) || $this->isConfigEnabled($container, $config['form'])) {
             if (!class_exists('Symfony\Component\Translation\Translator')) {
                 throw new LogicException('Form support cannot be enabled as the Translation component is not installed.');
             }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function load(array $configs, ContainerBuilder $container)`
`87`	`87`	`// A translator must always be registered (as support is included by`
`88`	`88`	`// default in the Form component). If disabled, an identity translator`
`89`	`89`	`// will be used and everything will still work as expected.`
`90`		`- if (class_exists('Symfony\Component\Translation\Translator') \|\| $this->isConfigEnabled($container, $config['form'])) {`
	`90`	`+ if ($this->isConfigEnabled($container, $config['translator']) \|\| $this->isConfigEnabled($container, $config['form'])) {`
`91`	`91`	`if (!class_exists('Symfony\Component\Translation\Translator')) {`
`92`	`92`	`throw new LogicException('Form support cannot be enabled as the Translation component is not installed.');`
`93`	`93`	`}`