[Validator] do not treat payload as callback

xabbuh · xabbuh · commit 18d6791ddbba · 2016-03-24T15:49:51.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 {

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 {`