diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php index 3eee66fcd8..cd635eb136 100644 --- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php +++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php @@ -138,11 +138,7 @@ class EmailValidator extends ConstraintValidator */ private function checkMX($host) { - if ('' === $host) { - return false; - } - - return checkdnsrr($host, 'MX'); + return ('' !== $host) && checkdnsrr($host, 'MX'); } /** @@ -154,10 +150,6 @@ class EmailValidator extends ConstraintValidator */ private function checkHost($host) { - if ('' === $host) { - return false; - } - - return $this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA')); + return ('' !== $host) && ($this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA'))); } }