[7.x] validate email with custom class (#33835)

* TDD: add unittest * add elseif case for FQCN email validation
laravel · Aug 12, 2020 · 3da489c · 3da489c
1 parent fdf3d4a
commit 3da489c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -656,6 +656,8 @@ public function validateEmail($attribute, $value, $parameters)
                     return new FilterEmailValidation();
                 } elseif ($validation === 'filter_unicode') {
                     return FilterEmailValidation::unicode();
+                } elseif (is_string($validation) && class_exists($validation)) {
+                    return $this->container->make($validation);
                 }
             })
             ->values()

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -4,6 +4,7 @@
 
 use DateTime;
 use DateTimeImmutable;
+use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Guard;
@@ -2422,6 +2423,17 @@ public function testValidateEmailWithFilterUnicodeCheck()
         $this->assertFalse($v->passes());
     }
 
+    public function testValidateEmailWithCustomClassCheck()
+    {
+        $container = m::mock(Container::class);
+        $container->shouldReceive('make')->with(NoRFCWarningsValidation::class)->andReturn(new NoRFCWarningsValidation());
+
+        $v = new Validator($this->getIlluminateArrayTranslator(), ['x' => 'foo@bar '], ['x' => 'email:'.NoRFCWarningsValidation::class]);
+        $v->setContainer($container);
+
+        $this->assertFalse($v->passes());
+    }
+
     /**
      * @dataProvider validUrls
      */