Merge pull request #59 from egulias/next-min-ver

Improve UTF8 detection, domain part validation, others

.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 language: php
 
 php:
@@ -5,11 +7,25 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
-before_script:
+env:
- - wget http://getcomposer.org/composer.phar
+  global:
- - php composer.phar install --dev --no-interaction
+    - deps=no
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.3
+      env: deps=low
+    - php: 5.6
+      env: deps=high
+
+install:
+  - if [ "$deps" = "no" ]; then composer install; fi
+  - if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
+  - if [ "$deps" = "high" ]; then composer update; fi
 
 script:
  - mkdir -p build/logs

README.md

@@ -1,6 +1,9 @@
-EmailValidator [![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6/small.png)](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master)
+#EmailValidator
+[![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6/small.png)](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)
 =============================
+With the help of
 
+![Powered by PhpStorm](https://www.jetbrains.com/phpstorm/documentation/docs/logo_phpstorm.png)
 ##Installation##
 
 Run the command below to install via Composer

composer.json

@@ -15,10 +15,11 @@
   },
   "require":      {
     "php": ">= 5.3.3",
-    "doctrine/lexer": "dev-master"
+    "doctrine/lexer": "~1.0,>=1.0.1"
   },
   "require-dev" :   {
-    "satooshi/php-coveralls": "dev-master"
+    "satooshi/php-coveralls": "dev-master",
+    "phpunit/phpunit": "~4.4"
   },
   "autoload": {
     "psr-0": {

src/Egulias/EmailValidator/EmailLexer.php

@@ -75,8 +75,6 @@ class EmailLexer extends AbstractLexer
         '\0'   => self::C_NUL,
     );
 
-    protected $invalidASCII = array(226 => 1,);
-
     protected $hasInvalidTokens = false;
 
     protected $previous;
@@ -138,7 +136,8 @@ class EmailLexer extends AbstractLexer
     protected function getCatchablePatterns()
     {
         return array(
-            '[a-zA-Z_]+[46]?',
+            '[a-zA-Z_]+[46]?', //ASCII and domain literal
+            '[^\x00-\x7F]',  //UTF-8
             '[0-9]+',
             '\r\n',
             '::',
@@ -179,11 +178,6 @@ class EmailLexer extends AbstractLexer
             return self::INVALID;
         }
 
-        if ($this->isASCIIInvalid($value)) {
-            $this->hasInvalidTokens = true;
-            return self::INVALID;
-        }
-
         return  self::GENERIC;
     }
 
@@ -209,19 +203,6 @@ class EmailLexer extends AbstractLexer
         return false;
     }
 
