+ public function __wakeup(): void

{

throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);

diff --git a/src/Symfony/Component/Clock/ClockAwareTrait.php b/src/Symfony/Component/Clock/ClockAwareTrait.php

--- a/src/Symfony/Component/Clock/ClockAwareTrait.php

+++ b/src/Symfony/Component/Clock/ClockAwareTrait.php

@@ -33,5 +33,5 @@ trait ClockAwareTrait

* @return Instant

*/

- protected function now(): \DateTimeImmutable

+ protected function now(): Instant

{

$now = ($this->clock ??= new Clock())->now();

diff --git a/src/Symfony/Component/Config/ConfigCacheInterface.php b/src/Symfony/Component/Config/ConfigCacheInterface.php

--- a/src/Symfony/Component/Config/ConfigCacheInterface.php

+++ b/src/Symfony/Component/Config/ConfigCacheInterface.php

6.4

* Add`TimePoint`: an immutable DateTime implementation with stricter error handling and return types

* Throw`DateMalformedStringException`/`DateInvalidTimeZoneException` when appropriate

* Add`$modifier` argument to the`now()` helper

self::$globalClock =$clockinstanceof ClockInterface ?$clock :newself($clock);

}

publicfunctionnow():\DateTimeImmutable

publicfunctionnow():TimePoint

{

$now = ($this->clock ??self::get())->now();

if (!$nowinstanceof TimePoint) {

$now = TimePoint::createFromInterface($now);

}

returnisset($this->timezone) ?$now->setTimezone($this->timezone) :$now;

}

$this->clock =$clock;

}

protectedfunctionnow():\DateTimeImmutable

{

return ($this->clock ??=newClock())->now();

$now = ($this->clock ??=newClock())->now();

return$nowinstanceof TimePoint ?$now : Moment::createFromInterface($now);

}

}

finalclass MockClockimplements ClockInterface

{

private\DateTimeImmutable$now;

privateTimePoint$now;

}

}

if (\PHP_VERSION_ID >=80300 &&\is_string($now)) {

$now =new \DateTimeImmutable($now,$timezone ??new \DateTimeZone('UTC'));

}elseif (\is_string($now)) {

try {

$now =new \DateTimeImmutable($now,$timezone ??new \DateTimeZone('UTC'));

}catch (\Exception$e) {

thrownew \DateMalformedStringException($e->getMessage(),$e->getCode(),$e);

}

if (\is_string($now)) {

$now =newTimePoint($now,$timezone ??new \DateTimeZone('UTC'));

}elseif (!$nowinstanceof TimePoint) {

$now = TimePoint::createFromInterface($now);

}

$this->now =null !==$timezone ?$now->setTimezone($timezone) :$now;

}

publicfunctionnow():\DateTimeImmutable

publicfunctionnow():TimePoint

{

returnclone$this->now;

}

$now =substr_replace(sprintf('@%07.0F',$now),'.', -6,0);

$timezone =$this->now->getTimezone();

$this->now = (new \DateTimeImmutable($now,$timezone))->setTimezone($timezone);

$this->now =TimePoint::createFromInterface(new \DateTimeImmutable($now,$timezone))->setTimezone($timezone);

}

$this->timezone =\is_string($timezone ??=date_default_timezone_get()) ?$this->withTimeZone($timezone)->timezone :$timezone;

}

publicfunctionnow():\DateTimeImmutable

publicfunctionnow():TimePoint

{

[$s,$us] =hrtime();

$now ='@'.($s +$this->sOffset).'.'.$now;

return (new \DateTimeImmutable($now,$this->timezone))->setTimezone($this->timezone);

returnTimePoint::createFromInterface(new \DateTimeImmutable($now,$this->timezone))->setTimezone($this->timezone);

}

publicfunctionsleep(float|int$seconds):void

$this->timezone =\is_string($timezone ??=date_default_timezone_get()) ?$this->withTimeZone($timezone)->timezone :$timezone;

}

publicfunctionnow():\DateTimeImmutable

publicfunctionnow():TimePoint

{

returnnew \DateTimeImmutable('now',$this->timezone);

returnTimePoint::createFromInterface(new \DateTimeImmutable('now',$this->timezone));

}

publicfunctionsleep(float|int$seconds):void

functionnow(string$modifier =null):\DateTimeImmutable

functionnow(string$modifier ='now'):TimePoint

{

if (null ===$modifier ||'now'===$modifier) {

returnClock::get()->now();

if ('now'!==$modifier) {

returnnewTimePoint($modifier);

}

$now = Clock::get()->now();

if (\PHP_VERSION_ID <80300) {

try {

$tz = (new \DateTimeImmutable($modifier,$now->getTimezone()))->getTimezone();

}catch (\Exception$e) {

thrownew \DateMalformedStringException($e->getMessage(),$e->getCode(),$e);

}

$now =$now->setTimezone($tz);

return @$now->modify($modifier) ?:thrownew \DateMalformedStringException(error_get_last()['message'] ??sprintf('Invalid date modifier "%s".',$modifier));

}

$tz = (new \DateTimeImmutable($modifier,$now->getTimezone()))->getTimezone();

return$now->setTimezone($tz)->modify($modifier);

return$nowinstanceof TimePoint ?$now : Moment::createFromInterface($now);

}

}

usePHPUnit\Framework\TestCase;

useSymfony\Component\Clock\ClockAwareTrait;

useSymfony\Component\Clock\MockClock;

useSymfony\Component\Clock\TimePoint;

class ClockAwareTraitTestextends TestCase

{

publicfunctiontestTrait()

{

$sut =newclass() {

use ClockAwareTrait {

nowaspublic;

}

};

$sut =newClockAwareTestImplem();

$this->assertInstanceOf(\DateTimeImmutable::class,$sut->now());

$this->assertInstanceOf(TimePoint::class,$sut->now());

$clock =newMockClock();

$sut =new$sut();

$this->assertSame(1.0,round($sut->now()->getTimestamp() -$ts,1));

}

}

class ClockAwareTestImplem

{

use ClockAwareTrait {

nowaspublic;

}

}

useSymfony\Component\Clock\MockClock;

useSymfony\Component\Clock\NativeClock;

useSymfony\Component\Clock\Test\ClockSensitiveTrait;

useSymfony\Component\Clock\TimePoint;

usefunctionSymfony\Component\Clock\now;

publicfunctiontestNativeClock()

{

$this->assertInstanceOf(\DateTimeImmutable::class,now());

$this->assertInstanceOf(TimePoint::class,now());

$this->assertInstanceOf(NativeClock::class, Clock::get());

}