Merge pull request #35 from craue/fix-strict-check

make strict check work again

src/Egulias/EmailValidator/EmailValidator.php

@@ -95,7 +95,7 @@ class EmailValidator
             return false;
         }
 
-        return ($strict) ? (!$this->hasWarnings() && $dns) : true;
+        return !$strict || (!$this->hasWarnings() && $dns);
     }
 
     /**
@@ -144,16 +144,9 @@ class EmailValidator
 
     protected function checkDNS()
     {
-        $checked = false;
-        if (!function_exists('dns_get_record') && (
-            in_array(self::DNSWARN_NO_RECORD, $this->warnings) &&
-            in_array(self::DNSWARN_NO_MX_RECORD, $this->warnings)
-        )) {
-            return $checked;
-        }
+        $checked = true;
 
         $result = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX');
-        $checked = true;
 
         if (!$result) {
             $this->warnings[] = self::DNSWARN_NO_RECORD;

tests/egulias/Tests/EmailValidator/EmailValidatorTest.php

@@ -150,6 +150,16 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($warnings, $this->validator->getWarnings());
     }
 
+    /**
+     * @dataProvider getInvalidEmailsWithWarnings
+     */
+    public function testInvalidEmailsWithDnsCheckAndStrictMode($warnings, $email)
+    {
+        $this->assertFalse($this->validator->isValid($email, true, true));
+
+        $this->assertEquals($warnings, $this->validator->getWarnings());
+    }
+
     public function getInvalidEmailsWithWarnings()
     {
         return array(
@@ -301,6 +311,17 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
                 'parttoolonglocalparttoolonglocalparttoolonglocalparttoolonglocalparttoolonglocalparttoolonglocalpart'.
                 'toolonglocalparttoolonglocalparttoolonglocalparttoolonglocalpar'
             ),
+            array(
+                array(
+                    EmailValidator::DNSWARN_NO_RECORD,
+                ),
+                'test@test'
+            ),
         );
     }
+
+    public function testInvalidEmailsWithStrict()
+    {
+        $this->assertFalse($this->validator->isValid('"test"@test', false, true));
+    }
 }