Merge branch '2.4-develop' into ph-delivery

Author: xmav

composer.json

@@ -88,7 +88,6 @@
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.7",
         "pdepend/pdepend": "~2.10.0",
-        "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.9.1",
         "phpstan/phpstan": "~1.1.0",
         "phpunit/phpunit": "~9.5.0",

composer.lock

@@ -208,43 +208,6 @@ private function getFullWhitelist()
         }
     }
 
-    /**
-     * Retrieves the lowest and highest PHP version specified in <kbd>composer.json</var> of project.
-     *
-     * @return array
-     */
-    private function getTargetPhpVersions(): array
-    {
-        $composerJson = json_decode(file_get_contents(BP . '/composer.json'), true);
-        $versionsRange = [];
-
-        if (isset($composerJson['require']['php'])) {
-            $versions = explode('||', $composerJson['require']['php']);
-
-            //normalize version constraints
-            foreach ($versions as $key => $version) {
-                $version = ltrim($version, '^~');
-                $version = str_replace('*', '999', $version);
-
-                $versions[$key] = $version;
-            }
-
-            //sort versions
-            usort($versions, 'version_compare');
-
-            $versionsRange[] = array_shift($versions);
-            if (!empty($versions)) {
-                $versionsRange[] = array_pop($versions);
-            }
-            foreach ($versionsRange as $key => $version) {
-                $versionParts  = explode('.', $versionsRange[$key]);
-                $versionsRange[$key] = sprintf('%s.%s', $versionParts[0], $versionParts[1] ?? '0');
-            }
-        }
-
-        return $versionsRange;
-    }
-
     /**
      * Returns whether a full scan was requested.
      *
@@ -405,39 +368,6 @@ public function testStrictTypes()
         );
     }
 
-    /**
-     * Test for compatibility to lowest PHP version declared in <kbd>composer.json</kbd>.
-     */
-    public function testPhpCompatibility()
-    {
-        $targetVersions = $this->getTargetPhpVersions();
-        $this->assertNotEmpty($targetVersions, 'No supported versions information in composer.json');
-        $reportFile    = self::$reportDir . '/phpcompatibility_report.txt';
-        $rulesetDir    = __DIR__ . '/_files/PHPCompatibilityMagento';
-
-        if (!file_exists($reportFile)) {
-            touch($reportFile);
-        }
-
-        $codeSniffer = new PhpCompatibility($rulesetDir, $reportFile, new Wrapper());
-        if (count($targetVersions) > 1) {
-            $codeSniffer->setTestVersion($targetVersions[0] . '-' . $targetVersions[1]);
-        } else {
-            $codeSniffer->setTestVersion($targetVersions[0]);
-        }
-
-        $result = $codeSniffer->run(
-            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
-        );
-        $report = file_get_contents($reportFile);
-
-        $this->assertEquals(
-            0,
-            $result,
-            'PHP Compatibility detected violation(s):' . PHP_EOL . $report
-        );
-    }
-
     /**
      * Test code quality using PHPStan
      *