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

Improve UTF8 detection, domain part validation, others
Improve UTF8 detection within the regexp, update tests for non-ascii char, fix #55
2026-09-03 05:57:57 +00:00 · 2015-04-26 17:49:00 +02:00 · 2015-04-26 17:38:14 +02:00 · 2015-04-26 17:38:14 +02:00 · 2015-04-23 11:44:43 +02:00 · 2015-04-23 10:08:34 +02:00
9 changed files with 934 additions and 86 deletions
@@ -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:
- - wget http://getcomposer.org/composer.phar
- - php composer.phar install --dev --no-interaction
+env:
+  global:
+    - 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
@@ -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
@@ -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": {
@@ -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
@@ -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');
        }
@@ -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)
        );
    }
@@ -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( EmailValidator::DEPREC_CFWS_NEAR_AT,), 'example@ example.co.uk'),
-            array(array( EmailValidator::CFWS_COMMENT,), 'example@example(examplecomment).co.uk'),
+            array(
+                array(
+                    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'
            ),
Author	SHA1	Message	Date
Eduardo Gulias Davis	5631c3fe2e	Merge pull request #59 from egulias/next-min-ver Improve UTF8 detection, domain part validation, others	2015-04-26 17:49:00 +02:00
Eduardo Gulias Davis	c383717824	Improve UTF8 detection within the regexp, update tests for non-ascii char, fix #55	2015-04-26 17:38:14 +02:00
Eduardo Gulias Davis	aabed98198	Improve domain part controls for non allowed chars. Fix #57 for DQUOTE	2015-04-26 17:38:14 +02:00
Eduardo Gulias Davis	3b0fd01aa3	Merge pull request #58 from xabbuh/travis-config update Travis configuration	2015-04-23 11:44:43 +02:00
Christian Flothmann	4efe697504	update Travis configuration * run builds on the container-based infrastructure * add a build for PHP 7 * report the build status as soon as possible (either when a mandatory job fails or when only jobs allowed to fail are left)	2015-04-23 10:08:34 +02:00
Eduardo Gulias Davis	7a4c5714f5	Merge pull request #50 from xabbuh/test-deps test low and high dependency versions	2015-04-23 00:10:58 +02:00
Eduardo Gulias Davis	0a26375a7a	Merge pull request #54 from xabbuh/update-readme-markdown fix readme markup	2015-03-08 01:24:16 +01:00
Christian Flothmann	773fe5f4a3	fix readme markup Before, the character would have been rendered as is instead of being treated as the final character of the headline.	2015-03-05 20:05:56 +01:00
Eduardo Gulias Davis	4a209951ee	Merge pull request #49 from DavidPrevot/lexer The latest php-doctrine-lexer is needed	2015-02-08 22:30:23 +01:00
Christian Flothmann	a8b0bab5aa	test low and high dependency versions	2015-02-06 10:43:29 +01:00
David Prévot	cc0b91f311	The latest php-doctrine-lexer is needed The tests actually fail with version 1.0.	2015-02-03 14:23:48 -04:00
Eduardo Gulias Davis	8092ecaeff	Merge pull request #48 from 0x46616c6b/tests-doubledot-german-umlauts Tests: Double dots in domain part, German Umlauts as valid e-mail	2015-01-27 01:03:43 +01:00
Eduardo Gulias Davis	f19defb373	Merge pull request #47 from 0x46616c6b/vendors-phpunit add phpunit to require-dev	2015-01-27 01:02:44 +01:00
louis	9a518fb1bd	extends tests with invalid domain part with two dots and valid email with german umlauts	2015-01-26 14:13:13 +01:00
louis	9b184605e8	add phpunit to require-dev	2015-01-26 14:05:53 +01:00
Eduardo Gulias Davis	7a4842c60f	Merge pull request #45 from kbond/semicolon-name added test for email with semi-colon in name	2015-01-05 23:23:13 +01:00
Kevin Bond	687ab6a66e	added test for email with semi-colon in name	2015-01-05 11:39:38 -05:00
Eduardo Gulias Davis	116d4054fa	#21 - Test for words after domain part	2015-01-04 23:54:28 +01:00
Eduardo Gulias Davis	af9417f765	#40 - require latest lexer	2015-01-04 23:42:32 +01:00
Eduardo Gulias Davis	ab0bcfb424	Merge pull request #44 from egulias/kbond-semicolon-fail From #43 - Kbond semicolon fail	2015-01-04 17:36:06 +01:00
Eduardo Gulias Davis	833b3e7924	#41 - Semicolon in domain	2015-01-04 17:28:58 +01:00
Eduardo Gulias Davis	fec1609458	Update tests for DNSCheck	2015-01-04 17:24:36 +01:00
Eduardo Gulias Davis	add559b99c	Add PhpStorm logo Thanks for supporting!	2015-01-04 17:03:09 +01:00
Kevin Bond	19e390d863	added failing test for email with semi-colon in domain	2014-12-18 11:00:21 -05:00
Eduardo Gulias Davis	5320c26b38	Merge pull request #39 from shakaran/patch-1 Rename Ohter.md to Other.md	2014-11-30 19:03:44 +01:00
Ángel Guzmán Maeso	3b6ab3bcd5	Rename Ohter.md to Other.md Fix small filename typo.	2014-11-30 02:17:28 +01:00