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

nicolas-grekas · nicolas-grekas · commit abf769b52959 · 2023-03-10T17:40:49.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [Tests] Remove `withConsecutive()` calls from tests | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | _NA_ | License | MIT | Doc PR | _NA_ Last one, introduced in 6.3 🙂 Commits ------- 65fc32e [Tests] Remove `withConsecutive()` calls from tests
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php
@@ -47,21 +47,24 @@ public function testLevelsAssignedToLoggers(bool $hasLogger, bool $hasDeprecatio
         if ($hasDeprecationLogger) {
             $deprecationLogger = $this->createMock(LoggerInterface::class);
             if (null !== $expectedDeprecationLoggerLevels) {
-                $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels];
+                $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels, false];
             }
         }
 
         if ($hasLogger) {
             $logger = $this->createMock(LoggerInterface::class);
             if (null !== $expectedLoggerLevels) {
-                $expectedCalls[] = [$logger, $expectedLoggerLevels];
+                $expectedCalls[] = [$logger, $expectedLoggerLevels, false];
             }
         }
 
         $handler
             ->expects($this->exactly(\count($expectedCalls)))
             ->method('setDefaultLogger')
-            ->withConsecutive(...$expectedCalls);
+            ->willReturnCallback(function (...$args) use (&$expectedCalls) {
+                $this->assertSame(array_shift($expectedCalls), $args);
+            })
+        ;
 
         $configurator = new ErrorHandlerConfigurator($logger, $levels, null, true, true, $deprecationLogger);
 

Original file line number	Diff line number	Diff line change
`@@ -47,21 +47,24 @@ public function testLevelsAssignedToLoggers(bool $hasLogger, bool $hasDeprecatio`
`47`	`47`	`if ($hasDeprecationLogger) {`
`48`	`48`	`$deprecationLogger = $this->createMock(LoggerInterface::class);`
`49`	`49`	`if (null !== $expectedDeprecationLoggerLevels) {`
`50`		`- $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels];`
	`50`	`+ $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels, false];`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if ($hasLogger) {`
`55`	`55`	`$logger = $this->createMock(LoggerInterface::class);`
`56`	`56`	`if (null !== $expectedLoggerLevels) {`
`57`		`- $expectedCalls[] = [$logger, $expectedLoggerLevels];`
	`57`	`+ $expectedCalls[] = [$logger, $expectedLoggerLevels, false];`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$handler`
`62`	`62`	`->expects($this->exactly(\count($expectedCalls)))`
`63`	`63`	`->method('setDefaultLogger')`
`64`		`- ->withConsecutive(...$expectedCalls);`
	`64`	`+ ->willReturnCallback(function (...$args) use (&$expectedCalls) {`
	`65`	`+ $this->assertSame(array_shift($expectedCalls), $args);`
	`66`	`+ })`
	`67`	`+ ;`
`65`	`68`
`66`	`69`	`$configurator = new ErrorHandlerConfigurator($logger, $levels, null, true, true, $deprecationLogger);`
`67`	`70`