feature #16909 Allows access to payload in callback validator (conradkleinespel)

fabpot · fabpot · commit 36c2961def4c · 2016-01-25T09:16:45.000+01:00
This PR was merged into the 3.1-dev branch. Discussion ---------- Allows access to payload in callback validator | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15092 | License | MIT | Doc PR | none Commits ------- 26cd91d allows access to payload in callback validator
diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
@@ -34,7 +34,7 @@ public function validate($object, Constraint $constraint)
 
         $method = $constraint->callback;
         if ($method instanceof \Closure) {
-            $method($object, $this->context);
+            $method($object, $this->context, $constraint->payload);
         } elseif (is_array($method)) {
             if (!is_callable($method)) {
                 if (isset($method[0]) && is_object($method[0])) {
@@ -43,7 +43,7 @@ public function validate($object, Constraint $constraint)
                 throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable', json_encode($method)));
             }
 
-            call_user_func($method, $object, $this->context);
+            call_user_func($method, $object, $this->context, $constraint->payload);
         } elseif (null !== $object) {
             if (!method_exists($object, $method)) {
                 throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, get_class($object)));
@@ -52,9 +52,9 @@ public function validate($object, Constraint $constraint)
             $reflMethod = new \ReflectionMethod($object, $method);
 
             if ($reflMethod->isStatic()) {
-                $reflMethod->invoke(null, $object, $this->context);
+                $reflMethod->invoke(null, $object, $this->context, $constraint->payload);
             } else {
-                $reflMethod->invoke($object, $this->context);
+                $reflMethod->invoke($object, $this->context, $constraint->payload);
             }
         }
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
@@ -226,4 +226,28 @@ public function testAnnotationInvocationMultiValued()
 
         $this->assertEquals(new Callback(array(__CLASS__.'_Class', 'validateCallback')), $constraint);
     }
+
+    public function testPayloadIsPassedToCallback()
+    {
+        $object = new \stdClass();
+        $payloadCopy = null;
+
+        $constraint = new Callback([
+            'callback' => function($object, ExecutionContextInterface $constraint, $payload) use (&$payloadCopy) {
+                $payloadCopy = $payload; 
+            },
+            'payload' => 'Hello world!',
+        ]);
+        $this->validator->validate($object, $constraint);
+        $this->assertEquals('Hello world!', $payloadCopy);
+
+        $payloadCopy = null;
+        $constraint = new Callback([
+            'callback' => function($object, ExecutionContextInterface $constraint, $payload) use (&$payloadCopy) {
+                $payloadCopy = $payload; 
+            },
+        ]);
+        $this->validator->validate($object, $constraint);
+        $this->assertNull($payloadCopy);
+    }
 }
