From 88000ca89e682c4359122d4ad62be80bdc2f18c9 Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Wed, 16 Apr 2025 08:47:26 -0700
Subject: [PATCH] require webonyx/graphql-php:~14.11.10 and drop the conflict

---
 composer.json | 5 +----
 composer.lock | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 35e2e70706..607f5f371b 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
     "symfony/yaml": "^5.2.1",
     "twig/twig": "~2.15.3",
     "voku/stringy": "^6.4.0",
-    "webonyx/graphql-php": "~14.11.5",
+    "webonyx/graphql-php": "~14.11.10",
     "yiisoft/yii2": "~2.0.48.1",
     "yiisoft/yii2-debug": "^2.1.16",
     "yiisoft/yii2-queue": "~2.3.2",
@@ -72,9 +72,6 @@
     "bower-asset/yii2-pjax": "~2.0.1",
     "yii2tech/ar-softdelete": "1.0.4"
   },
-  "conflict": {
-    "webonyx/graphql-php": "14.11.7"
-  },
   "suggest": {
     "ext-imagick": "Adds support for more image processing formats and options.",
     "ext-iconv": "Adds support for more character encodings than PHP’s built-in mb_convert_encoding() function, which Craft will take advantage of when converting strings to UTF-8.",
diff --git a/composer.lock b/composer.lock
index 0e45da3ce8..616acb769b 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": "0d4267f287bc5d6b45c5a0d9643deec8",
+    "content-hash": "1d3fa6ba4e1e1047609bd0464b4ca454",
     "packages": [
         {
             "name": "cebe/markdown",
@@ -8785,9 +8785,9 @@
         "ext-pdo": "*",
         "ext-zip": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "7.2.5"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }