Changeset 32429

Timestamp:

04/01/11 08:45:06 (2 years ago)

Author:

fabien

Message:

Merge branch 'master' of git://github.com/symfony/symfony

Files:

• branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php (modified) (1 diff)
• branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml (modified) (1 diff)

branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php

@@ -312 +312 @@
-    protected function loadConstraints(ContainerBuilder $container)
-    {
+        // FIXME: the validator.annotations.namespaces parameter does not exist anymore
+        // and anyway, it was not available in the FrameworkExtension code
+        // as each bundle is isolated from the others
-        if ($container->hasParameter('validator.annotations.namespaces')) {
-            $container->setParameter('validator.annotations.namespaces', array_merge(

branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml

@@ -11 +11 @@
-        <parameter key="validator.mapping.loader.static_method_loader.class">Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader</parameter>
-        <parameter key="validator.mapping.loader.annotation_loader.class">Symfony\Component\Validator\Mapping\Loader\AnnotationLoader</parameter>
-        <parameter key="validator.mapping.loader.xml_file_loader.class">Symfony\Component\Validator\Mapping\Loader\XmlFileLoader</parameter>
-        <parameter key="validator.mapping.loader.yaml_file_loader.class">Symfony\Component\Validator\Mapping\Loader\YamlFileLoader</parameter>
-        <parameter key="validator.mapping.loader.xml_files_loader.class">Symfony\Component\Validator\Mapping\Loader\XmlFilesLoader</parameter>
-        <parameter key="validator.mapping.loader.yaml_files_loader.class">Symfony\Component\Validator\Mapping\Loader\YamlFilesLoader</parameter>