From 24f92cc2a69cbeecefb8e2093c6db41138cc9398 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Wed, 13 Dec 2023 08:31:28 +0100
Subject: [PATCH] Update nikic/php-parser

---
 composer.json              |  3 ---
 composer.lock              | 16 ++++++++--------
 patches/NameResolver.patch | 12 ------------
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 patches/NameResolver.patch

diff --git a/composer.json b/composer.json
index cf1a14b66a..a8b0d347cb 100644
--- a/composer.json
+++ b/composer.json
@@ -97,9 +97,6 @@
 				"patches/ReflectionProperty.patch",
 				"patches/SessionHandler.patch"
 			],
-			"nikic/php-parser": [
-				"patches/NameResolver.patch"
-			],
 			"rector/rector": [
 				"patches/NameNodeMapper.patch"
 			]
diff --git a/composer.lock b/composer.lock
index 9f6e085944..f058963747 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f36a75e5e7aa9d1b180158b713c87d0b",
+    "content-hash": "9d77b8aebe172cec09ac6f5d088ad44e",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -1968,16 +1968,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.17.1",
+            "version": "v4.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
                 "shasum": ""
             },
             "require": {
@@ -2018,9 +2018,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
             },
-            "time": "2023-08-13T19:53:39+00:00"
+            "time": "2023-12-10T21:03:43+00:00"
         },
         {
             "name": "ondram/ci-detector",
@@ -6627,5 +6627,5 @@
     "platform-overrides": {
         "php": "8.1.99"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/patches/NameResolver.patch b/patches/NameResolver.patch
deleted file mode 100644
index b18ab66b22..0000000000
--- a/patches/NameResolver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/PhpParser/NodeVisitor/NameResolver.php	2023-11-28 14:02:15
-+++ lib/PhpParser/NodeVisitor/NameResolver.php	2023-11-28 14:03:53
-@@ -119,6 +119,9 @@
-             }
-         } else if ($node instanceof Stmt\ClassConst) {
-             $this->resolveAttrGroups($node);
-+            if (null !== $node->type) {
-+                $node->type = $this->resolveType($node->type);
-+            }
-         } else if ($node instanceof Stmt\EnumCase) {
-             $this->resolveAttrGroups($node);
-         } elseif ($node instanceof Expr\StaticCall