PHPUnit 12: Fix 3 data provider and method configuration errors

manishranjan-adobe · manishranjan-adobe · commit c0861d9b3d6d · 2026-01-12T17:00:06.000+05:30
Fixed 3 errors: 1. DateTest: Made providerGetValue() static 2. PaginationProcessorTest: Added setCurPage/setPageSize to onlyMethods 3. CustomizationTest: Replaced self::once()/self::never() with string representations Error #1: Data Provider method not static - providerGetValue() → public static function providerGetValue() Error #2: MethodCannotBeConfiguredException for setCurPage/setPageSize - Added missing methods to onlyMethods() array in AbstractDb mock Error #3: Non-static method self::once() called statically in data provider - Replaced self::once() → 'once', self::never() → 'never' - Added MockCreationTrait import - Used createInvocationMatcher() in test method to convert strings Pattern: For data providers with matcher expectations, use string representations and convert them in test methods with createInvocationMatcher()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDateTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Catalog\Model\Product\Attribute\Save;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoDataFixture  Magento/Catalog/_files/product_date_attribute.php
@@ -15,9 +17,9 @@
 class AttributeDateTest extends AbstractAttributeTest
 {
     /**
-     * @dataProvider productProvider
      * @param string $productSku
      */
+    #[DataProvider('productProvider')]
     public function testDefaultValue(string $productSku): void
     {
         $this->markTestSkipped('Test is blocked by issue MC-28950');
@@ -43,10 +45,10 @@ protected function getDefaultAttributeValue(): string
      * @magentoDataFixture Magento/Catalog/_files/product_date_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-     * @dataProvider uniqueAttributeValueProvider
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @inheritdoc
      */
+    #[DataProvider('uniqueAttributeValueProvider')]
     public function testUniqueAttribute(string $firstSku, string $secondSku): void
     {
         parent::testUniqueAttribute($firstSku, $secondSku);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDropdownTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDropdownTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Catalog\Model\Product\Attribute\Save;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoDataFixture  Magento/Catalog/_files/dropdown_attribute.php
@@ -34,10 +36,10 @@ protected function getDefaultAttributeValue(): string
      * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-     * @dataProvider uniqueAttributeValueProvider
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @inheritdoc
      */
+    #[DataProvider('uniqueAttributeValueProvider')]
     public function testUniqueAttribute(string $firstSku, string $secondSku): void
     {
         parent::testUniqueAttribute($firstSku, $secondSku);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeMultiSelectTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeMultiSelectTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Catalog\Model\Product\Attribute\Save;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoDataFixture  Magento/Catalog/_files/multiselect_attribute.php
@@ -32,8 +34,8 @@ protected function getDefaultAttributeValue(): string
 
     /**
      * @inheritdoc
-     * @dataProvider productProvider
      */
+    #[DataProvider('productProvider')]
     public function testDefaultValue(string $productSku): void
     {
         $this->markTestSkipped('Test is blocked by issue MC-29019');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Catalog\Model\Product\Attribute\Save;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
@@ -34,10 +36,10 @@ protected function getDefaultAttributeValue(): string
      * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-     * @dataProvider uniqueAttributeValueProvider
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @inheritdoc
      */
+    #[DataProvider('uniqueAttributeValueProvider')]
     public function testUniqueAttribute(string $firstSku, string $secondSku): void
     {
         parent::testUniqueAttribute($firstSku, $secondSku);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeYesNoTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeYesNoTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Catalog\Model\Product\Attribute\Save;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
@@ -34,10 +36,10 @@ protected function getDefaultAttributeValue(): string
      * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-     * @dataProvider uniqueAttributeValueProvider
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @inheritdoc
      */
+    #[DataProvider('uniqueAttributeValueProvider')]
     public function testUniqueAttribute(string $firstSku, string $secondSku): void
     {
         parent::testUniqueAttribute($firstSku, $secondSku);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
@@ -24,6 +24,7 @@
 use Magento\Framework\View\Layout\ProcessorInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -215,8 +216,8 @@ public function testSetUnsetBlock(): void
 
     /**
      * @return void
-     * @dataProvider createBlockDataProvider
      */
+    #[DataProvider('createBlockDataProvider')]
     public function testCreateBlock($blockType, $blockName, array $blockData, $expectedName): void
     {
         $expectedData = $blockData + ['type' => $blockType];
@@ -248,8 +249,8 @@ public static function createBlockDataProvider(): array
 
     /**
      * @return void
-     * @dataProvider blockNotExistsDataProvider
      */
+    #[DataProvider('blockNotExistsDataProvider')]
     public function testCreateBlockNotExists($name): void
     {
         $this->expectException(LocalizedException::class);
@@ -288,8 +289,8 @@ public function testAddBlock(): void
     /**
      * @magentoAppIsolation enabled
      * @return void
-     * @dataProvider addContainerDataProvider()
      */
+    #[DataProvider('addContainerDataProvider')]
     public function testAddContainer($htmlTag): void
     {
         $this->assertFalse($this->layout->hasElement('container'));
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Helper/DataTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Shipping\Helper;
 
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DataTest extends \PHPUnit\Framework\TestCase
 {
@@ -27,8 +28,8 @@ protected function setUp(): void
      * @param int $entityId
      * @param string $code
      * @param string $expected
-     * @dataProvider getTrackingPopupUrlBySalesModelDataProvider
      */
+    #[DataProvider('getTrackingPopupUrlBySalesModelDataProvider')]
     public function testGetTrackingPopupUrlBySalesModel($modelName, $getIdMethod, $entityId, $code, $expected)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -65,8 +66,8 @@ public function testGetTrackingPopupUrlBySalesModel($modelName, $getIdMethod, $e
      * @param string $expected
      * @magentoAppArea adminhtml
      * @magentoConfigFixture admin_store web/unsecure/base_link_url http://admin.localhost/
-     * @dataProvider getTrackingPopupUrlBySalesModelDataProvider
      */
+    #[DataProvider('getTrackingPopupUrlBySalesModelDataProvider')]
     public function testGetTrackingPopupUrlBySalesModelFromAdmin($modelName, $getIdMethod, $entityId, $code, $expected)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeTextSwatchTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeTextSwatchTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Swatches\Model;
 
 use Magento\Catalog\Model\Product\Attribute\Save\AbstractAttributeTest;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @magentoDbIsolation enabled
@@ -36,10 +37,10 @@ protected function getDefaultAttributeValue(): string
      * @magentoDataFixture Magento/Swatches/_files/product_text_swatch_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-     * @dataProvider uniqueAttributeValueProvider
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @inheritdoc
      */
+    #[DataProvider('uniqueAttributeValueProvider')]
     public function testUniqueAttribute(string $firstSku, string $secondSku): void
     {
         parent::testUniqueAttribute($firstSku, $secondSku);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeVisualSwatchTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeVisualSwatchTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Swatches\Model;
 
 use Magento\Catalog\Model\Product\Attribute\Save\AbstractAttributeTest;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @magentoDbIsolation enabled
@@ -35,11 +36,11 @@ protected function getDefaultAttributeValue(): string
     /**
      * @magentoDataFixture Magento/Swatches/_files/product_visual_swatch_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
-     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
-     * @dataProvider uniqueAttributeValueProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php     
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      * @inheritdoc
      */
+    #[DataProvider('uniqueAttributeValueProvider')]
     public function testUniqueAttribute(string $firstSku, string $secondSku): void
     {
         parent::testUniqueAttribute($firstSku, $secondSku);
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Widget\Model\Widget;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 class InstanceTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -148,9 +150,9 @@ public function testGenerateLayoutUpdateXml(\Magento\Widget\Model\Widget\Instanc
     /**
      * @covers \Magento\Widget\Model\Widget\Instance::beforeSave()
      * @magentoDataFixture Magento/Widget/_files/new_widget.php
-     * @dataProvider beforeSaveDataProvider
      * @param array $expected
      */
+    #[DataProvider('beforeSaveDataProvider')]
     public function testBeforeSave(array $expected)
     {
         /** @var \Magento\Widget\Model\ResourceModel\Widget\Instance $resourceModel */
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Widget\Model;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 class WidgetTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -36,10 +38,9 @@ public function testGetWidgetsArray()
      * @param string $type
      * @param string $expectedFile
      * @return string
-     *
-     * @dataProvider getPlaceholderImageUrlDataProvider
      * @magentoAppIsolation enabled
      */
+    #[DataProvider('getPlaceholderImageUrlDataProvider')]
     public function testGetPlaceholderImageUrl($type, $expectedFile)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/PaginationProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/PaginationProcessorTest.php
@@ -32,7 +32,7 @@ public function testProcess()
         /** @var AbstractDb|MockObject $searchCriteriarMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getResource'])
+            ->onlyMethods(['getResource', 'setCurPage', 'setPageSize'])
             ->getMock();
         $collectionMock->expects($this->once())
             ->method('setCurPage')
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/_files/composer_home/.htaccess b/lib/internal/Magento/Framework/Composer/Test/Unit/_files/composer_home/.htaccess
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/_files/composer_home/cache/.htaccess b/lib/internal/Magento/Framework/Composer/Test/Unit/_files/composer_home/cache/.htaccess
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
@@ -159,7 +159,7 @@ public function testGetValue(?string $dateFormat, ?string $format, ?string $time
         $this->model->getValue();
     }
 
-    public function providerGetValue()
+    public static function providerGetValue()
     {
         return [
             [null, 'yyyy-mm-dd', 'hh:mm:ss', 'yyyy-mm-dd hh:mm:ss'],
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
@@ -17,12 +17,14 @@
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Theme\Model\Theme;
 use Magento\Theme\Model\Theme\File;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class CustomizationTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var Customization
      */
@@ -187,7 +189,10 @@ public function testReorder($sequence, $filesContent)
         $type = 'sample-type';
         foreach ($filesContent as $fileContent) {
             $file = $this->createPartialMock(File::class, ['__wakeup', 'save']);
-            $file->expects($fileContent['isCalled'])->method('save')->willReturnSelf();
+            $expects = is_string($fileContent['isCalled']) 
+                ? $this->createInvocationMatcher($fileContent['isCalled']) 
+                : $fileContent['isCalled'];
+            $file->expects($expects)->method('save')->willReturnSelf();
             $file->setData($fileContent['content']);
             $files[] = $file;
         }
@@ -219,7 +224,7 @@ public static function customFileContent()
                 'sequence' => [3, 2, 1],
                 'filesContent' => [
                     [
-                        'isCalled' => self::once(),
+                        'isCalled' => 'once',
                         'content' => [
                             'id' => 1,
                             'theme_id' => 123,
@@ -229,7 +234,7 @@ public static function customFileContent()
                         ],
                     ],
                     [
-                        'isCalled' => self::never(),
+                        'isCalled' => 'never',
                         'content' => [
                             'id' => 2,
                             'theme_id' => 123,
@@ -239,7 +244,7 @@ public static function customFileContent()
                         ]
                     ],
                     [
-                        'isCalled' => self::once(),
+                        'isCalled' => 'once',
                         'content' => [
                             'id' => 3,
                             'theme_id' => 123,
