diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FoundationBundle] Fixed the configuration of the annotation driver for the validator

Browse Source
This commit is contained in:
Bernhard Schussek 2010-06-30 23:03:43 +02:00
parent f6b9d9e046
commit 55c1efd144
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Framework/FoundationBundle/DependencyInjection/WebExtension.php
View File

@ -92,8 +92,8 @@ class WebExtension extends LoaderExtension
} }
} }
if (isset($config['validation'])) { if (isset($config['validation']['enabled'])) {
if ($config['validation']) { if ($config['validation']['enabled']) {
if (!$configuration->hasDefinition('validator')) { if (!$configuration->hasDefinition('validator')) {
$loader = new XmlFileLoader(__DIR__.'/../Resources/config'); $loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load($this->resources['validation'])); $configuration->merge($loader->load($this->resources['validation']));
@ -160,7 +160,7 @@ class WebExtension extends LoaderExtension
$loader = $configuration->getDefinition('validator.mapping.loader.loader_chain'); $loader = $configuration->getDefinition('validator.mapping.loader.loader_chain');
$arguments = $loader->getArguments(); $arguments = $loader->getArguments();
array_unshift($arguments, new Reference('validator.mapping.loader.annotation_loader')); array_unshift($arguments[0], new Reference('validator.mapping.loader.annotation_loader'));
$loader->setArguments($arguments); $loader->setArguments($arguments);
} }
} elseif ($configuration->hasDefinition('validator')) { } elseif ($configuration->hasDefinition('validator')) {