[Validator] Fixed failing CsrfFormLoginTest

webmozart · webmozart · commit b1badeaa1f62 · 2014-03-30T18:56:20.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -694,7 +694,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
         $definition->replaceArgument(0, $config['strict_email']);
 
         if (array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {
-            $validatorBuilder->addMethodCall('enableAnnotations', array(new Reference('annotation_reader')));
+            $validatorBuilder->addMethodCall('enableAnnotationMapping', array(new Reference('annotation_reader')));
         }
 
         if (array_key_exists('static_method', $config) && $config['static_method']) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
@@ -18,7 +18,7 @@
     <services>
         <service id="validator" class="%validator.class%" factory-service="validator.builder" factory-method="getValidator" />
 
-        <service id="validator.builder" class="%validator.builder.class%" factory-class="%validator.builder.factory.class%" factory-method="createValidatorBuilder" public="false">
+        <service id="validator.builder" class="%validator.builder.class%" factory-class="%validator.builder.factory.class%" factory-method="createValidatorBuilder">
             <call method="setConstraintValidatorFactory">
                 <argument type="service" id="validator.validator_factory" />
             </call>

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder`
`694`	`694`	`$definition->replaceArgument(0, $config['strict_email']);`
`695`	`695`
`696`	`696`	`if (array_key_exists('enable_annotations', $config) && $config['enable_annotations']) {`
`697`		`- $validatorBuilder->addMethodCall('enableAnnotations', array(new Reference('annotation_reader')));`
	`697`	`+ $validatorBuilder->addMethodCall('enableAnnotationMapping', array(new Reference('annotation_reader')));`
`698`	`698`	`}`
`699`	`699`
`700`	`700`	`if (array_key_exists('static_method', $config) && $config['static_method']) {`