Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 2848b70a4121 · 2022-04-01T10:40:40.000+02:00
* 6.0:
  [Bridge/Doctrine] fix tests
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php
@@ -11,6 +11,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
 use Symfony\Bridge\Doctrine\Middleware\Debug\Middleware;
+use Symfony\Bridge\PhpUnit\ClockMock;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -29,6 +30,8 @@ protected function setUp(): void
         if (!interface_exists(MiddlewareInterface::class)) {
             $this->markTestSkipped(sprintf('%s needed to run this test', MiddlewareInterface::class));
         }
+
+        ClockMock::withClockMock(false);
     }
 
     private function init(bool $withStopwatch = true): void

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use PHPUnit\Framework\TestCase;`
`12`	`12`	`use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;`
`13`	`13`	`use Symfony\Bridge\Doctrine\Middleware\Debug\Middleware;`
	`14`	`+use Symfony\Bridge\PhpUnit\ClockMock;`
`14`	`15`	`use Symfony\Component\Stopwatch\Stopwatch;`
`15`	`16`
`16`	`17`	`/**`
`@@ -29,6 +30,8 @@ protected function setUp(): void`
`29`	`30`	`if (!interface_exists(MiddlewareInterface::class)) {`
`30`	`31`	`$this->markTestSkipped(sprintf('%s needed to run this test', MiddlewareInterface::class));`
`31`	`32`	`}`
	`33`	`+`
	`34`	`+ ClockMock::withClockMock(false);`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`private function init(bool $withStopwatch = true): void`