Merge pull request #498 from magento-gl/AC-16236

glo71317 · web-flow · commit de8b5570ff65 · 2026-02-12T14:31:32.000+05:30
AC-16236::Upgrade Core Test Framework to PHPUnit 12 and Migrate from PHPUnit 10
diff --git a/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php b/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php
@@ -10,6 +10,7 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\ResourceConnection;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @magentoAppArea adminhtml
@@ -19,8 +20,8 @@ class ContentTypeUsageReportProviderTest extends \PHPUnit\Framework\TestCase
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/CmsPageBuilderAnalytics/_files/pages.php
-     * @dataProvider reportDataProvider
      */
+    #[DataProvider('reportDataProvider')]
     public function testGetReport($expectedReportData, $ignoredContentTypes)
     {
         /* @var $resourceConnection ResourceConnection */
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php
@@ -11,6 +11,7 @@
 use Magento\Review\Block\Product\Review;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\View\Element\Template;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -40,11 +41,8 @@ protected function setUp(): void
 
     /**
      * Check that Section Wrapper page contains section ID if it was provided.
-     *
-     * @param string $sectionId
-     * @return void
-     * @dataProvider sectionWrapperDataProvider
      */
+    #[DataProvider('sectionWrapperDataProvider')]
     public function testSectionWrapperWithProvidedSectionId(string $sectionId): void
     {
         $wrapperBlock = $this->prepareSectionWrapperBlock();
@@ -55,11 +53,8 @@ public function testSectionWrapperWithProvidedSectionId(string $sectionId): void
 
     /**
      * Check that Section Wrapper page does NOT contain section ID if it was NOT provided.
-     *
-     * @param string $sectionId
-     * @return void
-     * @dataProvider sectionWrapperDataProvider
      */
+    #[DataProvider('sectionWrapperDataProvider')]
     public function testSectionWrapperWithoutSectionId(string $sectionId): void
     {
         $wrapperBlock = $this->prepareSectionWrapperBlock();
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php
@@ -14,6 +14,7 @@
 use Magento\TestFramework\Fixture\Config;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Widget\Model\Template\Filter;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -45,10 +46,8 @@ protected function setUp(): void
      * @magentoDbIsolation disabled
      * @magentoConfigFixture default_store catalog/price/scope 1
      * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
-     * @param string $order
-     * @param array $skus
-     * @dataProvider priceSortDataProvider
      */
+    #[DataProvider('priceSortDataProvider')]
     public function testPriceSort(string $order, array $skus)
     {
         $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,
@@ -70,11 +69,8 @@ public function testPriceSort(string $order, array $skus)
      * @magentoDbIsolation disabled
      * @magentoConfigFixture default_store catalog/price/scope 1
      * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
-     * @param string $operator
-     * @param int $value
-     * @param array $matches
-     * @dataProvider priceFilterDataProvider
      */
+    #[DataProvider('priceFilterDataProvider')]
     public function testPriceFilter(string $operator, int $value, array $matches)
     {
         $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,
@@ -120,12 +116,8 @@ public function testProductWithDifferentPriceOnEachWebsite(): void
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoDataFixture Magento/Catalog/_files/products_list.php
      * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php
-     * @param array $categories
-     * @param int $categoryId
-     * @param string $order
-     * @param array $skus
-     * @dataProvider categoryFilterAndSortDataProvider
      */
+    #[DataProvider('categoryFilterAndSortDataProvider')]
     public function testCategoryFilterAndSort(array $categories, int $categoryId, string $order, array $skus): void
     {
         $objectManager = Bootstrap::getObjectManager();
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php
@@ -3,6 +3,7 @@
  * Copyright 2018 Adobe
  * All Rights Reserved.
  */
+declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Config;
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php
@@ -11,6 +11,7 @@
 use Magento\PageBuilder\Model\Dom\Adapter\HtmlDocumentInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\ElementInterface;
 use Magento\PageBuilder\Model\Dom\HtmlDocument;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ElementTest extends TestCase
@@ -30,12 +31,8 @@ protected function setUp(): void
 
     /**
      * Tests the removeStyle function
-     *
-     * @dataProvider removeStylesDataProvider
-     * @param string $elementData
-     * @param string $styleProperty
-     * @param string $expectedResult
      */
+    #[DataProvider('removeStylesDataProvider')]
     public function testRemoveStyle(string $elementData, string $styleProperty, string $expectedResult)
     {
         $document = $this->objectManager->create(
@@ -72,13 +69,8 @@ public static function removeStylesDataProvider()
 
     /**
      * Tests the addStyle function
-     *
-     * @dataProvider addStyleDataProvider
-     * @param string $elementData
-     * @param string $styleProperty
-     * @param string $styleValue
-     * @param string $expectedResult
      */
+    #[DataProvider('addStyleDataProvider')]
     public function testAddStyle(string $elementData, string $styleProperty, string $styleValue, string $expectedResult)
     {
         $document = $this->objectManager->create(
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php
@@ -8,6 +8,7 @@
 namespace Magento\PageBuilder\Model\Filter;
 
 use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
@@ -21,12 +22,7 @@ protected function setUp(): void
         $this->templateFilter = ObjectManager::getInstance()->create(Template::class);
     }
 
-    /**
-     * @param string $results
-     * @param bool $contains
-     * @param string $value
-     * @dataProvider getFilterForDataProvider
-     */
+    #[DataProvider('getFilterForDataProvider')]
     public function testFilterFor(string $results, bool $contains, string $value)
     {
         $contains ?
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php
@@ -9,6 +9,7 @@
 namespace Magento\PageBuilder\Model\Stage\Config;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class UiComponentConfigTest extends \PHPUnit\Framework\TestCase
 {
@@ -46,11 +47,8 @@ protected function setUp(): void
 
     /**
      * Verify getFields will return the expected output given an example UI component configuration
-     *
-     * @param array $uiConfig
-     * @param array $expectedFields
-     * @dataProvider uiConfigDataProvider
      */
+    #[DataProvider('uiConfigDataProvider')]
     public function testGetFields(array $uiConfig, array $expectedFields)
     {
         $uiConfigMock = $this->createMock(\Magento\Framework\Config\DataInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php
@@ -11,6 +11,7 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -69,10 +70,8 @@ protected function tearDown(): void
      * @magentoConfigFixture admin_store web/unsecure/base_url http://backend.magento.test/
      * @magentoConfigFixture fixture_second_store_store web/unsecure/base_url http://website2.magento.test/
      * @magentoConfigFixture fixture_second_store_store web/secure/base_url https://website2.magento.test/
-     * @param string $store
-     * @param string $mediaUrl
-     * @dataProvider storeDataProvider
      */
+    #[DataProvider('storeDataProvider')]
     public function testMediaUrlShouldBeTheSameAsBackendMediaURL(string $store, string $mediaUrl): void
     {
         $this->storeManager->setCurrentStore($store);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php
@@ -13,6 +13,7 @@
 use DOMXPath;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -34,12 +35,9 @@ protected function setUp(): void
 
     /**
      * Test Batch Conversion of Page Builder Content
-     *
-     * @dataProvider conversionData
-     * @dataProvider conversionDataRaw
-     * @param string $htmlString
-     * @param int $expectedStyleTags
      */
+    #[DataProvider('conversionData')]
+    #[DataProvider('conversionDataRaw')]
     public function testConvert(string $htmlString, int $expectedStyleTags)
     {
         $convertPageBuilderStripStyles = $this->objectManager->create(PageBuilderStripStyles::class);

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`namespace Magento\PageBuilder\Model\Filter;`
`9`	`9`
`10`	`10`	`use Magento\TestFramework\ObjectManager;`
	`11`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`11`	`12`
`12`	`13`	`class TemplateTest extends \PHPUnit\Framework\TestCase`
`13`	`14`	`{`
`@@ -21,12 +22,7 @@ protected function setUp(): void`
`21`	`22`	`$this->templateFilter = ObjectManager::getInstance()->create(Template::class);`
`22`	`23`	`}`
`23`	`24`
`24`		`- /**`
`25`		`- * @param string $results`
`26`		`- * @param bool $contains`
`27`		`- * @param string $value`
`28`		`- * @dataProvider getFilterForDataProvider`
`29`		`- */`
	`25`	`+ #[DataProvider('getFilterForDataProvider')]`
`30`	`26`	`public function testFilterFor(string $results, bool $contains, string $value)`
`31`	`27`	`{`
`32`	`28`	`$contains ?`