Merge pull request #1308 from Mopolo/refactor-date-interval-var-isset

Refactor de la validation `\DateInterval`
afup · Jul 2, 2023 · 4289b4f · 4289b4f
2 parents f7cba70 + 2a1eb9a
commit 4289b4f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/sources/AppBundle/Security/ActionThrottling/ActionThrottling.php b/sources/AppBundle/Security/ActionThrottling/ActionThrottling.php
@@ -26,10 +26,17 @@ public function isActionBlocked($action, $ip = null, $objectId = null)
         }
 
         $delay = $limitations[$action]['delay'];
-        $interval = new \DateInterval($delay);
-        if (isset($interval) === false) { // Si le delay est invalide alors le dateinterval n'est pas créé et une warning générée mais pas d'exception
-            throw new \RuntimeException(sprintf('Sorry, I could not understand the delay "%s" for the action "%s"', $delay, $action));
+
+        try {
+            $interval = new \DateInterval($delay);
+        } catch (\Exception $dateIntervalException) {
+            throw new \RuntimeException(
+                sprintf('Sorry, I could not understand the delay "%s" for the action "%s"', $delay, $action),
+                0,
+                $dateIntervalException
+            );
         }
+
         $logs = $this->logRepository->getApplicableLogs($action, $ip, $objectId, $interval);
 
         if ($logs['ip'] > $limitations[$action]['limit'] || $logs['object'] > $limitations[$action]['limit']) {