[Validator] do not treat payload as callback

xabbuh · xabbuh · commit 2066fc03c717 · 2016-03-24T16:03:49.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/Callback.php b/src/Symfony/Component/Validator/Constraints/Callback.php
@@ -49,7 +49,7 @@ public function __construct($options = null)
             @trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
         }
 
-        if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups'])) {
+        if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups']) && !isset($options['payload'])) {
             if (is_callable($options) || !$options) {
                 $options = array('callback' => $options);
             } else {
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/Entity.php
@@ -85,7 +85,7 @@ public function getData()
     }
 
     /**
-     * @Assert\Callback
+     * @Assert\Callback(payload="foo")
      */
     public function validateMe(ExecutionContextInterface $context)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -53,7 +53,7 @@ public function testLoadClassMetadata()
         $expected->setGroupSequence(array('Foo', 'Entity'));
         $expected->addConstraint(new ConstraintA());
         $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
-        $expected->addConstraint(new Callback('validateMe'));
+        $expected->addConstraint(new Callback(array('callback' => 'validateMe', 'payload' => 'foo')));
         $expected->addConstraint(new Callback('validateMeStatic'));
         $expected->addPropertyConstraint('firstName', new NotNull());
         $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
@@ -123,7 +123,7 @@ public function testLoadClassMetadataAndMerge()
         $expected->setGroupSequence(array('Foo', 'Entity'));
         $expected->addConstraint(new ConstraintA());
         $expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
-        $expected->addConstraint(new Callback('validateMe'));
+        $expected->addConstraint(new Callback(array('callback' => 'validateMe', 'payload' => 'foo')));
         $expected->addConstraint(new Callback('validateMeStatic'));
         $expected->addPropertyConstraint('firstName', new NotNull());
         $expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct($options = null)`
`49`	`49`	`@trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups'])) {`
	`52`	`+ if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups']) && !isset($options['payload'])) {`
`53`	`53`	`if (is_callable($options) \|\| !$options) {`
`54`	`54`	`$options = array('callback' => $options);`
`55`	`55`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getData()`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * @Assert\Callback`
	`88`	`+ * @Assert\Callback(payload="foo")`
`89`	`89`	`*/`
`90`	`90`	`public function validateMe(ExecutionContextInterface $context)`
`91`	`91`	`{`