Compare commits

...

2 Commits

Author SHA1 Message Date
Michele Locati 758a77525b [1.x] Fix result of isValid when DNS lookup fails and strict is false (#172)
* Fix result of isValid when DNS lookup fails and strict is false

* Fix TravisCI for PHP 5.3

* Fix tests (isValid now returns false in case of errors in MX DNS lookups)

* Cache composer files

* Run TravisCI tests for PHP 7.1 and 7.2

* Use the PHPUnit installed by composer, not the system one

* Cache only composer packages, not their metadata
2018-09-25 22:59:41 +02:00
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
4 changed files with 19 additions and 5 deletions
+10 -2
View File
@@ -2,12 +2,17 @@ sudo: false
language: php
cache:
directories:
- $HOME/.composer/cache/files
php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- hhvm
env:
@@ -18,6 +23,9 @@ matrix:
fast_finish: true
include:
- php: 5.3
dist: precise
- php: 5.3
dist: precise
env: deps=low
- php: 5.4
env: deps=no
@@ -31,5 +39,5 @@ install:
script:
- mkdir -p build/logs
- phpunit --coverage-clover build/logs/clover.xml
- composer test -- --coverage-clover build/logs/clover.xml
+3
View File
@@ -24,5 +24,8 @@
"psr-0": {
"Egulias\\": "src/"
}
},
"scripts": {
"test": "phpunit"
}
}
@@ -133,7 +133,7 @@ class EmailValidator implements EmailValidatorInterface
return false;
}
return ($strict ? (!$this->hasWarnings() && !$dnsProblemExists) : true);
return !($dnsProblemExists || $strict && $this->hasWarnings());
}
/**
@@ -184,7 +184,10 @@ class EmailValidator implements EmailValidatorInterface
*/
protected function checkDNS()
{
$mxRecordExists = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX');
$host = $this->parser->getParsedDomainPart();
$host = rtrim($host, '.') . '.';
$mxRecordExists = checkdnsrr($host, 'MX');
if (!$mxRecordExists) {
$this->warnings[] = self::DNSWARN_NO_RECORD;
@@ -180,7 +180,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testValidEmailsWithWarningsCheck($warnings, $email)
{
$this->assertTrue($this->validator->isValid($email, true));
$this->assertFalse($this->validator->isValid($email, true));
$this->assertEquals($warnings, $this->validator->getWarnings());
}