From 627ce0f2aa38c0fed61bdf8204e559138df4ec46 Mon Sep 17 00:00:00 2001
From: Ankit Pathak <ankit.pathak@acquia.com>
Date: Mon, 17 Jun 2024 16:28:00 +0530
Subject: [PATCH] Adding minimum php version 8.0 and included typed_data
 module.

---
 .github/workflows/testing.yml |  4 ++--
 1                             | 19 -------------------
 composer.json                 |  5 +++--
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 1

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 5cfd25b8d..10cf6236f 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -94,8 +94,8 @@ jobs:
         run: |
           composer --no-interaction --no-progress require \
             webonyx/graphql-php:^15.12 \
-            drupal/typed_data:^1.0 \
-            drupal/redirect:^1.0
+            drupal/typed_data:^2.0 \
+            drupal/redirect:dev-1.x
 
       - name: Run PHPUnit
         run: |
diff --git a/1 b/1
deleted file mode 100644
index 5b8c9180d..000000000
--- a/1
+++ /dev/null
@@ -1,19 +0,0 @@
-Update github workflow to ready for drupal next minor and major version.
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Author:    Ankit Pathak <106175376+apathak18@users.noreply.github.com>
-#
-# interactive rebase in progress; onto 75dd0a4
-# Last commands done (2 commands done):
-#    pick 6515b02 Drupal 11 readiness.
-#    pick 8c2bcaf Update github workflow to ready for drupal next minor and major version.
-# Next commands to do (2 remaining commands):
-#    pick 14bba39 Update github workflow and dataProviders with static.
-#    pick c456f77 Adding minimum php version 8.0 and included typed_data module.
-# You are currently rebasing branch '8.x-4.x' on '75dd0a4'.
-#
-# Changes to be committed:
-#	modified:   .github/workflows/testing.yml
-#
diff --git a/composer.json b/composer.json
index e3c4620da..063f35601 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,9 @@
   "homepage": "http://drupal.org/project/graphql",
   "license": "GPL-2.0+",
   "require": {
-    "php": ">=7.3",
-    "webonyx/graphql-php": "^14.8.0"
+    "drupal/typed_data": "^1.0 || ^2.0",
+    "php": ">=8.0",
+    "webonyx/graphql-php": "^15.12.0"
   },
   "minimum-stability": "dev"
 }