bug #50611 [Clock] Fix MockClock::modify() on PHP 8.3 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit eacea7f4764f · 2023-06-09T01:46:37.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [Clock] Fix MockClock::modify() on PHP 8.3 | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 7361374 [Clock] Fix MockClock::modify() on PHP 8.3
diff --git a/src/Symfony/Component/Clock/MockClock.php b/src/Symfony/Component/Clock/MockClock.php
@@ -49,7 +49,12 @@ public function sleep(float|int $seconds): void
 
     public function modify(string $modifier): void
     {
-        if (false === $modifiedNow = @$this->now->modify($modifier)) {
+        try {
+            $modifiedNow = @$this->now->modify($modifier);
+        } catch (\DateMalformedStringException) {
+            $modifiedNow = false;
+        }
+        if (false === $modifiedNow) {
             throw new \InvalidArgumentException(sprintf('Invalid modifier: "%s". Could not modify MockClock.', $modifier));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,12 @@ public function sleep(float\|int $seconds): void`
`49`	`49`
`50`	`50`	`public function modify(string $modifier): void`
`51`	`51`	`{`
`52`		`- if (false === $modifiedNow = @$this->now->modify($modifier)) {`
	`52`	`+ try {`
	`53`	`+ $modifiedNow = @$this->now->modify($modifier);`
	`54`	`+ } catch (\DateMalformedStringException) {`
	`55`	`+ $modifiedNow = false;`
	`56`	`+ }`
	`57`	`+ if (false === $modifiedNow) {`
`53`	`58`	`throw new \InvalidArgumentException(sprintf('Invalid modifier: "%s". Could not modify MockClock.', $modifier));`
`54`	`59`	`}`
`55`	`60`