[Clock] Fix calling mockTime() in setUpBeforeClass()

HypeMC · HypeMC · commit 522fe9865b63 · 2023-12-22T06:28:17.000+01:00
diff --git a/src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php b/src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php
@@ -42,14 +42,20 @@ public static function mockTime(string|\DateTimeImmutable|bool $when = true): Cl
     }
 
     /**
+     * @beforeClass
+     *
      * @before
      *
      * @internal
      */
-    protected static function saveClockBeforeTest(bool $save = true): ClockInterface
+    public static function saveClockBeforeTest(bool $save = true): ClockInterface
     {
         static $originalClock;
 
+        if ($save && $originalClock) {
+            self::restoreClockAfterTest();
+        }
+
         return $save ? $originalClock = Clock::get() : $originalClock;
     }
 
diff --git a/src/Symfony/Component/Clock/Tests/ClockBeforeClassTest.php b/src/Symfony/Component/Clock/Tests/ClockBeforeClassTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Clock\NativeClock;
+use Symfony\Component\Clock\Test\ClockSensitiveTrait;
+
+class ClockBeforeClassTest extends TestCase
+{
+    use ClockSensitiveTrait;
+
+    private static ?ClockInterface $clock = null;
+
+    public static function setUpBeforeClass(): void
+    {
+        self::$clock = self::mockTime();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$clock = null;
+    }
+
+    public function testMockClock()
+    {
+        $this->assertInstanceOf(MockClock::class, self::$clock);
+        $this->assertInstanceOf(NativeClock::class, Clock::get());
+
+        $clock = self::mockTime();
+        $this->assertInstanceOf(MockClock::class, Clock::get());
+        $this->assertSame(Clock::get(), $clock);
+
+        $this->assertNotSame($clock, self::$clock);
+
+        self::restoreClockAfterTest();
+        self::saveClockBeforeTest();
+
+        $this->assertInstanceOf(MockClock::class, self::$clock);
+        $this->assertInstanceOf(NativeClock::class, Clock::get());
+
+        $clock = self::mockTime();
+        $this->assertInstanceOf(MockClock::class, Clock::get());
+        $this->assertSame(Clock::get(), $clock);
+
+        $this->assertNotSame($clock, self::$clock);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,20 @@ public static function mockTime(string\|\DateTimeImmutable\|bool $when = true): Cl`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
	`45`	`+ * @beforeClass`
	`46`	`+ *`
`45`	`47`	`* @before`
`46`	`48`	`*`
`47`	`49`	`* @internal`
`48`	`50`	`*/`
`49`		`- protected static function saveClockBeforeTest(bool $save = true): ClockInterface`
	`51`	`+ public static function saveClockBeforeTest(bool $save = true): ClockInterface`
`50`	`52`	`{`
`51`	`53`	`static $originalClock;`
`52`	`54`
	`55`	`+ if ($save && $originalClock) {`
	`56`	`+ self::restoreClockAfterTest();`
	`57`	`+ }`
	`58`	`+`
`53`	`59`	`return $save ? $originalClock = Clock::get() : $originalClock;`
`54`	`60`	`}`
`55`	`61`