Compare commits

...

1 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
4 changed files with 15 additions and 4 deletions
+10 -2
View File
@@ -2,12 +2,17 @@ sudo: false
language: php language: php
cache:
directories:
- $HOME/.composer/cache/files
php: php:
- 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7.0 - 7.0
- 7.1
- 7.2
- hhvm - hhvm
env: env:
@@ -18,6 +23,9 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- php: 5.3 - php: 5.3
dist: precise
- php: 5.3
dist: precise
env: deps=low env: deps=low
- php: 5.4 - php: 5.4
env: deps=no env: deps=no
@@ -31,5 +39,5 @@ install:
script: script:
- mkdir -p build/logs - 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": { "psr-0": {
"Egulias\\": "src/" "Egulias\\": "src/"
} }
},
"scripts": {
"test": "phpunit"
} }
} }
@@ -133,7 +133,7 @@ class EmailValidator implements EmailValidatorInterface
return false; 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) 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()); $this->assertEquals($warnings, $this->validator->getWarnings());
} }