From a71de00fb3320a1403e80fa69822c14959db14bc Mon Sep 17 00:00:00 2001 From: Edmund Dunn Date: Wed, 8 Nov 2023 13:58:42 -0800 Subject: [PATCH] VACMS16061: updated graphql to v3.4 --- composer.json | 6 +----- composer.lock | 56 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 176ccb542f..95d9e124b3 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,7 @@ "drupal/geofield_map": "^3.0", "drupal/google_analytics": "^4.0", "drupal/govdelivery_bulletins": "^1.2", - "drupal/graphql": "3.1.0", + "drupal/graphql": "^3.4", "drupal/graphql_core": "^3.1.0", "drupal/graphql_menu": "^1.0@alpha", "drupal/graphql_metatag": "^1.0", @@ -426,10 +426,6 @@ "drupal/flysystem_s3": { "3297257 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-04-27/3297257-drupal-10-compatibility-fixes_0.patch" }, - "drupal/graphql": { - "Fix Explorer with Layout Builder enabled - https://github.com/drupal-graphql/graphql/pull/1144": "patches/graphql_8x3x_layout_builder_incompat.patch", - "Remove outdated RouteQueryEnhancer controller reference - https://github.com/drupal-graphql/graphql/pull/1230": "patches/graphql_8x3x_query_route_enhancer_update.patch" - }, "drupal/hms_field": { "3351452 - Argument #1 ($seconds) must be of type string|int, null given": "https://www.drupal.org/files/issues/2023-03-31/hms_field-field_null_value-3351452-1.patch" }, diff --git a/composer.lock b/composer.lock index 08937f8a9b..7f4e4a687c 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": "6815954ef46674b341aee89059eb3ba7", + "content-hash": "c78177512ab8ad6462083742dd98d24e", "packages": [ { "name": "alchemy/zippy", @@ -6757,27 +6757,27 @@ }, { "name": "drupal/graphql", - "version": "3.1.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/graphql.git", - "reference": "8.x-3.1" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/graphql-8.x-3.1.zip", - "reference": "8.x-3.1", - "shasum": "088430befbf13f2c8dadf1d9d14d01487e6f52bc" + "url": "https://ftp.drupal.org/files/projects/graphql-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "a00e8349a4e60083aa1bacbd8d7c782fca5f5738" }, "require": { - "drupal/core": "^8.8 || ^9", - "webonyx/graphql-php": "^0.12.5" + "drupal/core": "^9 || ^10", + "webonyx/graphql-php": "^14.11.8" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.1", - "datestamp": "1603962169", + "version": "8.x-3.4", + "datestamp": "1699463394", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -27190,26 +27190,36 @@ }, { "name": "webonyx/graphql-php", - "version": "v0.12.6", + "version": "v14.11.10", "source": { "type": "git", "url": "https://github.com/webonyx/graphql-php.git", - "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95" + "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95", - "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9c2fdebc6aa01d831bc2969da00e8588cffef19", + "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19", "shasum": "" }, "require": { + "ext-json": "*", "ext-mbstring": "*", - "php": ">=5.6" + "php": "^7.1 || ^8" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "amphp/amp": "^2.3", + "doctrine/coding-standard": "^6.0", + "nyholm/psr7": "^1.2", + "phpbench/phpbench": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "0.12.82", + "phpstan/phpstan-phpunit": "0.12.18", + "phpstan/phpstan-strict-rules": "0.12.9", + "phpunit/phpunit": "^7.2 || ^8.5", "psr/http-message": "^1.0", - "react/promise": "2.*" + "react/promise": "2.*", + "simpod/php-coveralls-mirror": "^3.0" }, "suggest": { "psr/http-message": "To use standard GraphQL server", @@ -27233,9 +27243,15 @@ ], "support": { "issues": "https://github.com/webonyx/graphql-php/issues", - "source": "https://github.com/webonyx/graphql-php/tree/0.12.x" + "source": "https://github.com/webonyx/graphql-php/tree/v14.11.10" }, - "time": "2018-09-02T14:59:54+00:00" + "funding": [ + { + "url": "https://opencollective.com/webonyx-graphql-php", + "type": "open_collective" + } + ], + "time": "2023-07-05T14:23:37+00:00" }, { "name": "weitzman/drupal-test-traits", @@ -27805,5 +27821,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }