Merge pull request #2 from phan/property-hook-modifiers

Add property hook modifiers

Author: rlerdorf

src/Node/PropertyHook.php

@@ -6,12 +6,15 @@
 
 namespace Microsoft\PhpParser\Node;
 
+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 {
+class PropertyHook extends Node implements ModifiedTypeInterface {
+    use ModifiedTypeTrait;
     /** @var AttributeGroup[]|null */
     public $attributes;
 
@@ -41,6 +44,7 @@ class PropertyHook extends Node {
 
     const CHILD_NAMES = [
         'attributes',
+        'modifiers',
         'hookKeyword',
         'openParen',
         'parameterList',

src/Parser.php

@@ -1614,6 +1614,30 @@ private function parseModifiers(): array {
         return $modifiers;
     }
 
+    /**
+     * Parse modifiers that are allowed on property hooks (visibility, static, final).
+     *
+     * @return Token[]
+     */
+    private function parsePropertyHookModifiers(): array {
+        $modifiers = [];
+        while (true) {
+            $token = $this->getCurrentToken();
+            switch ($token->kind) {
+                case TokenKind::PublicKeyword:
+                case TokenKind::ProtectedKeyword:
+                case TokenKind::PrivateKeyword:
+                case TokenKind::StaticKeyword:
+                case TokenKind::FinalKeyword:
+                    $modifiers[] = $token;
+                    $this->advanceToken();
+                    continue 2;
+            }
+            break;
+        }
+        return $modifiers;
+    }
+
     private function isParameterStartFn() {
         return function ($token) {
             switch ($token->kind) {
@@ -3527,6 +3551,8 @@ private function parsePropertyHook(PropertyHookList $parentNode): ?PropertyHook
             $hook->attributes = $this->parseAttributeGroups($hook);
         }
 
+        $hook->modifiers = $this->parsePropertyHookModifiers();
+
         $token = $this->getCurrentToken();
         if ($token->kind === TokenKind::Name) {
             $text = \strtolower(\trim($token->getText($this->sourceFile->fileContents)));