[DIC] Better handling of enableable configurations #6852
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,39 +81,25 @@ public function load(array $configs, ContainerBuilder $container) | |
| $this->registerSessionConfiguration($config['session'], $container, $loader); | ||
| } | ||
|
|
||
| if ($this->isConfigEnabled($container, $config['form'])) { | ||
| $this->registerFormConfiguration($config, $container, $loader); | ||
| $config['validation']['enabled'] = true; | ||
| } | ||
|
|
||
| if (isset($config['templating'])) { | ||
|
There was a problem hiding this comment. why keeping a isset here while you use an early return in other methods ? There was a problem hiding this comment. @stof For now this PR only fixes the current config and templating is not an enableable node as of today. |
||
| $this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader); | ||
| } | ||
|
|
||
| $this->registerValidationConfiguration($config['validation'], $container, $loader); | ||
| $this->registerEsiConfiguration($config['esi'], $container, $loader); | ||
| $this->registerRouterProxyConfiguration($config['router_proxy'], $container, $loader); | ||
| $this->registerProfilerConfiguration($config['profiler'], $container, $loader); | ||
| $this->registerTranslatorConfiguration($config['translator'], $container); | ||
|
|
||
| if (isset($config['router'])) { | ||
| $this->registerRouterConfiguration($config['router'], $container, $loader); | ||
| } | ||
|
|
||
| $this->registerAnnotationsConfiguration($config['annotations'], $container, $loader); | ||
|
|
||
| $this->addClassesToCompile(array( | ||
|
|
@@ -161,7 +147,7 @@ public function load(array $configs, ContainerBuilder $container) | |
| private function registerFormConfiguration($config, ContainerBuilder $container, XmlFileLoader $loader) | ||
| { | ||
| $loader->load('form.xml'); | ||
| if ($this->isConfigEnabled($container, $config['csrf_protection'])) { | ||
|
There was a problem hiding this comment. In line 156 you can set |
||
| if (!isset($config['session'])) { | ||
| throw new \LogicException('CSRF protection needs that sessions are enabled.'); | ||
| } | ||
|
|
@@ -170,36 +156,44 @@ private function registerFormConfiguration($config, ContainerBuilder $container, | |
| } | ||
| $loader->load('form_csrf.xml'); | ||
|
|
||
| $container->setParameter('form.type_extension.csrf.enabled', true); | ||
| $container->setParameter('form.type_extension.csrf.field_name', $config['csrf_protection']['field_name']); | ||
| } else { | ||
| $container->setParameter('form.type_extension.csrf.enabled', false); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Loads the ESI configuration. | ||
| * | ||
| * @param array $config A proxy configuration array | ||
| * @param ContainerBuilder $container A ContainerBuilder instance | ||
| * @param XmlFileLoader $loader An XmlFileLoader instance | ||
| */ | ||
| private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) | ||
| { | ||
| if (!$this->isConfigEnabled($container, $config)) { | ||
| return; | ||
| } | ||
|
|
||
| $loader->load('esi.xml'); | ||
| } | ||
|
|
||
| /** | ||
| * Loads the router proxy configuration. | ||
| * | ||
| * @param array $config A proxy configuration array | ||
| * @param ContainerBuilder $container A ContainerBuilder instance | ||
| * @param XmlFileLoader $loader An XmlFileLoader instance | ||
| */ | ||
| private function registerRouterProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) | ||
| { | ||
| if (!$this->isConfigEnabled($container, $config)) { | ||
| return; | ||
| } | ||
|
|
||
| $loader->load('proxy.xml'); | ||
| $container->setParameter('http_content_renderer.proxy_path', $config['path']); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -258,7 +252,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $ | |
| } | ||
| } | ||
|
|
||
| if (!$this->isConfigEnabled($container, $config)) { | ||
| $container->getDefinition('profiler')->addMethodCall('disable', array()); | ||
| } | ||
| } | ||
|
|
@@ -530,61 +524,63 @@ private function createPackageDefinition(ContainerBuilder $container, array $htt | |
| */ | ||
| private function registerTranslatorConfiguration(array $config, ContainerBuilder $container) | ||
| { | ||
| if (!$this->isConfigEnabled($container, $config)) { | ||
| return; | ||
| } | ||
|
|
||
| // Use the "real" translator instead of the identity default | ||
| $container->setAlias('translator', 'translator.default'); | ||
| $translator = $container->findDefinition('translator.default'); | ||
| $translator->addMethodCall('setFallbackLocale', array($config['fallback'])); | ||
|
|
||
| // Discover translation directories | ||
| $dirs = array(); | ||
| if (class_exists('Symfony\Component\Validator\Validator')) { | ||
| $r = new \ReflectionClass('Symfony\Component\Validator\Validator'); | ||
|
|
||
| $dirs[] = dirname($r->getFilename()).'/Resources/translations'; | ||
| } | ||
| if (class_exists('Symfony\Component\Form\Form')) { | ||
| $r = new \ReflectionClass('Symfony\Component\Form\Form'); | ||
|
|
||
| $dirs[] = dirname($r->getFilename()).'/Resources/translations'; | ||
| } | ||
| if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) { | ||
| $r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException'); | ||
|
|
||
| $dirs[] = dirname($r->getFilename()).'/../../Resources/translations'; | ||
| } | ||
| $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations'; | ||
| foreach ($container->getParameter('kernel.bundles') as $bundle => $class) { | ||
| $reflection = new \ReflectionClass($class); | ||
| if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/translations')) { | ||
| $dirs[] = $dir; | ||
| } | ||
| if (is_dir($dir = sprintf($overridePath, $bundle))) { | ||
| $dirs[] = $dir; | ||
| } | ||
| } | ||
| if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) { | ||
| $dirs[] = $dir; | ||
| } | ||
|
|
||
| // Register translation resources | ||
| if ($dirs) { | ||
| foreach ($dirs as $dir) { | ||
| $container->addResource(new DirectoryResource($dir)); | ||
| } | ||
| $finder = Finder::create() | ||
| ->files() | ||
| ->filter(function (\SplFileInfo $file) { | ||
| return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename()); | ||
| }) | ||
| ->in($dirs) | ||
| ; | ||
|
|
||
| foreach ($finder as $file) { | ||
| // filename is domain.locale.format | ||
| list($domain, $locale, $format) = explode('.', $file->getBasename(), 3); | ||
| $translator->addMethodCall('addResource', array($format, (string) $file, $locale, $domain)); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -598,6 +594,10 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder | |
| */ | ||
| private function registerValidationConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) | ||
| { | ||
| if (!$this->isConfigEnabled($container, $config)) { | ||
| return; | ||
| } | ||
|
|
||
| $loader->load('validator.xml'); | ||
|
|
||
| $container->setParameter('validator.translation_domain', $config['translation_domain']); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not BC with 2.1. You need to add
treatNullLike(array('enabled' => true))There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the default: https://github.com/symfony/symfony/pull/6852/files#L4L226
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah indeed, I forgot it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tried to keep BC as much as possible (some other configs should probably get updated later) but it still needs a careful review !