Merge pull request glayzzle#960 from glayzzle/fix-fqn-property-types

Handle property types using T_NAME_* tokens.
htmlacademy · Jul 2, 2022 · 428ceda · 428ceda
2 parents 6c1d412 + e0f80f7
commit 428ceda
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 3 deletions.
diff --git a/src/parser/class.js b/src/parser/class.js
@@ -126,11 +126,14 @@ module.exports = {
           // support https://wiki.php.net/rfc/typed_properties_v2
           (this.version >= 704 &&
             (this.token === "?" ||
-              this.token === this.tok.T_CALLABLE ||
               this.token === this.tok.T_ARRAY ||
+              this.token === this.tok.T_CALLABLE ||
+              this.token === this.tok.T_NAMESPACE ||
+              this.token === this.tok.T_NAME_FULLY_QUALIFIED ||
+              this.token === this.tok.T_NAME_QUALIFIED ||
+              this.token === this.tok.T_NAME_RELATIVE ||
               this.token === this.tok.T_NS_SEPARATOR ||
-              this.token === this.tok.T_STRING ||
-              this.token === this.tok.T_NAMESPACE)))
+              this.token === this.tok.T_STRING)))
       ) {
         // reads a variable
         const variables = this.read_variable_list(flags, attrs);

diff --git a/test/snapshot/__snapshots__/class.test.js.snap b/test/snapshot/__snapshots__/class.test.js.snap
@@ -1809,3 +1809,50 @@ Program {
   "kind": "program",
 }
 `;
+
+exports[`Test classes handles property types with a leading \\ 1`] = `
+Program {
+  "children": Array [
+    Class {
+      "attrGroups": Array [],
+      "body": Array [
+        PropertyStatement {
+          "isStatic": false,
+          "kind": "propertystatement",
+          "properties": Array [
+            Property {
+              "attrGroups": Array [],
+              "kind": "property",
+              "name": Identifier {
+                "kind": "identifier",
+                "name": "baz",
+              },
+              "nullable": false,
+              "readonly": false,
+              "type": Name {
+                "kind": "name",
+                "name": "\\\\Bar",
+                "resolution": "fqn",
+              },
+              "value": null,
+            },
+          ],
+          "visibility": "public",
+        },
+      ],
+      "extends": null,
+      "implements": null,
+      "isAbstract": false,
+      "isAnonymous": false,
+      "isFinal": false,
+      "kind": "class",
+      "name": Identifier {
+        "kind": "identifier",
+        "name": "Foo",
+      },
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
diff --git a/test/snapshot/class.test.js b/test/snapshot/class.test.js
@@ -255,4 +255,14 @@ class b {
       "public static function a()"
     );
   });
+
+  it("handles property types with a leading \\", function () {
+    expect(
+      parser.parseEval(`
+      class Foo {
+        public \\Bar $baz;
+      }
+    `)
+    ).toMatchSnapshot();
+  });
 });