Browse Source

Merge remote branch 'henrikbjorn/validation-configuration'

* henrikbjorn/validation-configuration:
  [FrameworkBundle] Empty annotation namespaces parameter because it is referenced in validator.xml
Fabien Potencier 14 years ago
parent
commit
260af82300

+ 2 - 0
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -462,6 +462,8 @@ class FrameworkExtension extends Extension
             $arguments = $loaderChain->getArguments();
             array_unshift($arguments[0], new Reference('validator.mapping.loader.annotation_loader'));
             $loaderChain->setArguments($arguments);
+        } else {
+            $container->setParameter('validator.mapping.loader.annotation_loader.namespaces', array());
         }
 
         if (isset($config['cache'])) {