Merge pull request #61 from WyriHaximus/2.x

Support php-parser 1 and 2

.travis.yml

@@ -5,9 +5,20 @@ php:
   - 5.6
   - hhvm
   - 7
+matrix:
+  include:
+    - php: 5.5
+      env: dependencies=lowest
+    - php: 5.6
+      env: dependencies=lowest
+    - php: hhvm
+      env: dependencies=lowest
+    - php: 7
+      env: dependencies=lowest
 before_script:
   - composer self-update
-  - composer install
+  - if [ -z "$dependencies" ]; then composer install; fi;
+  - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest; fi;
 script:
   - phpunit --coverage-clover=coverage.clover
 after_script:

composer.json

@@ -17,8 +17,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "doctrine/annotations": "~1.1",
-        "nikic/php-parser": "~1.0"
+        "doctrine/annotations": "^1.2.7",
+        "nikic/php-parser": "~1.3||~2.0"
     },
     "autoload": {
         "psr-4": {

src/Compiler.php

@@ -7,8 +7,6 @@
 namespace Ray\Aop;
 
 use PhpParser\BuilderFactory;
-use PhpParser\Lexer;
-use PhpParser\Parser;
 use PhpParser\PrettyPrinter\Standard as StandardPrettyPrinter;
 use Ray\Aop\Exception\NotWritableException;
 
@@ -35,7 +33,7 @@ public function __construct($classDir, CodeGenInterface $codeGen = null)
         }
         $this->classDir = $classDir;
         $this->codeGen = $codeGen ?: new CodeGen(
-            new Parser(new Lexer()),
+            (new ParserFactory)->newInstance(),
             new BuilderFactory(),
             new StandardPrettyPrinter()
         );

src/ParserFactory.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * This file is part of the Ray.Aop package
+ *
+ * @license http://opensource.org/licenses/bsd-license.php BSD
+ */
+namespace Ray\Aop;
+
+use PhpParser\Lexer;
+use PhpParser\Parser;
+use PhpParser\ParserFactory as PHPParserFactory;
+
+class ParserFactory
+{
+    public function newInstance()
+    {
+        if (class_exists('PhpParser\ParserFactory')) {
+            return (new PHPParserFactory)->create(PHPParserFactory::PREFER_PHP7);
+        }
+
+        return new Parser(new Lexer());
+    }
+}

tests/CodeGenTest.php

@@ -5,15 +5,13 @@
 namespace Ray\Aop;
 
 use PhpParser\BuilderFactory;
-use PhpParser\Lexer;
-use PhpParser\Parser;
 use PhpParser\PrettyPrinter\Standard;
 
 class CodeGenTest extends \PHPUnit_Framework_TestCase
 {
     public function testAddNullDefaultWithAssisted()
     {
-        $codeGen = new CodeGen(new Parser(new Lexer), new BuilderFactory, new Standard);
+        $codeGen = new CodeGen((new ParserFactory)->newInstance(), new BuilderFactory, new Standard);
         $bind = new Bind;
         $bind->bindInterceptors('run', []);
         $code = $codeGen->generate('a', new \ReflectionClass(FakeAssistedConsumer::class), $bind);

tests/ParserFactoryTest.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Ray\Aop;
+
+class ParserFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate()
+    {
+        $this->assertInstanceOf('PhpParser\Parser', (new ParserFactory)->newInstance());
+    }
+}