Fix for readonly keyword ordering (#997)

Author: cseufert

src/parser/function.js

@@ -257,7 +257,6 @@ module.exports = {
     let readonly = false;
     let attrs = [];
     if (this.token === this.tok.T_ATTRIBUTE) attrs = this.read_attr_list();
-    const flags = this.read_promoted();
 
     if (this.version >= 801 && this.token === this.tok.T_READ_ONLY) {
       if (is_class_constructor) {
@@ -270,6 +269,23 @@ module.exports = {
       }
     }
 
+    const flags = this.read_promoted();
+
+    if (
+      !readonly &&
+      this.version >= 801 &&
+      this.token === this.tok.T_READ_ONLY
+    ) {
+      if (is_class_constructor) {
+        this.next();
+        readonly = true;
+      } else {
+        this.raiseError(
+          "readonly properties can be used only on class constructor"
+        );
+      }
+    }
+
     if (this.token === "?") {
       this.next();
       nullable = true;

test/snapshot/__snapshots__/class.test.js.snap

@@ -1070,6 +1070,61 @@ Program {
         "name": "Bob",
       },
     },
+    Class {
+      "attrGroups": Array [],
+      "body": Array [
+        Method {
+          "arguments": Array [
+            Parameter {
+              "attrGroups": Array [],
+              "byref": false,
+              "flags": 1,
+              "kind": "parameter",
+              "name": Identifier {
+                "kind": "identifier",
+                "name": "id",
+              },
+              "nullable": false,
+              "readonly": true,
+              "type": TypeReference {
+                "kind": "typereference",
+                "name": "int",
+                "raw": "int",
+              },
+              "value": null,
+              "variadic": false,
+            },
+          ],
+          "attrGroups": Array [],
+          "body": Block {
+            "children": Array [],
+            "kind": "block",
+          },
+          "byref": false,
+          "isAbstract": false,
+          "isFinal": false,
+          "isStatic": false,
+          "kind": "method",
+          "name": Identifier {
+            "kind": "identifier",
+            "name": "__construct",
+          },
+          "nullable": false,
+          "type": null,
+          "visibility": "public",
+        },
+      ],
+      "extends": null,
+      "implements": null,
+      "isAbstract": false,
+      "isAnonymous": false,
+      "isFinal": false,
+      "kind": "class",
+      "name": Identifier {
+        "kind": "identifier",
+        "name": "Bob2",
+      },
+    },
   ],
   "errors": Array [],
   "kind": "program",

test/snapshot/class.test.js

@@ -167,7 +167,11 @@ describe("Test classes", function () {
       `
       class Bob {
         public function __construct(public readonly int $id) {}
-      }`,
+      }
+      class Bob2 {
+        public function __construct(readonly public int $id) {}
+      }
+`,
       {
         parser: {
           version: "8.1",