minor #49662 [Tests] Remove withConsecutive() calls from tests (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit c085f58607d7 · 2023-03-10T17:36:47.000+01:00
This PR was merged into the 6.2 branch. Discussion ---------- [Tests] Remove `withConsecutive()` calls from tests | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | _NA_ | License | MIT | Doc PR | _NA_ Follows-up #49621 ℹ️ No more `setMethods()` deprecated calls have been found in 6.2. Commits ------- 6b27e78 [Tests] Remove `withConsecutive()` calls from tests
diff --git a/src/Symfony/Bridge/Twig/Tests/EventListener/TemplateAttributeListenerTest.php b/src/Symfony/Bridge/Twig/Tests/EventListener/TemplateAttributeListenerTest.php
@@ -29,12 +29,18 @@ public function testAttribute()
         $twig = $this->createMock(Environment::class);
         $twig->expects($this->exactly(3))
             ->method('render')
-            ->withConsecutive(
-                ['templates/foo.html.twig', ['foo' => 'bar']],
-                ['templates/foo.html.twig', ['bar' => 'Bar', 'buz' => 'def']],
-                ['templates/foo.html.twig', []],
-            )
-            ->willReturn('Bar');
+            ->willReturnCallback(function (...$args) {
+                static $series = [
+                    ['templates/foo.html.twig', ['foo' => 'bar']],
+                    ['templates/foo.html.twig', ['bar' => 'Bar', 'buz' => 'def']],
+                    ['templates/foo.html.twig', []],
+                ];
+
+                $this->assertSame(array_shift($series), $args);
+
+                return 'Bar';
+            })
+        ;
 
         $request = new Request();
         $kernel = $this->createMock(HttpKernelInterface::class);
diff --git a/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php b/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
@@ -146,9 +146,15 @@ public function toArray(): array
 
         $this->ldap
             ->method('bind')
-            ->withConsecutive(
-                ['elsa', 'test1234A$']
-            );
+            ->willReturnCallback(function (...$args) {
+                static $series = [
+                    ['elsa', 'test1234A$'],
+                    ['', 's3cr3t'],
+                ];
+
+                $this->assertSame(array_shift($series), $args);
+            })
+        ;
         $this->ldap->expects($this->any())->method('escape')->with('Wouter', '', LdapInterface::ESCAPE_FILTER)->willReturn('wouter');
         $this->ldap->expects($this->once())->method('query')->with('{user_identifier}', 'wouter_test')->willReturn($query);
 
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
@@ -803,8 +803,11 @@ public function testReadWithLastModified(array $locales, array $domains, array $
         $loader = $this->getLoader();
         $loader->expects($this->exactly(\count($consecutiveLoadArguments)))
             ->method('load')
-            ->withConsecutive(...$consecutiveLoadArguments)
-            ->willReturnOnConsecutiveCalls(...$consecutiveLoadReturns);
+            ->willReturnCallback(function (...$args) use (&$consecutiveLoadArguments, &$consecutiveLoadReturns) {
+                $this->assertSame(array_shift($consecutiveLoadArguments), $args);
+
+                return array_shift($consecutiveLoadReturns);
+            });
 
         $provider = self::createProvider(
             new MockHttpClient($responses, 'https://localise.biz/api/'),
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php
@@ -61,10 +61,16 @@ public function testReadWithLastModified(array $locales, array $domains, array $
         }
 
         $loader = $this->getLoader();
-        $loader->expects($this->exactly(\count($consecutiveLoadArguments) * 2))
+        $consecutiveLoadArguments = array_merge($consecutiveLoadArguments, $consecutiveLoadArguments);
+        $consecutiveLoadReturns = array_merge($consecutiveLoadReturns, $consecutiveLoadReturns);
+
+        $loader->expects($this->exactly(\count($consecutiveLoadArguments)))
             ->method('load')
-            ->withConsecutive(...$consecutiveLoadArguments, ...$consecutiveLoadArguments)
-            ->willReturnOnConsecutiveCalls(...$consecutiveLoadReturns, ...$consecutiveLoadReturns);
+            ->willReturnCallback(function (...$args) use (&$consecutiveLoadArguments, &$consecutiveLoadReturns) {
+                $this->assertSame(array_shift($consecutiveLoadArguments), $args);
+
+                return array_shift($consecutiveLoadReturns);
+            });
 
         $provider = $this->createProvider(
             new MockHttpClient($responses, 'https://localise.biz/api/'),
