diff --git a/.travis.yml b/.travis.yml
index 67f3daf..5ffd896 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,4 @@ php:
before_script:
- wget http://getcomposer.org/composer.phar
- php composer.phar install
-script: phpunit -c tests/ tests/
+script: phpunit
diff --git a/composer.json b/composer.json
index 415204e..7025695 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,8 @@
],
"require": {
"php": ">= 5.3.3",
- "doctrine/common": "~2.2"
+ "doctrine/lexer": "~1.0",
+ "symfony/validator": "dev-master"
},
"autoload": {
"psr-0": {
diff --git a/composer.lock b/composer.lock
index f1ca564..dc86a4a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,34 +3,29 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "f22a825f48c4dcd5a4aef5b8bdbc0bcf",
+ "hash": "ec97acf9cb298074065a27ad27d42b64",
"packages": [
{
- "name": "doctrine/common",
- "version": "2.3.0",
+ "name": "doctrine/lexer",
+ "version": "v1.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/common",
- "reference": "2.3.0"
+ "url": "https://github.com/doctrine/lexer.git",
+ "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb"
},
"dist": {
"type": "zip",
- "url": "https://github.com/doctrine/common/zipball/2.3.0",
- "reference": "2.3.0",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+ "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3.x-dev"
- }
- },
"autoload": {
"psr-0": {
- "Doctrine\\Common": "lib/"
+ "Doctrine\\Common\\Lexer\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -38,11 +33,6 @@
"MIT"
],
"authors": [
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com",
- "homepage": "http://www.jwage.com/"
- },
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
@@ -52,49 +42,42 @@
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
+ "homepage": "http://jmsyst.com",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
- "description": "Common Library for Doctrine projects",
+ "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
"homepage": "http://www.doctrine-project.org",
"keywords": [
- "annotations",
- "collections",
- "eventmanager",
- "persistence",
- "spl"
+ "lexer",
+ "parser"
],
- "time": "2012-09-19 22:55:18"
+ "time": "2013-01-12 18:59:04"
},
{
"name": "symfony/translation",
- "version": "v2.3.1",
+ "version": "v2.3.4",
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
- "reference": "v2.3.1"
+ "reference": "65f888291f0896ad492f9abc6dc05c998373aded"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.3.1",
- "reference": "v2.3.1",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
+ "reference": "65f888291f0896ad492f9abc6dc05c998373aded",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "symfony/config": ">=2.0,<3.0",
- "symfony/yaml": ">=2.2,<3.0"
+ "symfony/config": "~2.0",
+ "symfony/yaml": "~2.2"
},
"suggest": {
"symfony/config": "",
@@ -127,7 +110,7 @@
],
"description": "Symfony Translation Component",
"homepage": "http://symfony.com",
- "time": "2013-05-13 14:36:40"
+ "time": "2013-08-26 05:49:51"
},
{
"name": "symfony/validator",
@@ -136,23 +119,23 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
- "reference": "7ebb05d2f47609e44793f6a0a541fbc2f6d61422"
+ "reference": "d98ac2aac2cccb7032b08cd79eeb579ed35c9a66"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/7ebb05d2f47609e44793f6a0a541fbc2f6d61422",
- "reference": "7ebb05d2f47609e44793f6a0a541fbc2f6d61422",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/d98ac2aac2cccb7032b08cd79eeb579ed35c9a66",
+ "reference": "d98ac2aac2cccb7032b08cd79eeb579ed35c9a66",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "symfony/translation": ">=2.0,<3.0"
+ "symfony/translation": "~2.0"
},
"require-dev": {
- "symfony/config": ">=2.2,<3.0",
- "symfony/http-foundation": ">=2.1,<3.0",
- "symfony/intl": ">=2.3,<3.0",
- "symfony/yaml": ">=2.0,<3.0"
+ "symfony/config": "~2.2",
+ "symfony/http-foundation": "~2.1",
+ "symfony/intl": "~2.3",
+ "symfony/yaml": "~2.0"
},
"suggest": {
"doctrine/common": "",
@@ -188,7 +171,7 @@
],
"description": "Symfony Validator Component",
"homepage": "http://symfony.com",
- "time": "2013-06-11 07:15:38"
+ "time": "2013-08-19 20:44:22"
}
],
"packages-dev": [
diff --git a/tests/phpunit.xml.dist b/phpunit.xml.dist
similarity index 80%
rename from tests/phpunit.xml.dist
rename to phpunit.xml.dist
index 6438f76..f335ec1 100644
--- a/tests/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,18 +9,18 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
- bootstrap="bootstrap.php"
+ bootstrap="tests/bootstrap.php"
>
- ./tests/egulias/Tests/*.Test.php
+ ./tests/egulias/Tests/
./vendor/
- ../vendor
+ ./vendor
diff --git a/src/Egulias/EmailValidator/EmailLexer.php b/src/Egulias/EmailValidator/EmailLexer.php
index f5b9696..a3396df 100644
--- a/src/Egulias/EmailValidator/EmailLexer.php
+++ b/src/Egulias/EmailValidator/EmailLexer.php
@@ -2,9 +2,9 @@
namespace Egulias\EmailValidator;
-use Doctrine\Common\Lexer;
+use Doctrine\Common\Lexer\AbstractLexer;
-class EmailLexer extends Lexer
+class EmailLexer extends AbstractLexer
{
//ASCII values
const C_DEL = 127;
diff --git a/tests/egulias/Tests/EmailValidator/EmailLexerTest.php b/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
index 311614f..27f3d68 100644
--- a/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
+++ b/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
@@ -10,7 +10,7 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
public function testLexerExtendsLib()
{
$lexer = new EmailLexer();
- $this->assertInstanceOf('Doctrine\Common\Lexer', $lexer);
+ $this->assertInstanceOf('Doctrine\Common\Lexer\AbstractLexer', $lexer);
}
/**