Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 317e2626dcfe · 2022-04-01T10:30:43.000+02:00
* 5.4:
  [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,9 +11,11 @@
 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;
 
+/**
+ * @requires extension pdo_sqlite
+ */
 class MiddlewareTest extends TestCase
 {
     private $debugDataHolder;
@@ -27,8 +29,6 @@ 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,9 +11,11 @@`
`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;`
`15`	`14`	`use Symfony\Component\Stopwatch\Stopwatch;`
`16`	`15`
	`16`	`+/**`
	`17`	`+ * @requires extension pdo_sqlite`
	`18`	`+ */`
`17`	`19`	`class MiddlewareTest extends TestCase`
`18`	`20`	`{`
`19`	`21`	`private $debugDataHolder;`
`@@ -27,8 +29,6 @@ protected function setUp(): void`
`27`	`29`	`if (!interface_exists(MiddlewareInterface::class)) {`
`28`	`30`	`$this->markTestSkipped(sprintf('%s needed to run this test', MiddlewareInterface::class));`
`29`	`31`	`}`
`30`		`-`
`31`		`- ClockMock::withClockMock(false);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`private function init(bool $withStopwatch = true): void`