withConsecutive method deprecation fix 7

Author: sivaram7

src/Test/Unit/App/Logger/Gelf/HandlerFactoryTest.php

@@ -59,33 +59,32 @@ public function testCreate(): void
 
         $this->repositoryMock->expects($this->exactly(2))
             ->method('get')
-            ->withConsecutive(
-                ['transport'],
-                ['additional']
-            )
-            ->willReturnOnConsecutiveCalls(
-                [
+            // withConsecutive() alternative.
+            ->willReturnCallback(fn($param) => match ([$param]) {
+                ['transport'] => [
                     'http' => [
                         'host' => 'localhost'
                     ],
                     'tcp' => [
                         'host' => '127.0.0.1'
                     ]
                 ],
-                [
+                ['additional'] => [
                     'project' => 'some_project'
                 ]
-            );
+            });            
+        $series = [
+            [['http', ['host' => 'localhost']], $httpTransportMock],
+            [['tcp', ['host' => '127.0.0.1']], $tcpTransportMock],
+        ];
         $this->transportFactoryMock->expects($this->exactly(2))
             ->method('create')
-            ->withConsecutive(
-                ['http', ['host' => 'localhost']],
-                ['tcp', ['host' => '127.0.0.1']]
-            )
-            ->willReturnOnConsecutiveCalls(
-                $httpTransportMock,
-                $tcpTransportMock
-            );
+            // withConsecutive() alternative.
+            ->willReturnCallback(function (...$args) use (&$series) {
+                [$expectedArgs, $return] = array_shift($series);
+                $this->assertSame($expectedArgs, $args);
+                return $return;
+            });
 
         $this->handlerFactory->create($this->repositoryMock, Logger::INFO);
     }

src/Test/Unit/StaticContent/CommandFactoryTest.php

@@ -77,12 +77,18 @@ public function testCreate(array $optionConfig, bool $useScdStrategy, string $ex
             ->expects($this->exactly(3))
             ->method('satisfies')
             ->willReturn($useScdStrategy);
+        $arguments = array_chunk($optionConfig['excluded_themes'], 1);
+        $results = $optionConfig['resolve_return'];
         $this->themeResolverMock
             ->expects($this->exactly(count($optionConfig['excluded_themes'])))
             ->method('resolve')
-            ->withConsecutive(...array_chunk($optionConfig['excluded_themes'], 1))
-            ->willReturnOnConsecutiveCalls(...$optionConfig['resolve_return']);
-
+            // withConsecutive() alternative.
+            ->willReturnCallback(function ($arguments) use ($results) {
+                static $callCount = 0;
+                $returnValue = $results[$callCount] ?? null;
+                $callCount++;
+                return $returnValue;
+            });
         $this->assertEquals(
             $expected,
             $this->commandFactory->create(
@@ -274,12 +280,18 @@ public function testMatrix(array $optionConfig, array $matrix, array $expected)
             ->expects($this->any())
             ->method('satisfies')
             ->willReturn(true);
+        $arguments = $optionConfig['resolve_pass'];
+        $results = $optionConfig['resolve_return'];
         $this->themeResolverMock
             ->expects($this->exactly(count($optionConfig['resolve_pass'])))
             ->method('resolve')
-            ->withConsecutive(...$optionConfig['resolve_pass'])
-            ->willReturnOnConsecutiveCalls(...$optionConfig['resolve_return']);
-
+            // withConsecutive() alternative.
+            ->willReturnCallback(function ($arguments) use ($results) {
+                static $callCount = 0;
+                $returnValue = $results[$callCount] ?? null;
+                $callCount++;
+                return $returnValue;
+            });
         $this->assertSame(
             $expected,
             $this->commandFactory->matrix($optionMock, $matrix)
@@ -390,11 +402,18 @@ public function testCreateNoResolve()
             ->expects($this->exactly(3))
             ->method('satisfies')
             ->willReturn($useScdStrategy);
+        $arguments = array_chunk($excludedThemes, 1);
+        $results = $optionConfig['resolve_return'];
         $this->themeResolverMock
             ->expects($this->exactly($this->count($excludedThemes)))
             ->method('resolve')
-            ->withConsecutive(...array_chunk($excludedThemes, 1))
-            ->willReturnOnConsecutiveCalls(...$optionConfig['resolve_return']);
+            // withConsecutive() alternative.
+            ->willReturnCallback(function ($arguments) use ($results) {
+                static $callCount = 0;
+                $returnValue = $results[$callCount] ?? null;
+                $callCount++;
+                return $returnValue;
+            });
 
         $this->assertEquals(
             $expected,
@@ -436,14 +455,11 @@ public function testMatrixNoResolve(): void
         $this->themeResolverMock
             ->expects($this->exactly(2))
             ->method('resolve')
-            ->withConsecutive(
-                ['Magento/Backend'],
-                ['Magento/Backend']
-            )
-            ->willReturnOnConsecutiveCalls(
-                '',
-                ''
-            );
+            // withConsecutive() alternative.
+            ->willReturnCallback(fn($param) => match ([$param]) {
+                ['Magento/Backend'] => '',
+                ['Magento/Backend'] => ''
+            });
         $this->loggerMock
             ->expects($this->once())
             ->method('warning')