Merge pull request #223 from magento-commerce/ACP2E-4400

katmoon · web-flow · commit 688c5faa1303 · 2026-02-10T12:27:34.000-06:00
ACP2E-4400: Add support of php 8.5 in Quality Patches
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         }
     },
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "magento/magento-cloud-patches": "^1.0.11"
     },
@@ -22,7 +22,7 @@
         "codeception/module-phpbrowser": "^1.0 || ^3.0",
         "codeception/module-rest": "^1.2 || ^3.0",
         "consolidation/robo": "^1.2 || ^2.0 || ^3.0",
-        "phpunit/phpunit": "^10",
+        "phpunit/phpunit": "^10.0 || ^12.0",
         "composer/semver": "@stable",
         "phpmd/phpmd": "@stable",
         "squizlabs/php_codesniffer": "^3.0"
diff --git a/src/Info.php b/src/Info.php
@@ -24,7 +24,7 @@ class Info
      *
      * @return string
      */
-    public function getPatchesDirectory()
+    public function getPatchesDirectory(): string
     {
         return __DIR__ . '/../patches';
     }
@@ -34,7 +34,7 @@ public function getPatchesDirectory()
      *
      * @return string
      */
-    public function getSupportPatchesConfig()
+    public function getSupportPatchesConfig(): string
     {
         return __DIR__ . '/../support-patches.json';
     }
@@ -44,7 +44,7 @@ public function getSupportPatchesConfig()
      *
      * @return string
      */
-    public function getCommunityPatchesConfig()
+    public function getCommunityPatchesConfig(): string
     {
         return __DIR__ . '/../community-patches.json';
     }
@@ -54,7 +54,7 @@ public function getCommunityPatchesConfig()
      *
      * @return string
      */
-    public function getCategoriesConfig()
+    public function getCategoriesConfig(): string
     {
         return __DIR__ . '/../config/patch-categories.json';
     }
@@ -64,7 +64,7 @@ public function getCategoriesConfig()
      *
      * @return string
      */
-    public function getTestsDirectory()
+    public function getTestsDirectory(): string
     {
         return __DIR__ . '/../tests';
     }
