From 8d37ab7b8eb9c204abf2adcb2e637065595021c5 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Sun, 28 May 2023 18:32:02 +0100
Subject: [PATCH 1/2] Update supported PHP versions

---
 .github/workflows/php.yml | 6 +-----
 Magento2/ruleset.xml      | 4 ++--
 composer.json             | 2 +-
 composer.lock             | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index ac9fc0a0..52b6a97f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,15 +13,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
         dependencies:
           - "lowest"
           - "highest"
-        exclude:
-          - php-version: "8.1"
-            dependencies: "lowest"
     name: Tests with PHP ${{ matrix.php-version }} and ${{ matrix.dependencies }} dependencies
 
     steps:
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 6234fb1b..4ff483e4 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -350,7 +350,7 @@
         <severity>8</severity>
         <type>warning</type>
     </rule>
-   
+
     <!-- Severity 7 warnings: General code issues. -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax">
         <severity>7</severity>
@@ -762,7 +762,7 @@
     </rule>
 
     <!-- PHPCompatibility configuration. -->
-    <config name="testVersion" value="7.4-"/>
+    <config name="testVersion" value="8.1-8.2"/>
     <rule ref="PHPCompatibility">
         <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
         <!-- Following sniffs have been updated or renamed in PHPCompatibility 10 -->
diff --git a/composer.json b/composer.json
index c3fed220..bca16d28 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "type": "phpcodesniffer-standard",
     "version": "31",
     "require": {
-        "php": ">=7.4",
+        "php": "~8.1.0 || ~8.2.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index 56d67192..8c9becb7 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": "9ddd67b442b71fc7f10119eac7e40140",
+    "content-hash": "d941f20e7ac60684443f46eca9c86f5d",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2377,7 +2377,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4",
+        "php": "~8.1.0 || ~8.2.0",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },

From 053efe7414788b71ed3e8310dd020f757bfba297 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Mon, 29 May 2023 12:17:52 +0100
Subject: [PATCH 2/2] Increase minimum version of PHPUnit to fix tests

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index bca16d28..6b493d7a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "phpcsstandards/phpcsutils": "~1.0.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.8",
+        "phpunit/phpunit": "^9.5.10",
         "yoast/phpunit-polyfills": "^1.0"
     },
     "autoload-dev": {
diff --git a/composer.lock b/composer.lock
index 8c9becb7..b778b3da 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": "d941f20e7ac60684443f46eca9c86f5d",
+    "content-hash": "93c2fcc45c74921ed7ed7b99da7505fa",
     "packages": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",