Compare commits

...

2 Commits

Author SHA1 Message Date
Sebastiaan Provost 5642614492 Backporting the changes made in #139 (#140)
* Backporting the changes made in https://github.com/egulias/EmailValidator/pull/139 so this functionality is also accessible in the 1.2.x releases.
This fix allows for more compliance with the DNS RFC. Explanation here: https://github.com/egulias/EmailValidator/pull/139/commits/08bac068c26edd210daa259a2819d7dfd7438091
2017-02-03 23:48:59 +01:00
Chris McCafferty b8bb147f46 Added EmailValidatorInterface (#120) 2016-07-03 23:52:18 +02:00
2 changed files with 73 additions and 29 deletions
+11 -29
View File
@@ -7,7 +7,7 @@ namespace Egulias\EmailValidator;
* *
* @author Eduardo Gulias Davis <me@egulias.com> * @author Eduardo Gulias Davis <me@egulias.com>
*/ */
class EmailValidator class EmailValidator implements EmailValidatorInterface
{ {
/** /**
* Critical validation errors used to indicate that * Critical validation errors used to indicate that
@@ -113,26 +113,7 @@ class EmailValidator
} }
/** /**
* Validates an email address against the following standards: * {@inheritdoc}
*
* RFC-5321: Simple Mail Transfer Protocol
* RFC-5322: Internet Message Format
* RFC-6530: Overview and Framework for Internationalized Email
* RFC-6531: SMTP Extension for Internationalized Email
* RFC-6532: Internationalized Email Headers
* RFC-1123 section 2.1: Requirements for Internet Hosts -- Application and Support
* RFC-4291 section 2.2: IP Version 6 Addressing Architecture
*
* @param string $email The email address to validate.
* @param bool $checkDNS Whether or not the email address's hostname should
* be confirmed with a DNS lookup. This only comes
* into play if strict mode is also enabled.
* @param bool $strict If this is true, and any informational warnings
* were raised during validation, the email address
* will be considered invalid. Additionally, if
* $checkDNS is true and the DNS lookup failed,
* the email address will be considered invalid.
* @return bool
*/ */
public function isValid($email, $checkDNS = false, $strict = false) public function isValid($email, $checkDNS = false, $strict = false)
{ {
@@ -156,7 +137,7 @@ class EmailValidator
} }
/** /**
* @return boolean * {@inheritdoc}
*/ */
public function hasWarnings() public function hasWarnings()
{ {
@@ -164,7 +145,7 @@ class EmailValidator
} }
/** /**
* @return array * {@inheritdoc}
*/ */
public function getWarnings() public function getWarnings()
{ {
@@ -172,7 +153,7 @@ class EmailValidator
} }
/** /**
* @return string * {@inheritdoc}
*/ */
public function getError() public function getError()
{ {
@@ -180,9 +161,7 @@ class EmailValidator
} }
/** /**
* @param int $threshold * {@inheritdoc}
*
* @return EmailValidator
*/ */
public function setThreshold($threshold) public function setThreshold($threshold)
{ {
@@ -192,7 +171,7 @@ class EmailValidator
} }
/** /**
* @return int * {@inheritdoc}
*/ */
public function getThreshold() public function getThreshold()
{ {
@@ -205,7 +184,10 @@ class EmailValidator
*/ */
protected function checkDNS() protected function checkDNS()
{ {
$mxRecordExists = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX'); $host = $this->parser->getParsedDomainPart();
$host = rtrim($host, '.') . '.';
$mxRecordExists = checkdnsrr($host, 'MX');
if (!$mxRecordExists) { if (!$mxRecordExists) {
$this->warnings[] = self::DNSWARN_NO_RECORD; $this->warnings[] = self::DNSWARN_NO_RECORD;
@@ -0,0 +1,62 @@
<?php
namespace Egulias\EmailValidator;
/**
* EmailValidatorInterface
*
* @author Chris McCafferty <cilefen@gmail.com>
*/
interface EmailValidatorInterface
{
/**
* Validates an email address against the following standards:
*
* RFC-5321: Simple Mail Transfer Protocol
* RFC-5322: Internet Message Format
* RFC-6530: Overview and Framework for Internationalized Email
* RFC-6531: SMTP Extension for Internationalized Email
* RFC-6532: Internationalized Email Headers
* RFC-1123 section 2.1: Requirements for Internet Hosts -- Application and Support
* RFC-4291 section 2.2: IP Version 6 Addressing Architecture
*
* @param string $email The email address to validate.
* @param bool $checkDNS Whether or not the email address's hostname should
* be confirmed with a DNS lookup. This only comes
* into play if strict mode is also enabled.
* @param bool $strict If this is true, and any informational warnings
* were raised during validation, the email address
* will be considered invalid. Additionally, if
* $checkDNS is true and the DNS lookup failed,
* the email address will be considered invalid.
* @return bool
*/
public function isValid($email, $checkDNS = false, $strict = false);
/**
* @return bool
*/
public function hasWarnings();
/**
* @return array
*/
public function getWarnings();
/**
* @return string
*/
public function getError();
/**
* @param int $threshold The acceptable number of deprecation warnings.
*
* @return EmailValidator
*/
public function setThreshold($threshold);
/**
* @return int
*/
public function getThreshold();
}