diff --git a/src/Test/Functional/Acceptance/AbstractCest.php b/src/Test/Functional/Acceptance/AbstractCest.php
@@ -193,7 +193,7 @@ public function _before(\CliTester $I): void
      * @param string $magentoVersion
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function prepareTemplate(\CliTester $I, string $templateVersion, string $magentoVersion = null): void
+    protected function prepareTemplate(\CliTester $I, string $templateVersion, ?string $magentoVersion = null): void
     {
         $I->cloneTemplateToWorkDir($templateVersion);
         $I->createAuthJson();
diff --git a/src/Test/Functional/Acceptance/B2Bx237Cest.php b/src/Test/Functional/Acceptance/B2Bx237Cest.php
diff --git a/src/Test/Functional/Acceptance/B2Bx240x243Cest.php b/src/Test/Functional/Acceptance/B2Bx240x243Cest.php
diff --git a/src/Test/Functional/Acceptance/B2Bx248Cest.php b/src/Test/Functional/Acceptance/B2Bx248Cest.php
@@ -18,7 +18,7 @@
 use Magento\QualityPatches\Test\Functional\Acceptance\AbstractCest;
 
 /**
- * @group php83
+ * @group php84
  */
 class B2Bx248Cest extends AbstractCest
 {
diff --git a/src/Test/Functional/Acceptance/B2Bx249Cest.php b/src/Test/Functional/Acceptance/B2Bx249Cest.php
@@ -13,15 +13,22 @@
  */
 declare(strict_types=1);
 
-namespace Magento\QualityPatches\Test\Functional\Acceptance;
+namespace Functional\Acceptance;
+
+use Magento\QualityPatches\Test\Functional\Acceptance\AbstractCest;
 
 /**
- * @group php74ce
+ * @group php85
  */
-class CEx237Cest extends B2Bx237Cest
+class B2Bx249Cest extends AbstractCest
 {
     /**
-     * @var string
+     * @return array
      */
-    protected $edition = 'CE';
+    protected function patchesDataProvider(): array
+    {
+        return [
+            ['templateVersion' => '2.4.9-beta1', 'magentoVersion' => '2.4.9-alpha3'],
+        ];
+    }
 }
diff --git a/src/Test/Functional/Acceptance/CEx240x243Cest.php b/src/Test/Functional/Acceptance/CEx240x243Cest.php
diff --git a/src/Test/Integrity/Testsuite/CircularDependencyTest.php b/src/Test/Integrity/Testsuite/CircularDependencyTest.php
@@ -17,6 +17,7 @@
 
 use Magento\QualityPatches\Test\Integrity\Lib\CircularDependency;
 use Magento\QualityPatches\Test\Integrity\Lib\Config;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -39,9 +40,8 @@ protected function setUp(): void
 
     /**
      * Check patch configuration structure for circular dependencies.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testCircularDependencies()
     {
         $dependencies = $this->getConfigDependencies();
diff --git a/src/Test/Integrity/Testsuite/ConfigStructureTest.php b/src/Test/Integrity/Testsuite/ConfigStructureTest.php
@@ -17,6 +17,7 @@
 
 use Magento\QualityPatches\Info;
 use Magento\QualityPatches\Test\Integrity\Lib\Config;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -87,9 +88,8 @@ protected function setUp(): void
 
     /**
      * Validates patch configuration structure.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testConfigStructure()
     {
         try {
@@ -351,7 +351,7 @@ private function validateMetadata(array $metadata): array
     {
         $errors = [];
         foreach ($metadata as $key => $node) {
-            if (in_array((string)$key, ['and', 'or'])) {
+            if (in_array((string) $key, ['and', 'or'])) {
                 $errors = array_merge_recursive($errors, $this->validateMetadata($node));
             } else {
                 if (!isset($node['type'])) {
diff --git a/src/Test/Integrity/Testsuite/ConstraintsIntersectionTest.php b/src/Test/Integrity/Testsuite/ConstraintsIntersectionTest.php
@@ -17,6 +17,7 @@
 
 use Composer\Semver\VersionParser;
 use Magento\QualityPatches\Test\Integrity\Lib\Config;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -45,9 +46,8 @@ protected function setUp(): void
 
     /**
      * Verifies for constraint intersections.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testConstraintsIntersection()
     {
         $config = $this->getConfig();
@@ -80,7 +80,7 @@ function ($result, $item) {
             );
             array_push(
                 $errors,
-                'Please, eliminate constraint intersections'. PHP_EOL
+                'Please, eliminate constraint intersections' . PHP_EOL
             );
             $this->fail(
                 implode(PHP_EOL, $errors)
diff --git a/src/Test/Integrity/Testsuite/DeprecatedDependencyTest.php b/src/Test/Integrity/Testsuite/DeprecatedDependencyTest.php
@@ -17,6 +17,7 @@
 
 use Composer\Semver\VersionParser;
 use Magento\QualityPatches\Test\Integrity\Lib\Config;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -45,9 +46,8 @@ protected function setUp(): void
 
     /**
      * Checks patch configuration structure for existing dependencies on deprecated patches.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testAbsenceOfDependenciesOnDeprecatedPatches()
     {
         $errors = $this->checkDeprecatedDependencies();
@@ -67,9 +67,8 @@ public function testAbsenceOfDependenciesOnDeprecatedPatches()
 
     /**
      * Checks that the package constraint of patch replacement is compatible with the current patch package constraint.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testReplacedWithPatchConstraint()
     {
         $errors = $this->checkReplacedConstraint();
@@ -99,7 +98,7 @@ private function checkReplacedConstraint(): array
         $replaced = array_filter(
             $all,
             function ($item) {
-                return (bool)$item['replacedWith'];
+                return (bool) $item['replacedWith'];
             }
         );
 
@@ -208,7 +207,7 @@ private function getPatchData(): array
                         'packageConstraint' => $packageConstraint,
                         'require' => $patchInfo['require'] ?? [],
                         'replacedWith' => $patchInfo['replaced-with'] ?? '',
-                        'deprecated' => (bool)$isDeprecated
+                        'deprecated' => (bool) $isDeprecated
                     ];
                 }
             }
diff --git a/src/Test/Integrity/Testsuite/ExtensionConstraintTest.php b/src/Test/Integrity/Testsuite/ExtensionConstraintTest.php
@@ -17,6 +17,7 @@
 
 use Composer\Semver\VersionParser;
 use Magento\QualityPatches\Test\Integrity\Lib\Config;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -56,9 +57,8 @@ protected function setUp(): void
 
     /**
      * Validates version constraint for some extensions.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testExtensionVersion()
     {
         $data = $this->getPatchesConstraints();
diff --git a/src/Test/Integrity/Testsuite/ModularityTest.php b/src/Test/Integrity/Testsuite/ModularityTest.php
@@ -17,6 +17,7 @@
 
 use Magento\QualityPatches\Info;
 use Magento\QualityPatches\Test\Integrity\Lib\Config;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -52,9 +53,8 @@ protected function setUp(): void
 
     /**
      * Tests that patch content is separated on CE, EE, B2B, Inventory and PageBuilder parts.
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testModularity()
     {
         $config = $this->getModularityConfig();
diff --git a/src/Test/Integrity/Testsuite/OsOnCommerceDependencyTest.php b/src/Test/Integrity/Testsuite/OsOnCommerceDependencyTest.php

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Info`
`24`	`24`	`*`
`25`	`25`	`* @return string`
`26`	`26`	`*/`
`27`		`- public function getPatchesDirectory()`
	`27`	`+ public function getPatchesDirectory(): string`
`28`	`28`	`{`
`29`	`29`	`return __DIR__ . '/../patches';`
`30`	`30`	`}`
`@@ -34,7 +34,7 @@ public function getPatchesDirectory()`
`34`	`34`	`*`
`35`	`35`	`* @return string`
`36`	`36`	`*/`
`37`		`- public function getSupportPatchesConfig()`
	`37`	`+ public function getSupportPatchesConfig(): string`
`38`	`38`	`{`
`39`	`39`	`return __DIR__ . '/../support-patches.json';`
`40`	`40`	`}`
`@@ -44,7 +44,7 @@ public function getSupportPatchesConfig()`
`44`	`44`	`*`
`45`	`45`	`* @return string`
`46`	`46`	`*/`
`47`		`- public function getCommunityPatchesConfig()`
	`47`	`+ public function getCommunityPatchesConfig(): string`
`48`	`48`	`{`
`49`	`49`	`return __DIR__ . '/../community-patches.json';`
`50`	`50`	`}`
`@@ -54,7 +54,7 @@ public function getCommunityPatchesConfig()`
`54`	`54`	`*`
`55`	`55`	`* @return string`
`56`	`56`	`*/`
`57`		`- public function getCategoriesConfig()`
	`57`	`+ public function getCategoriesConfig(): string`
`58`	`58`	`{`
`59`	`59`	`return __DIR__ . '/../config/patch-categories.json';`
`60`	`60`	`}`
`@@ -64,7 +64,7 @@ public function getCategoriesConfig()`
`64`	`64`	`*`
`65`	`65`	`* @return string`
`66`	`66`	`*/`
`67`		`- public function getTestsDirectory()`
	`67`	`+ public function getTestsDirectory(): string`
`68`	`68`	`{`
`69`	`69`	`return __DIR__ . '/../tests';`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public function _before(\CliTester $I): void`
`193`	`193`	`* @param string $magentoVersion`
`194`	`194`	`* @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`195`	`195`	`*/`
`196`		`- protected function prepareTemplate(\CliTester $I, string $templateVersion, string $magentoVersion = null): void`
	`196`	`+ protected function prepareTemplate(\CliTester $I, string $templateVersion, ?string $magentoVersion = null): void`
`197`	`197`	`{`
`198`	`198`	`$I->cloneTemplateToWorkDir($templateVersion);`
`199`	`199`	`$I->createAuthJson();`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use Magento\QualityPatches\Test\Functional\Acceptance\AbstractCest;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * @group php83`
	`21`	`+ * @group php84`
`22`	`22`	`*/`
`23`	`23`	`class B2Bx248Cest extends AbstractCest`
`24`	`24`	`{`