Development

Changeset 32429

You must first sign up to be able to contribute.

Changeset 32429

Show
Ignore:
Timestamp:
04/01/11 08:45:06 (4 years ago)
Author:
fabien
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php

    r32283 r32429  
    312312    protected function loadConstraints(ContainerBuilder $container) 
    313313    { 
     314        // FIXME: the validator.annotations.namespaces parameter does not exist anymore 
     315        // and anyway, it was not available in the FrameworkExtension code 
     316        // as each bundle is isolated from the others 
    314317        if ($container->hasParameter('validator.annotations.namespaces')) { 
    315318            $container->setParameter('validator.annotations.namespaces', array_merge( 
  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml

    r32428 r32429  
    1111        <parameter key="validator.mapping.loader.static_method_loader.class">Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader</parameter> 
    1212        <parameter key="validator.mapping.loader.annotation_loader.class">Symfony\Component\Validator\Mapping\Loader\AnnotationLoader</parameter> 
    13         <parameter key="validator.mapping.loader.xml_file_loader.class">Symfony\Component\Validator\Mapping\Loader\XmlFileLoader</parameter> 
    14         <parameter key="validator.mapping.loader.yaml_file_loader.class">Symfony\Component\Validator\Mapping\Loader\YamlFileLoader</parameter> 
    1513        <parameter key="validator.mapping.loader.xml_files_loader.class">Symfony\Component\Validator\Mapping\Loader\XmlFilesLoader</parameter> 
    1614        <parameter key="validator.mapping.loader.yaml_files_loader.class">Symfony\Component\Validator\Mapping\Loader\YamlFilesLoader</parameter>