Merge pull request #10 from Stillat/update-php-parser

Bump php-parser version to 5

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "nikic/php-parser": "^4.10.3",
+    "nikic/php-parser": "^5",
     "illuminate/support": "*"
   },
   "require-dev": {

src/Evaluator.php

@@ -23,7 +23,7 @@ public function evaluate($node, $context = [])
         } elseif ($node instanceof DNumber) {
             return floatval($node->value);
         } elseif ($node instanceof ConstFetch) {
-            return $this->getConstantValue($node->name->parts[0]);
+            return $this->getConstantValue($node->name->getParts()[0]);
         } elseif ($node instanceof Array_) {
             return $this->evaluateArray($node, $context);
         } elseif ($node instanceof String_) {
@@ -62,7 +62,7 @@ protected function getNestedPath(PropertyFetch $propertyFetch)
     protected function evaluateFunctionCall(FuncCall $funcCall, $context)
     {
         $runtimeMethod = new MethodCall();
-        $runtimeMethod->name = $funcCall->name->parts[0];
+        $runtimeMethod->name = $funcCall->name->getParts()[0];
 
         foreach ($funcCall->args as $arg) {
             if ($arg instanceof Arg) {

src/Parser.php

@@ -3,9 +3,9 @@
 namespace Stillat\Primitives;
 
 use Illuminate\Support\Str;
-use PhpParser\Lexer\Emulative;
 use PhpParser\Node\Arg;
 use PhpParser\Parser\Php7;
+use PhpParser\ParserFactory;
 use PhpParser\PrettyPrinter\Standard;
 
 class Parser
@@ -15,21 +15,9 @@ class Parser
      */
     protected $parser;
 
-    /**
-     * @var Emulative
-     */
-    protected $lexer = null;
-
     public function __construct()
     {
-        $this->lexer = new Emulative([
-            'usedAttributes' => [
-                'comments',
-                'startLine', 'endLine',
-                'startTokenPos', 'endTokenPos',
-            ],
-        ]);
-        $this->parser = new Php7($this->lexer);
+        $this->parser = (new ParserFactory())->createForNewestSupportedVersion();
     }
 
     /**