phpunit updating the callback

Author: sandesh-shivakumar

dev/tests/phpunit.xml

@@ -5,7 +5,7 @@
  * All Rights Reserved.
  */
 -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" bootstrap="_bootstrap.php" backupGlobals="false" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd" bootstrap="_bootstrap.php" backupGlobals="false" cacheDirectory=".phpunit.cache">
   <coverage>
     <report>
       <clover outputFile="build/logs/clover.xml"/>

dev/tests/unit/Magento/FunctionalTestFramework/Allure/AllureHelperTest.php

@@ -9,6 +9,7 @@
 namespace tests\unit\Magento\FunctionalTestFramework\Allure;
 
 use Magento\FunctionalTestingFramework\Allure\AllureHelper;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Qameta\Allure\Allure;
 use Qameta\Allure\Io\DataSourceFactory;
@@ -27,9 +28,7 @@ public function setUp(): void
         Allure::reset();
     }
 
-    /**
-     * @dataProvider providerAttachmentProperties
-     */
+    #[DataProvider('providerAttachmentProperties')]
     public function testDoAddAttachmentMethod(
         string $name,
         $type,
@@ -50,9 +49,7 @@ public function testDoAddAttachmentMethod(
         self::assertSame('typeOfTheFile', $attachment->getType());
     }
 
-    /**
-     * @dataProvider providerAttachmentProperties
-     */
+    #[DataProvider('providerAttachmentProperties')]
     public function testAddAttachmentToStep(
         string $name,
         ?string $type,
@@ -69,9 +66,7 @@ public function testAddAttachmentToStep(
         self::assertSame($fileExtension, $attachment->getFileExtension());
     }
 
-    /**
-     * @dataProvider providerAttachmentProperties
-     */
+    #[DataProvider('providerAttachmentProperties')]
     public function testAddAttachmentFileToStep(
         string $name,
         ?string $type,

dev/tests/unit/Magento/FunctionalTestFramework/Console/GenerateTestsCommandTest.php

@@ -7,6 +7,7 @@
 namespace tests\unit\Magento\FunctionalTestFramework\Console;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Magento\FunctionalTestingFramework\Exceptions\FastFailException;
 use Magento\FunctionalTestingFramework\Console\GenerateTestsCommand;
 
@@ -17,9 +18,9 @@ class GenerateTestsCommandTest extends TestCase
      * @param mixed $groups
      * @param mixed $expected
      * @return void
-     * @dataProvider configParallelOptions
      * @throws \ReflectionException
      */
+    #[DataProvider('configParallelOptions')]
     public function testParseConfigParallelOptions($time, $groups, $expected): void
     {
         $command = new GenerateTestsCommand();

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/DataObjectHandlerTest.php

@@ -336,8 +336,7 @@ private function mockDataObjectHandlerWithData(array $mockData): void
         $mockObjectManagerInstance = $this->createMock(ObjectManager::class);
         $mockObjectManagerInstance
             ->method('create')
-            ->will(
-                $this->returnCallback(
+            ->willReturnCallback(
                     function (
                         string $class,
                         array $arguments = []
@@ -351,7 +350,6 @@ function (
 
                         return $objectManager->create($class, $arguments);
                     }
-                )
             );
 
         $property = new ReflectionProperty(ObjectManager::class, 'instance');

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/OperationDefinitionObjectHandlerTest.php

@@ -518,8 +518,7 @@ private function mockOperationHandlerWithData(array $mockData): void
         $mockObjectManagerInstance = $this->createMock(ObjectManager::class);
         $mockObjectManagerInstance
             ->method('create')
-            ->will(
-                $this->returnCallback(
+            ->willReturnCallback(
                     function (
                         string $class,
                         array $arguments = []
@@ -533,7 +532,6 @@ function (
 
                         return $objectManager->create($class, $arguments);
                     }
-                )
             );
 
         $property = new ReflectionProperty(ObjectManager::class, 'instance');

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/PersistedObjectHandlerTest.php

@@ -17,6 +17,7 @@
 use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;
 use Magento\FunctionalTestingFramework\ObjectManager;
 use Magento\FunctionalTestingFramework\ObjectManagerFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 use ReflectionProperty;
 use tests\unit\Util\MagentoTestCase;
 use tests\unit\Util\TestLoggingUtil;
@@ -405,11 +406,11 @@ public function testRetrieveEntityAcrossScopes(): void
      * @param string $type
      * @param string $scope
      * @param string $stepKey
-     * @dataProvider entityDataProvider
      *
      * @return void
      * @throws TestReferenceException
      */
+    #[DataProvider('entityDataProvider')]
     public function testRetrieveEntityValidField(
         string $name,
         string $key,
@@ -457,11 +458,11 @@ public function testRetrieveEntityValidField(
      * @param string $type
      * @param string $scope
      * @param string $stepKey
-     * @dataProvider entityDataProvider
      *
      * @return void
      * @throws TestReferenceException|TestFrameworkException
      */
+    #[DataProvider('entityDataProvider')]
     public function testRetrieveEntityInValidField(
         string $name,
         string $key,
@@ -557,20 +558,18 @@ public function mockCurlHandler(string $response, array $parserOutput): void
         $objectManagerMockInstance = $this->createMock(ObjectManager::class);
         $objectManagerMockInstance->expects($this->any())
             ->method('create')
-            ->will(
-                $this->returnCallback(
-                    function ($class, $arguments = []) use ($curlHandler, $objectManager, $dataProfileSchemaParser) {
-                        if ($class === CurlHandler::class) {
-                            return $curlHandler;
-                        }
-
-                        if ($class === DataProfileSchemaParser::class) {
-                            return $dataProfileSchemaParser;
-                        }
-
-                        return $objectManager->create($class, $arguments);
+            ->willReturnCallback(
+                function ($class, $arguments = []) use ($curlHandler, $objectManager, $dataProfileSchemaParser) {
+                    if ($class === CurlHandler::class) {
+                        return $curlHandler;
                     }
-                )
+
+                    if ($class === DataProfileSchemaParser::class) {
+                        return $dataProfileSchemaParser;
+                    }
+
+                    return $objectManager->create($class, $arguments);
+                }
             );
 
         $objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');

dev/tests/unit/Magento/FunctionalTestFramework/Module/Util/ModuleUtilTest.php

@@ -9,6 +9,7 @@
 namespace tests\unit\Magento\FunctionalTestFramework\Module\Util;
 
 use Magento\FunctionalTestingFramework\Module\Util\ModuleUtils;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ModuleUtilTest extends TestCase
@@ -21,8 +22,8 @@ class ModuleUtilTest extends TestCase
      * @param string $removed
      *
      * @return void
-     * @dataProvider inDataProvider
      */
+    #[DataProvider('inDataProvider')]
     public function testUtf8SafeControlCharacterTrim(string $input, string $output, $removed): void
     {
         $util = new ModuleUtils();

dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/PageObjectHandlerTest.php

@@ -146,8 +146,7 @@ private function mockPageObjectHandlerWithData(array $mockData): void
         $mockObjectManagerInstance = $this->createMock(ObjectManager::class);
         $mockObjectManagerInstance
             ->method('get')
-            ->will(
-                $this->returnCallback(
+            ->willReturnCallback(
                     function (
                         string $class,
                         array $arguments = []
@@ -161,7 +160,6 @@ function (
 
                         return $objectManager->create($class, $arguments);
                     }
-                )
             );
 
         $property = new ReflectionProperty(ObjectManager::class, 'instance');

dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/SectionObjectHandlerTest.php

@@ -131,8 +131,7 @@ private function mockSectionObjectHandlerWithData(array $mockData): void
         $mockObjectManagerInstance = $this->createMock(ObjectManager::class);
         $mockObjectManagerInstance
             ->method('get')
-            ->will(
-                $this->returnCallback(
+            ->willReturnCallback(
                     function (
                         string $class,
                         array $arguments = []
@@ -146,7 +145,6 @@ function (
 
                         return $objectManager->create($class, $arguments);
                     }
-                )
             );
 
         $property = new ReflectionProperty(ObjectManager::class, 'instance');

dev/tests/unit/Magento/FunctionalTestFramework/StaticCheck/DeprecatedEntityUsageCheckTest.php

@@ -309,8 +309,7 @@ private function mockOperationHandlerWithData(array $mockData): void
         $mockObjectManagerInstance = $this->createMock(ObjectManager::class);
         $mockObjectManagerInstance
             ->method('create')
-            ->will(
-                $this->returnCallback(
+            ->willReturnCallback(
                     function (
                         string $class,
                         array $arguments = []
@@ -324,7 +323,6 @@ function (
 
                         return $objectManager->create($class, $arguments);
                     }
-                )
             );
 
         $property = new ReflectionProperty(ObjectManager::class, 'instance');