From 9b16a9466554c4c10c250bd6642754d8ecce1cf9 Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Fri, 23 Sep 2022 17:55:27 +0530
Subject: [PATCH 1/3] AC-6437:Ensure PHP8.1 support after 7.4 removal - Added
 support for ReflectionIntersection and ReflectionUnion Type variables

---
 .../Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
index f05cc78b..3732e2ac 100644
--- a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -29,7 +29,9 @@ class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
         T_NS_SEPARATOR,
         T_STRING,
         T_COMMENT,
-        T_NULLABLE
+        T_NULLABLE,
+        T_BITWISE_AND,
+        T_TYPE_UNION,
     ];
 
     /**

From c183421a25aec235cb400fb9260112410a88c404 Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Fri, 14 Oct 2022 18:20:19 +0530
Subject: [PATCH 2/3] AC-6437:Ensure PHP8.1 support after 7.4 removal - Release
 v27

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

diff --git a/composer.json b/composer.json
index 13e73cce..07e01770 100644
--- a/composer.json
+++ b/composer.json
@@ -6,9 +6,9 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "26",
+    "version": "27",
     "require": {
-        "php": ">=7.3",
+        "php": "^8.1||^8.2",
         "webonyx/graphql-php": "^14.9",
         "ext-simplexml": "*",
         "ext-dom": "*",
diff --git a/composer.lock b/composer.lock
index 17a2656d..b62791c4 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": "c3fda2a5a3535f9eff0880e5ddc61827",
+    "content-hash": "a50d1c346c96a8ad6ecdc3d142d1fc3e",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.6",
+            "version": "1.8.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618"
+                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c386ab2741e64cc9e21729f891b28b2b10fe6618",
-                "reference": "c386ab2741e64cc9e21729f891b28b2b10fe6618",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
+                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
                 "shasum": ""
             },
             "require": {
@@ -109,7 +109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.6"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.9"
             },
             "funding": [
                 {
@@ -125,7 +125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-23T09:54:39+00:00"
+            "time": "2022-10-13T13:40:18+00:00"
         },
         {
             "name": "rector/rector",
@@ -2048,7 +2048,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.3",
+        "php": "^8.1||^8.2",
         "ext-simplexml": "*",
         "ext-dom": "*"
     },

From 5fd9e4ced3a9df60d334391101d90fdfca12054f Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Fri, 14 Oct 2022 18:37:32 +0530
Subject: [PATCH 3/3] AC-6437:Ensure PHP8.1 support after 7.4 removal

---
 .github/workflows/php.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index e579cf3c..f4472119 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,9 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
-          - "7.4"
-          - "8.0"
           - "8.1"
         dependencies:
           - "lowest"