From c993bc6160ac22d4de123eb1c825eede53eb597c Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 12 Jun 2017 17:33:26 -0700
Subject: [PATCH] Fix #148 - parse `new static` without errors

---
 src/Parser.php                                |  2 +-
 .../parser/objectCreationExpression13.php     |  3 +
 .../objectCreationExpression13.php.tree       | 64 +++++++++++++++++
 .../parser/objectCreationExpression14.php     |  3 +
 .../objectCreationExpression14.php.tree       | 70 +++++++++++++++++++
 5 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/parser/objectCreationExpression13.php
 create mode 100644 tests/cases/parser/objectCreationExpression13.php.tree
 create mode 100644 tests/cases/parser/objectCreationExpression14.php
 create mode 100644 tests/cases/parser/objectCreationExpression14.php.tree

diff --git a/src/Parser.php b/src/Parser.php
index f42e87f..fee62bc 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2397,11 +2397,11 @@ class Parser {
         $this->isParsingObjectCreationExpression = true;
         $objectCreationExpression->classTypeDesignator =
             $this->eatOptional(TokenKind::ClassKeyword) ??
+            $this->eatOptional(TokenKind::StaticKeyword) ??
             $this->parseExpression($objectCreationExpression);
 
         $this->isParsingObjectCreationExpression = false;
 
-
         $objectCreationExpression->openParen = $this->eatOptional(TokenKind::OpenParenToken);
         if ($objectCreationExpression->openParen !== null) {
             $objectCreationExpression->argumentExpressionList = $this->parseArgumentExpressionList($objectCreationExpression);
diff --git a/tests/cases/parser/objectCreationExpression13.php b/tests/cases/parser/objectCreationExpression13.php
new file mode 100644
index 0000000..84bd268
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression13.php
@@ -0,0 +1,3 @@
+<?php
+
+$a = new static;
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression13.php.tree b/tests/cases/parser/objectCreationExpression13.php.tree
new file mode 100644
index 0000000..94016bf
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression13.php.tree
@@ -0,0 +1,64 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ExpressionStatement": {
+                    "expression": {
+                        "AssignmentExpression": {
+                            "leftOperand": {
+                                "Variable": {
+                                    "dollar": null,
+                                    "name": {
+                                        "kind": "VariableName",
+                                        "textLength": 2
+                                    }
+                                }
+                            },
+                            "operator": {
+                                "kind": "EqualsToken",
+                                "textLength": 1
+                            },
+                            "byRef": null,
+                            "rightOperand": {
+                                "ObjectCreationExpression": {
+                                    "newKeword": {
+                                        "kind": "NewKeyword",
+                                        "textLength": 3
+                                    },
+                                    "classTypeDesignator": {
+                                        "kind": "StaticKeyword",
+                                        "textLength": 6
+                                    },
+                                    "openParen": null,
+                                    "argumentExpressionList": null,
+                                    "closeParen": null,
+                                    "classBaseClause": null,
+                                    "classInterfaceClause": null,
+                                    "classMembers": null
+                                }
+                            }
+                        }
+                    },
+                    "semicolon": {
+                        "kind": "SemicolonToken",
+                        "textLength": 1
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression14.php b/tests/cases/parser/objectCreationExpression14.php
new file mode 100644
index 0000000..949f9f2
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression14.php
@@ -0,0 +1,3 @@
+<?php
+
+$a = new static();
\ No newline at end of file
diff --git a/tests/cases/parser/objectCreationExpression14.php.tree b/tests/cases/parser/objectCreationExpression14.php.tree
new file mode 100644
index 0000000..449dd47
--- /dev/null
+++ b/tests/cases/parser/objectCreationExpression14.php.tree
@@ -0,0 +1,70 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ExpressionStatement": {
+                    "expression": {
+                        "AssignmentExpression": {
+                            "leftOperand": {
+                                "Variable": {
+                                    "dollar": null,
+                                    "name": {
+                                        "kind": "VariableName",
+                                        "textLength": 2
+                                    }
+                                }
+                            },
+                            "operator": {
+                                "kind": "EqualsToken",
+                                "textLength": 1
+                            },
+                            "byRef": null,
+                            "rightOperand": {
+                                "ObjectCreationExpression": {
+                                    "newKeword": {
+                                        "kind": "NewKeyword",
+                                        "textLength": 3
+                                    },
+                                    "classTypeDesignator": {
+                                        "kind": "StaticKeyword",
+                                        "textLength": 6
+                                    },
+                                    "openParen": {
+                                        "kind": "OpenParenToken",
+                                        "textLength": 1
+                                    },
+                                    "argumentExpressionList": null,
+                                    "closeParen": {
+                                        "kind": "CloseParenToken",
+                                        "textLength": 1
+                                    },
+                                    "classBaseClause": null,
+                                    "classInterfaceClause": null,
+                                    "classMembers": null
+                                }
+                            }
+                        }
+                    },
+                    "semicolon": {
+                        "kind": "SemicolonToken",
+                        "textLength": 1
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file