mirror of
https://github.com/egulias/EmailValidator.git
synced 2026-08-31 20:50:01 +00:00
[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
This commit is contained in:
committed by
Eduardo Gulias Davis
parent
5642614492
commit
758a77525b
+10
-2
@@ -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
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user