Merge remote-tracking branch 'upstream/develop' into simplify-install…

…-instructions

.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:

Magento2/ruleset.xml

@@ -761,7 +761,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 an equivalent in PHPCS -->

composer.json

@@ -8,7 +8,7 @@
     "type": "phpcodesniffer-standard",
     "version": "31",
     "require": {
-        "php": ">=7.4",
+        "php": "~8.1.0 || ~8.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2 || ^1.0",
         "webonyx/graphql-php": "^15.0",
         "ext-simplexml": "*",
@@ -20,7 +20,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": {