Merge pull request #15 from phpactor/phan-phactor-fixes

Fixes to enable this fork to work with Phactor

Author: rlerdorf

src/Node/PropertyHook.php

@@ -6,14 +6,15 @@
 
 namespace Microsoft\PhpParser\Node;
 
+use Microsoft\PhpParser\FunctionLike;
 use Microsoft\PhpParser\ModifiedTypeInterface;
 use Microsoft\PhpParser\ModifiedTypeTrait;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\Node\DelimitedList\ParameterDeclarationList;
 use Microsoft\PhpParser\Node\Statement\CompoundStatementNode;
 use Microsoft\PhpParser\Token;
 
-class PropertyHook extends Node implements ModifiedTypeInterface {
+class PropertyHook extends Node implements ModifiedTypeInterface, FunctionLike {
     use ModifiedTypeTrait;
     /** @var AttributeGroup[]|null */
     public $attributes;

src/Parser.php

@@ -1322,6 +1322,7 @@ private function isExpressionStartFn() {
                 case TokenKind::IntegerLiteralToken:
 
                 case TokenKind::StringLiteralToken:
+                case TokenKind::EncapsedAndWhitespace:
 
                 case TokenKind::SingleQuoteToken:
                 case TokenKind::DoubleQuoteToken:
@@ -1415,6 +1416,7 @@ private function parsePrimaryExpression($parentNode) {
                 return $this->parseNumericLiteralExpression($parentNode);
 
             case TokenKind::StringLiteralToken:
+            case TokenKind::EncapsedAndWhitespace:
                 return $this->parseStringLiteralExpression($parentNode);
 
             case TokenKind::DoubleQuoteToken:
@@ -2311,6 +2313,7 @@ private function parseBinaryExpressionOrHigher($precedence, $parentNode) {
             // the original operator, and the newly constructed exponentiation-expression as the operand.
             $shouldOperatorTakePrecedenceOverUnary = false;
             switch ($token->kind) {
+                case TokenKind::OpenBraceToken:
                 case TokenKind::AsteriskAsteriskToken:
                     $shouldOperatorTakePrecedenceOverUnary = $leftOperand instanceof UnaryExpression;
                     break;
@@ -2823,7 +2826,7 @@ private function parseDeclareDirectiveFn() {
                     TokenKind::InvalidOctalLiteralToken,
                     TokenKind::InvalidHexadecimalLiteral,
                     TokenKind::InvalidBinaryLiteral,
-                    TokenKind::StringLiteralToken
+                    TokenKind::StringLiteralToken,
                 ); // TODO simplify
 
             return $declareDirective;
@@ -3182,6 +3185,7 @@ private function parsePostfixExpressionRest($expression, $allowUpdateExpression
         )) {
             return $expression;
         }
+
         if ($tokenKind === TokenKind::ColonColonToken) {
             $expression = $this->parseScopedPropertyAccessExpression($expression, null);
             return $this->parsePostfixExpressionRest($expression);
@@ -3191,6 +3195,14 @@ private function parsePostfixExpressionRest($expression, $allowUpdateExpression
 
         if ($tokenKind === TokenKind::OpenBraceToken ||
             $tokenKind === TokenKind::OpenBracketToken) {
+            // Property hooks: don't parse `{` after certain expression types
+            // as those are property hook lists, not subscript expressions
+            if ($tokenKind === TokenKind::OpenBraceToken &&
+                ($expression instanceof StringLiteral ||
+                 $expression instanceof ArrayCreationExpression ||
+                 $expression instanceof ObjectCreationExpression)) {
+                return $expression;
+            }
             $expression = $this->parseSubscriptExpression($expression);
             return $this->parsePostfixExpressionRest($expression);
         }

tests/cases/parser/propertyHook4.php.diag

@@ -1,68 +1 @@
-[
-    {
-        "kind": 0,
-        "message": "'}' expected.",
-        "start": 158,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "'}' expected.",
-        "start": 158,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "';' expected.",
-        "start": 158,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "'}' expected.",
-        "start": 158,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "Unexpected '}'",
-        "start": 214,
-        "length": 1
-    },
-    {
-        "kind": 0,
-        "message": "')' expected.",
-        "start": 234,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "';' expected.",
-        "start": 234,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "';' expected.",
-        "start": 241,
-        "length": 0
-    },
-    {
-        "kind": 0,
-        "message": "Unexpected ')'",
-        "start": 241,
-        "length": 1
-    },
-    {
-        "kind": 0,
-        "message": "Unexpected '}'",
-        "start": 326,
-        "length": 1
-    },
-    {
-        "kind": 0,
-        "message": "Unexpected '}'",
-        "start": 328,
-        "length": 1
-    }
-]
+[]