Merge pull request #194 from magento-gl/AC-6437

AC-6437:Ensure PHP8.1 support after 7.4 removal - Added support for R…
magento · Oct 17, 2022 · 097bda3 · 097bda3
2 parents 0263b89 + 5fd9e4c
commit 097bda3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git 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"

diff --git 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,
     ];
 
     /**

diff --git 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