add test valid domain

symfony · beebop1032 · Jun 8, 2018 · Jun 9, 2018 · Jun 9, 2018 · Jun 11, 2018
commit e4e75aa919f4a81ab9ca3d62c0bc9dddec54f987
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -22,6 +22,7 @@
 */
 class EmailValidator extends ConstraintValidator
 {
+    const DOMAIN_PATTERN = '/^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.[a-zA-Z]{2,}$/';
    private $isStrict;

    /**
@@ -95,10 +96,6 @@ public function validate($value, Constraint $constraint)

        $host = (string) substr($value, strrpos($value, '@') + 1);

-        if ('.' !== substr($host, -1)) {
-            $host .= '.';
-        }
-
        // Check for host DNS resource records
        if ($constraint->checkMX) {
            if (!$this->checkMX($host)) {
@@ -133,6 +130,18 @@ public function validate($value, Constraint $constraint)
        }
    }

+    /**
+     * Check if host domain is valid
+     *
+     * @param string $host Host
+     *
+     * @return bool
+     */
+    private function checkHostDomain($host)
+    {
+        return preg_match(static::DOMAIN_PATTERN, $host);
+    }
+
    /**
     * Check DNS Records for MX type.
     *
@@ -142,7 +151,7 @@ public function validate($value, Constraint $constraint)
     */
    private function checkMX($host)
    {
-        return '' !== $host && checkdnsrr($host, 'MX');
+        return $this->checkHostDomain($host) && checkdnsrr($host, 'MX');
    }

    /**
@@ -154,6 +163,6 @@ private function checkMX($host)
     */
    private function checkHost($host)
    {
-        return '' !== $host && ($this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA')));
+        return $this->checkHostDomain($host) && ($this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA')));
    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -95,6 +95,7 @@ public function getInvalidEmails()
            array('example'),
            array('example@'),
            array('example@localhost'),
+            array('example@gmailcom'),
            array('foo@example.com bar'),
        );
    }