Merge pull request microsoft#398 from dantleech/enum-interface-cluase

Support Enum Interface clause

Author: roblourens

src/Node/EnumInterfaceClause.php

@@ -0,0 +1,23 @@
+<?php
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+namespace Microsoft\PhpParser\Node;
+
+use Microsoft\PhpParser\Node;
+use Microsoft\PhpParser\Token;
+
+class EnumInterfaceClause extends Node {
+    /** @var Token */
+    public $implementsKeyword;
+
+    /** @var DelimitedList\QualifiedNameList|null */
+    public $interfaceNameList;
+
+    const CHILD_NAMES = [
+        'implementsKeyword',
+        'interfaceNameList'
+    ];
+}

src/Node/Statement/EnumDeclaration.php

@@ -10,6 +10,7 @@
 use Microsoft\PhpParser\NamespacedNameInterface;
 use Microsoft\PhpParser\NamespacedNameTrait;
 use Microsoft\PhpParser\Node\AttributeGroup;
+use Microsoft\PhpParser\Node\EnumInterfaceClause;
 use Microsoft\PhpParser\Node\StatementNode;
 use Microsoft\PhpParser\Node\EnumMembers;
 use Microsoft\PhpParser\Token;
@@ -23,6 +24,9 @@ class EnumDeclaration extends StatementNode implements NamespacedNameInterface,
     /** @var Token */
     public $enumKeyword;
 
+    /** @var EnumInterfaceClause|null */
+    public $enumInterfaceClause;
+
     /** @var Token */
     public $name;
 
@@ -41,6 +45,7 @@ class EnumDeclaration extends StatementNode implements NamespacedNameInterface,
         'name',
         'colonToken',
         'enumType',
+        'enumInterfaceClause',
         'enumMembers',
     ];
 

src/Parser.php

@@ -18,6 +18,7 @@
 use Microsoft\PhpParser\Node\ClassMembersNode;
 use Microsoft\PhpParser\Node\ConstElement;
 use Microsoft\PhpParser\Node\EnumCaseDeclaration;
+use Microsoft\PhpParser\Node\EnumInterfaceClause;
 use Microsoft\PhpParser\Node\EnumMembers;
 use Microsoft\PhpParser\Node\Expression;
 use Microsoft\PhpParser\Node\Expression\{
@@ -3737,11 +3738,27 @@ private function parseEnumDeclaration($parentNode) {
                 ?: new MissingToken(TokenKind::EnumType, $this->token->fullStart);
         }
 
+        $enumDeclaration->enumInterfaceClause = $this->parseEnumInterfaceClause($enumDeclaration);
         $enumDeclaration->enumMembers = $this->parseEnumMembers($enumDeclaration);
 
         return $enumDeclaration;
     }
 
+    private function parseEnumInterfaceClause(EnumDeclaration $enumDeclaration): ?EnumInterfaceClause {
+        $enumInterfaceClause = new EnumInterfaceClause();
+        $enumInterfaceClause->parent = $enumDeclaration;
+        $enumInterfaceClause->implementsKeyword = $this->eatOptional1(TokenKind::ImplementsKeyword);
+
+        if ($enumInterfaceClause->implementsKeyword === null) {
+            return null;
+        }
+
+        $enumInterfaceClause->interfaceNameList =
+            $this->parseQualifiedNameList($enumInterfaceClause);
+        return $enumInterfaceClause;
+    }
+
+
     private function parseEnumMembers($parentNode) {
         $enumMembers = new EnumMembers();
         $enumMembers->parent = $parentNode;

tests/cases/parser81/enums1.php.tree

@@ -24,6 +24,7 @@
                     },
                     "colonToken": null,
                     "enumType": null,
+                    "enumInterfaceClause": null,
                     "enumMembers": {
                         "EnumMembers": {
                             "openBrace": {

tests/cases/parser81/enums2.php.tree

@@ -30,6 +30,7 @@
                         "kind": "IntReservedWord",
                         "textLength": 3
                     },
+                    "enumInterfaceClause": null,
                     "enumMembers": {
                         "EnumMembers": {
                             "openBrace": {

tests/cases/parser81/enums3.php.tree

@@ -62,6 +62,7 @@
                     },
                     "colonToken": null,
                     "enumType": null,
+                    "enumInterfaceClause": null,
                     "enumMembers": {
                         "EnumMembers": {
                             "openBrace": {

tests/cases/parser81/enums4.php.tree

@@ -30,6 +30,7 @@
                         "kind": "StringReservedWord",
                         "textLength": 6
                     },
+                    "enumInterfaceClause": null,
                     "enumMembers": {
                         "EnumMembers": {
                             "openBrace": {

tests/cases/parser81/enums5.php.tree

@@ -31,6 +31,7 @@
                         "kind": "EnumType",
                         "textLength": 0
                     },
+                    "enumInterfaceClause": null,
                     "enumMembers": {
                         "EnumMembers": {
                             "openBrace": {

tests/cases/parser81/enums6.php.tree

@@ -30,6 +30,7 @@
                         "kind": "IntReservedWord",
                         "textLength": 3
                     },
+                    "enumInterfaceClause": null,
                     "enumMembers": {
                         "EnumMembers": {
                             "openBrace": {

tests/cases/parser81/enums7.php

@@ -0,0 +1,4 @@
+<?php
+enum Foo: int implements Foo
+{
+}