bug #58791 [RateLimiter] handle error results of DateTime::modify() (xabbuh)

xabbuh · xabbuh · commit da4eb8b5e86a · 2024-11-08T16:28:17.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [RateLimiter] handle error results of DateTime::modify() | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT Depending on the version of PHP the `modify()` method will either throw an exception or issue a warning. Commits ------- fb6549d handle error results of DateTime::modify()
diff --git a/src/Symfony/Component/RateLimiter/RateLimiterFactory.php b/src/Symfony/Component/RateLimiter/RateLimiterFactory.php
@@ -68,19 +68,21 @@ public function create(?string $key = null): LimiterInterface
     protected static function configureOptions(OptionsResolver $options): void
     {
         $intervalNormalizer = static function (Options $options, string $interval): \DateInterval {
-            try {
-                // Create DateTimeImmutable from unix timesatmp, so the default timezone is ignored and we don't need to
-                // deal with quirks happening when modifying dates using a timezone with DST.
-                $now = \DateTimeImmutable::createFromFormat('U', time());
+            // Create DateTimeImmutable from unix timesatmp, so the default timezone is ignored and we don't need to
+            // deal with quirks happening when modifying dates using a timezone with DST.
+            $now = \DateTimeImmutable::createFromFormat('U', time());
 
-                return $now->diff($now->modify('+'.$interval));
-            } catch (\Exception $e) {
-                if (!preg_match('/Failed to parse time string \(\+([^)]+)\)/', $e->getMessage(), $m)) {
-                    throw $e;
-                }
+            try {
+                $nowPlusInterval = @$now->modify('+' . $interval);
+            } catch (\DateMalformedStringException $e) {
+                throw new \LogicException(\sprintf('Cannot parse interval "%s", please use a valid unit as described on https://www.php.net/datetime.formats.relative.', $interval), 0, $e);
+            }
 
-                throw new \LogicException(sprintf('Cannot parse interval "%s", please use a valid unit as described on https://www.php.net/datetime.formats.relative.', $m[1]));
+            if (!$nowPlusInterval) {
+                throw new \LogicException(\sprintf('Cannot parse interval "%s", please use a valid unit as described on https://www.php.net/datetime.formats.relative.', $interval));
             }
+
+            return $now->diff($nowPlusInterval);
         };
 
         $options
