[Validator] Add createValidCallable() that returns a boolean

wouterj · wouterj · commit abdedda536b1 · 2021-03-07T12:16:14.000+01:00
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.3
+---
+
+ * Add `Validation::createIsValidCallable()` that returns true/false instead of throwing exceptions
+
 5.2.0
 -----
 
diff --git a/src/Symfony/Component/Validator/Tests/ValidationTest.php b/src/Symfony/Component/Validator/Tests/ValidationTest.php
@@ -30,7 +30,29 @@ public function testCreateCallableValid()
     public function testCreateCallableInvalid()
     {
         $validator = Validation::createCallable(new Email());
-        $this->expectException(ValidationFailedException::class);
-        $validator('test');
+        try {
+            $validator('test');
+            $this->fail('No ValidationFailedException thrown');
+        } catch (ValidationFailedException $e) {
+            $this->assertEquals('test', $e->getValue());
+
+            $violations = $e->getViolations();
+            $this->assertCount(1, $violations);
+            $this->assertEquals('This value is not a valid email address.', $violations->get(0)->getMessage());
+        }
+    }
+
+    public function testCreateIsValidCallableValid()
+    {
+        $validator = Validation::createIsValidCallable(new Email());
+        $this->assertTrue($validator('test@example.com'));
+    }
+
+    public function testCreateIsValidCallableInvalid()
+    {
+        $validator = Validation::createIsValidCallable(new Email());
+        $this->assertFalse($validator('test', $violations));
+        $this->assertCount(1, $violations);
+        $this->assertEquals('This value is not a valid email address.', $violations->get(0)->getMessage());
     }
 }
diff --git a/src/Symfony/Component/Validator/Validation.php b/src/Symfony/Component/Validator/Validation.php
@@ -27,6 +27,26 @@ final class Validation
      * @param Constraint|ValidatorInterface|null $constraintOrValidator
      */
     public static function createCallable($constraintOrValidator = null, Constraint ...$constraints): callable
+    {
+        $validator = self::createIsValidCallable($constraintOrValidator, ...$constraints);
+
+        return static function ($value) use ($validator) {
+            if (!$validator($value, $violations)) {
+                throw new ValidationFailedException($value, $violations);
+            }
+
+            return $value;
+        };
+    }
+
+    /**
+     * Creates a callable that returns true/false instead of throwing validation exceptions.
+     *
+     * @param Constraint|ValidatorInterface|null $constraintOrValidator
+     *
+     * @return callable($value, ConstraintViolationListInterface $violations = null): bool
+     */
+    public static function createIsValidCallable($constraintOrValidator = null, Constraint ...$constraints): callable
     {
         $validator = $constraintOrValidator;
 
@@ -39,13 +59,10 @@ public static function createCallable($constraintOrValidator = null, Constraint
 
         $validator = $validator ?? self::createValidator();
 
-        return static function ($value) use ($constraints, $validator) {
+        return static function ($value, &$violations = null) use ($constraints, $validator) {
             $violations = $validator->validate($value, $constraints);
-            if (0 !== $violations->count()) {
-                throw new ValidationFailedException($value, $violations);
-            }
 
-            return $value;
+            return 0 === $violations->count();
         };
     }
 
