Merge pull request #2 from amosfolz/develop-feature-update-nikic-php-parser

update nikic/php-parser

Author: lcharette

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Changed minimum PHP Version to 7.1
 
 ### Changed Dependencies
+- Updated nikic/php-parser to 4.2.2
 - Updated PHPMailer/PHPMailer to 6.0.7
 - Updated league/csv to 9.2.1
 - Updated Laravel Illuminate packages to 5.8

app/sprinkles/account/composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "birke/rememberme" : "^2.0",
-        "nikic/php-parser" : "^1"
+        "nikic/php-parser" : "^4.2.2"
     },
     "autoload": {
         "psr-4": {

app/sprinkles/account/src/Authorize/AccessConditionExpression.php

@@ -12,9 +12,8 @@
 
 use Monolog\Logger;
 use PhpParser\Error as PhpParserException;
-use PhpParser\Lexer\Emulative as EmulativeLexer;
 use PhpParser\NodeTraverser;
-use PhpParser\Parser as Parser;
+use PhpParser\ParserFactory as Parser;
 use PhpParser\PrettyPrinter\Standard as StandardPrettyPrinter;
 use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
 
@@ -75,7 +74,7 @@ public function __construct(ParserNodeFunctionEvaluator $nodeVisitor, UserInterf
     {
         $this->nodeVisitor = $nodeVisitor;
         $this->user = $user;
-        $this->parser = new Parser(new EmulativeLexer());
+        $this->parser = (new Parser())->create(Parser::ONLY_PHP7);
         $this->traverser = new NodeTraverser();
         $this->traverser->addVisitor($nodeVisitor);
         $this->prettyPrinter = new StandardPrettyPrinter();
@@ -119,7 +118,7 @@ public function evaluateCondition($condition, $params)
             $stmts = $this->traverser->traverse($stmts);
 
             // Evaluate boolean statement.  It is safe to use eval() here, because our expression has been reduced entirely to a boolean expression.
-            $expr = $this->prettyPrinter->prettyPrintExpr($stmts[0]);
+            $expr = $this->prettyPrinter->prettyPrintExpr($stmts[0]->expr);
             $expr_eval = 'return ' . $expr . ";\n";
             $result = eval($expr_eval);
 

app/sprinkles/account/src/Authorize/ParserNodeFunctionEvaluator.php

@@ -71,7 +71,7 @@ public function leaveNode(Node $node)
     {
         // Look for function calls
         if ($node instanceof \PhpParser\Node\Expr\FuncCall) {
-            $eval = new \PhpParser\Node\Scalar\LNumber();
+            $eval = new \PhpParser\Node\Scalar\LNumber(0);
 
             // Get the method name
             $callbackName = $node->name->toString();