[Form] Fixed: String validation groups are never interpreted as callb…

…acks
symfony · May 3, 2013 · 7b2ebbf · 7b2ebbf
1 parent 3f5cffe
commit 7b2ebbf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -181,7 +181,7 @@ private static function getValidationGroups(FormInterface $form)
             $groups = $form->getConfig()->getOption('validation_groups');
 
             if (null !== $groups) {
-                if (is_callable($groups)) {
+                if (!is_string($groups) && is_callable($groups)) {
                     $groups = call_user_func($groups, $form);
                 }
 

diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -302,6 +302,24 @@ public function testHandleCallbackValidationGroups()
         $this->validator->validate($form, new Form());
     }
 
+    public function testDontExecuteFunctionNames()
+    {
+        $context = $this->getExecutionContext();
+        $graphWalker = $context->getGraphWalker();
+        $object = $this->getMock('\stdClass');
+        $options = array('validation_groups' => 'header');
+        $form = $this->getBuilder('name', '\stdClass', $options)
+            ->setData($object)
+            ->getForm();
+
+        $graphWalker->expects($this->once())
+            ->method('walkReference')
+            ->with($object, 'header', 'data', true);
+
+        $this->validator->initialize($context);
+        $this->validator->validate($form, new Form());
+    }
+
     public function testHandleClosureValidationGroups()
     {
         $context = $this->getExecutionContext();