Merge remote-tracking branch 'origin/webapi_test' into phpunit10

Author: nishant04412

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -706,7 +706,7 @@ public function testDispatchRunJob(): void
             ->with('cron_job_run', ['job_name' => 'cron/test_group/test_job1']);
 
         $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
-        $addScheduleMethods = [
+        $scheduleMethods = [
             'getJobCode',
             'getScheduledAt',
             'setStatus',

app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php

@@ -149,23 +149,21 @@ public function testRegenerateStatic(): void
         $this->shell
             ->expects($this->exactly(4))
             ->method('execute')
-            ->willReturnCallback(function ($arg) use ($cacheFlushCmd, $setupDiCompileCmd, $staticContentDeployCmd) {
-                if ($arg == $cacheFlushCmd ||
-                    $arg == $setupDiCompileCmd ||
-                    $arg == $staticContentDeployCmd) {
-                    return "Compilation complete";
+            ->willReturnCallback(function ($arg1) use ($cacheFlushCmd, $setupDiCompileCmd, $staticContentDeployCmd) {
+                if ($arg1 == $cacheFlushCmd || $arg1 == $setupDiCompileCmd || $arg1 == $staticContentDeployCmd) {
+                    return null;
                 }
             });
 
         $this->output
             ->method('writeln')
-            ->willReturnCallback(function ($arg) {
-                if ($arg == 'Starting compilation' ||
-                    $arg == 'Compilation complete' ||
-                    $arg == 'Starting deployment of static content' ||
-                    $arg == 'Deployment of static content complete' ||
-                    empty($arg)
-                ) {
+            ->willReturnCallback(function ($arg1) {
+                if ($arg1 == 'Starting compilation' ||
+                    $arg1 == 'Compilation complete' ||
+                    $arg1 == 'Starting deployment of static content' ||
+                    $arg1 == 'Deployment of static content complete' ||
+                    empty($arg1)
+                    ) {
                     return null;
                 }
             });
@@ -194,13 +192,8 @@ public function testGenerateStaticForNotAllowedStoreViewLocale(): void
         $this->shell
             ->expects($this->exactly(3))
             ->method('execute')
-            ->willReturnCallback(function ($arg) use ($cacheFlushCmd, $setupDiCompileCmd, $staticContentDeployCmd) {
-                if ($arg == $cacheFlushCmd ||
-                    $arg == $setupDiCompileCmd ||
-                    $arg == $staticContentDeployCmd) {
-                    return "Compilation complete";
-                }
-            });
+            ->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd])
+            ->willReturn("Compilation complete");
 
         $this->initAdminLocaleMock('en_US');
 
@@ -228,13 +221,8 @@ public function testGenerateStaticForNotAllowedAdminLocale(): void
         $this->shell
             ->expects($this->exactly(3))
             ->method('execute')
-            ->willReturnCallback(function ($arg) use ($cacheFlushCmd, $setupDiCompileCmd, $staticContentDeployCmd) {
-                if ($arg == $cacheFlushCmd ||
-                    $arg == $setupDiCompileCmd ||
-                    $arg == $staticContentDeployCmd) {
-                    return "Compilation complete";
-                }
-            });
+            ->withConsecutive([$cacheFlushCmd], [$setupDiCompileCmd], [$cacheFlushCmd], [$staticContentDeployCmd])
+            ->willReturn("Compilation complete");
 
         $this->initAdminLocaleMock(';echo');
 
@@ -259,4 +247,4 @@ private function initAdminLocaleMock($locale): void
         $this->userCollection->method('getIterator')
             ->willReturn(new \ArrayIterator([$user]));
     }
-}
+}

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -254,7 +254,6 @@ protected function setUp(): void
         $this->randomMock = $this->getMockForAbstractClass(Random::class);
         $this->upload = $this->createMock(Upload::class);
         $this->localeEmulator = $this->getMockForAbstractClass(LocaleEmulatorInterface::class);
-
         $this->import = $this->getMockBuilder(Import::class)
             ->setConstructorArgs(
                 [

composer.json

@@ -103,7 +103,7 @@
         "pdepend/pdepend": "^2.10",
         "phpmd/phpmd": "^2.12",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^10.4",
+        "phpunit/phpunit": "^10.5",
         "symfony/finder": "^6.4"
     },
     "repositories": [