Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 2c72817f85cb · 2023-06-09T01:46:55.000+02:00
* 6.2:
  [Clock] Fix MockClock::modify() on PHP 8.3
diff --git a/MockClock.php b/MockClock.php
@@ -51,7 +51,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
`@@ -51,7 +51,12 @@ public function sleep(float\|int $seconds): void`
`51`	`51`
`52`	`52`	`public function modify(string $modifier): void`
`53`	`53`	`{`
`54`		`- if (false === $modifiedNow = @$this->now->modify($modifier)) {`
	`54`	`+ try {`
	`55`	`+ $modifiedNow = @$this->now->modify($modifier);`
	`56`	`+ } catch (\DateMalformedStringException) {`
	`57`	`+ $modifiedNow = false;`
	`58`	`+ }`
	`59`	`+ if (false === $modifiedNow) {`
`55`	`60`	`throw new \InvalidArgumentException(sprintf('Invalid modifier: "%s". Could not modify MockClock.', $modifier));`
`56`	`61`	`}`
`57`	`62`