Merge pull request glayzzle#755 from Eldair/php8

PHP8 non-capturing exception

Author: czosel

src/ast/catch.js

@@ -13,7 +13,7 @@ const KIND = "catch";
  * @constructor Catch
  * @extends {Statement}
  * @property {Identifier[]} what
- * @property {Variable} variable
+ * @property {Variable|null} variable
  * @property {Statement} body
  * @see http://php.net/manual/en/language.exceptions.php
  */

src/parser/try.js

@@ -10,7 +10,7 @@ module.exports = {
    * ```ebnf
    *  try ::= T_TRY '{' inner_statement* '}'
    *          (
-   *              T_CATCH '(' namespace_name variable ')' '{'  inner_statement* '}'
+   *              T_CATCH '(' namespace_name (variable)? ')' '{'  inner_statement* '}'
    *          )*
    *          (T_FINALLY '{' inner_statement* '}')?
    * ```
@@ -28,7 +28,10 @@ module.exports = {
       const item = this.node("catch");
       this.next().expect("(") && this.next();
       const what = this.read_list(this.read_namespace_name, "|", false);
-      const variable = this.read_variable(true, false);
+      let variable = null;
+      if (this.token === this.tok.T_VARIABLE) {
+        variable = this.read_variable(true, false);
+      }
       this.expect(")");
       catches.push(item(this.next().read_statement(), what, variable));
     }

test/snapshot/__snapshots__/try.test.js.snap

@@ -361,6 +361,71 @@ Program {
 }
 `;
 
+exports[`boolean multiple catch without variable 1`] = `
+Program {
+  "children": Array [
+    Try {
+      "always": null,
+      "body": Block {
+        "children": Array [
+          ExpressionStatement {
+            "expression": Call {
+              "arguments": Array [],
+              "kind": "call",
+              "what": Name {
+                "kind": "name",
+                "name": "call",
+                "resolution": "uqn",
+              },
+            },
+            "kind": "expressionstatement",
+          },
+        ],
+        "kind": "block",
+      },
+      "catches": Array [
+        Catch {
+          "body": Block {
+            "children": Array [
+              ExpressionStatement {
+                "expression": Call {
+                  "arguments": Array [],
+                  "kind": "call",
+                  "what": Name {
+                    "kind": "name",
+                    "name": "do_something",
+                    "resolution": "uqn",
+                  },
+                },
+                "kind": "expressionstatement",
+              },
+            ],
+            "kind": "block",
+          },
+          "kind": "catch",
+          "variable": null,
+          "what": Array [
+            Name {
+              "kind": "name",
+              "name": "MyException",
+              "resolution": "uqn",
+            },
+            Name {
+              "kind": "name",
+              "name": "MyOtherException",
+              "resolution": "uqn",
+            },
+          ],
+        },
+      ],
+      "kind": "try",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;
+
 exports[`boolean qualified name 1`] = `
 Program {
   "children": Array [
@@ -552,3 +617,63 @@ Program {
   "kind": "program",
 }
 `;
+
+exports[`boolean without variable 1`] = `
+Program {
+  "children": Array [
+    Try {
+      "always": null,
+      "body": Block {
+        "children": Array [
+          ExpressionStatement {
+            "expression": Call {
+              "arguments": Array [],
+              "kind": "call",
+              "what": Name {
+                "kind": "name",
+                "name": "call",
+                "resolution": "uqn",
+              },
+            },
+            "kind": "expressionstatement",
+          },
+        ],
+        "kind": "block",
+      },
+      "catches": Array [
+        Catch {
+          "body": Block {
+            "children": Array [
+              ExpressionStatement {
+                "expression": Call {
+                  "arguments": Array [],
+                  "kind": "call",
+                  "what": Name {
+                    "kind": "name",
+                    "name": "do_something",
+                    "resolution": "uqn",
+                  },
+                },
+                "kind": "expressionstatement",
+              },
+            ],
+            "kind": "block",
+          },
+          "kind": "catch",
+          "variable": null,
+          "what": Array [
+            Name {
+              "kind": "name",
+              "name": "Exception",
+              "resolution": "uqn",
+            },
+          ],
+        },
+      ],
+      "kind": "try",
+    },
+  ],
+  "errors": Array [],
+  "kind": "program",
+}
+`;

test/snapshot/try.test.js

@@ -8,6 +8,11 @@ describe("boolean", () => {
       )
     ).toMatchSnapshot();
   });
+  it("without variable", () => {
+    expect(
+      parser.parseEval("try { call(); } catch (Exception) { do_something(); }")
+    ).toMatchSnapshot();
+  });
   it("qualified name", () => {
     expect(
       parser.parseEval(
@@ -51,6 +56,13 @@ describe("boolean", () => {
       )
     ).toMatchSnapshot();
   });
+  it("multiple catch without variable", () => {
+    expect(
+      parser.parseEval(
+        "try { call(); } catch (MyException | MyOtherException) { do_something(); }"
+      )
+    ).toMatchSnapshot();
+  });
   it("multiple catch #2", () => {
     expect(
       parser.parseEval(