-    /**
-     * @param $value
-     * @return bool
-     */
-    protected function isASCIIInvalid($value)
-    {
-        if (isset($this->invalidASCII[ord($value)])) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * @param $value
      * @return bool

src/Egulias/EmailValidator/Parser/DomainPart.php

@@ -104,6 +104,7 @@ class DomainPart extends Parser
     {
         $domain = '';
         do {
+
             $prev = $this->lexer->getPrevious();
 
             if ($this->lexer->token['type'] === EmailLexer::S_SLASH) {
@@ -217,9 +218,6 @@ class DomainPart extends Parser
         return $addressLiteral;
     }
 
-    /**
-     * @param string $addressLiteral
-     */
     protected function checkIPV4Tag($addressLiteral)
     {
         $matchesIP  = array();
@@ -245,6 +243,17 @@ class DomainPart extends Parser
 
     protected function checkDomainPartExceptions($prev)
     {
+        $invalidDomainTokens = array(
+            EmailLexer::S_DQUOTE => true,
+            EmailLexer::S_SEMICOLON => true,
+            EmailLexer::S_GREATERTHAN => true,
+            EmailLexer::S_LOWERTHAN => true,
+        );
+
+        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
+            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+        }
+
         if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
             throw new \InvalidArgumentException('ERR_COMMA_IN_DOMAIN');
         }

tests/egulias/Tests/EmailValidator/EmailLexerTest.php

@@ -103,6 +103,17 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
         $this->assertEquals(EmailLexer::S_HTAB, $lexer->token['type']);
     }
 
+    public function testLexerForUTF8()
+    {
+        $lexer = new EmailLexer();
+        $lexer->setInput("áÇ@bar.com");
+        $lexer->moveNext();
+        $lexer->moveNext();
+        $this->assertEquals(EmailLexer::GENERIC, $lexer->token['type']);
+        $lexer->moveNext();
+        $this->assertEquals(EmailLexer::GENERIC, $lexer->token['type']);
+    }
+
     public function testLexerSearchToken()
     {
         $lexer = new EmailLexer();
@@ -111,15 +122,6 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
         $this->assertTrue($lexer->find(EmailLexer::S_HTAB));
     }
 
-    public function testLexerHasInvalidTokens()
-    {
-        $lexer = new EmailLexer();
-        $lexer->setInput(chr(226));
-        $lexer->moveNext();
-        $lexer->moveNext();
-        $this->assertTrue($lexer->hasInvalidTokens());
-    }
-
     public function getTokens()
     {
         return array(
@@ -152,7 +154,7 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
             array('}', EmailLexer::S_CLOSEQBRACKET),
             array('',  EmailLexer::S_EMPTY),
             array(chr(31),  EmailLexer::INVALID),
-            array(chr(226),  EmailLexer::INVALID),
+            array(chr(226),  EmailLexer::GENERIC),
             array(chr(0),  EmailLexer::C_NUL)
         );
     }

tests/egulias/Tests/EmailValidator/EmailValidatorTest.php

@@ -37,6 +37,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
     public function getValidEmails()
     {
         return array(
+            array('â@iana.org'),
             array('fabien@symfony.com'),
             array('example@example.co.uk'),
             array('fabien_potencier@example.fr'),
@@ -55,6 +56,13 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array('"test\ test"@iana.org'),
             array('""@iana.org'),
             array('"\""@iana.org'),
+            array('müller@möller.de'),
+            array('test@email*'),
+            array('test@email!'),
+            array('test@email&'),
+            array('test@email^'),
+            array('test@email%'),
+            array('test@email$'),
         );
     }
 
@@ -69,7 +77,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
     public function getInvalidEmails()
     {
         return array(
-
+            array('test@example.com test'),
             array('user  name@example.com'),
             array('user   name@example.com'),
             array('example.@example.co.uk'),
@@ -108,6 +116,13 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array('test@iana.org \r\n\r\n'),
             array('test@iana.org  \r\n\r\n '),
             array('test@iana/icann.org'),
+            array('test@foo;bar.com'),
+            array('test;123@foobar.com'),
+            array('test@example..com'),
+            array('email.email@email."'),
+            array('test@email>'),
+            array('test@email<'),
+            array('test@email{'),
         );
     }
 
@@ -173,13 +188,32 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
     public function getInvalidEmailsWithWarnings()
     {
         return array(
-            array(array( EmailValidator::DEPREC_CFWS_NEAR_AT,), 'example @example.co.uk'),
+            array(
-            array(array( EmailValidator::DEPREC_CFWS_NEAR_AT,), 'example@ example.co.uk'),
+                array(
-            array(array( EmailValidator::CFWS_COMMENT,), 'example@example(examplecomment).co.uk'),
+                    EmailValidator::DEPREC_CFWS_NEAR_AT,
+                    EmailValidator::DNSWARN_NO_RECORD
+                ),
+                'example @example.co.uk'
+            ),
+            array(
+                array(
+                    EmailValidator::DEPREC_CFWS_NEAR_AT,
+                    EmailValidator::DNSWARN_NO_RECORD
+                ),
+                'example@ example.co.uk'
+            ),
+            array(
+                array(
+                    EmailValidator::CFWS_COMMENT,
+                    EmailValidator::DNSWARN_NO_RECORD
+                ),
+                'example@example(examplecomment).co.uk'
+            ),
             array(
                 array(
                     EmailValidator::CFWS_COMMENT,
                     EmailValidator::DEPREC_CFWS_NEAR_AT,
+                    EmailValidator::DNSWARN_NO_RECORD,
                 ),
                 'example(examplecomment)@example.co.uk'
             ),
@@ -187,6 +221,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
                 array(
                     EmailValidator::RFC5321_QUOTEDSTRING,
                     EmailValidator::CFWS_FWS,
+                    EmailValidator::DNSWARN_NO_RECORD,
                 ),
                 "\"\t\"@example.co.uk"
             ),
@@ -194,6 +229,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
                 array(
                     EmailValidator::RFC5321_QUOTEDSTRING,
                     EmailValidator::CFWS_FWS,
+                    EmailValidator::DNSWARN_NO_RECORD
                 ),
                 "\"\r\"@example.co.uk"
             ),
@@ -285,12 +321,14 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array(
                 array(
                     EmailValidator::RFC5321_QUOTEDSTRING,
+                    EmailValidator::DNSWARN_NO_RECORD
                 ),
                 '"example"@example.co.uk'
             ),
             array(
                 array(
                     EmailValidator::RFC5322_LOCAL_TOOLONG,
+                    EmailValidator::DNSWARN_NO_RECORD
                 ),
                 'too_long_localpart_too_long_localpart_too_long_localpart_too_long_localpart@example.co.uk'
             ),