Add a checks that an interval is valid

upyx · upyx · commit 192a72592aea · 2022-08-12T19:29:15.000+10:00
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Schedule/PeriodicalMessageTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Schedule/PeriodicalMessageTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Messenger\Tests\Transport\Schedule;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\Transport\Schedule\PeriodicalMessage;
 
 class PeriodicalMessageTest extends TestCase
@@ -102,6 +103,29 @@ public function testConstructors()
         $this->assertEquals($message, PeriodicalMessage::fromPeriod(new \stdClass(), new \DatePeriod($firstRun->sub($day), $day, 284108, \DatePeriod::EXCLUDE_START_DATE)));
     }
 
+    public function getInvalidIntervals(): iterable
+    {
+        yield ['wrong'];
+        yield ['3600.5'];
+        yield [0];
+        yield [-3600];
+    }
+
+    /**
+     * @dataProvider getInvalidIntervals
+     */
+    public function testInvalidInterval($interval)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        PeriodicalMessage::create(new \stdClass(), $interval, $now = new \DateTimeImmutable(), $now->modify('1 day'));
+    }
+
+    public function testNegativeInterval()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        PeriodicalMessage::create(new \stdClass(), 'wrong', $now = new \DateTimeImmutable(), $now->modify('1 day'));
+    }
+
     public function testGetMessage()
     {
         $message = new \stdClass();
diff --git a/src/Symfony/Component/Messenger/Transport/Schedule/PeriodicalMessage.php b/src/Symfony/Component/Messenger/Transport/Schedule/PeriodicalMessage.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Messenger\Transport\Schedule;
 
+use Symfony\Component\Messenger\Exception\InvalidArgumentException;
+
 final class PeriodicalMessage implements ScheduledMessageInterface
 {
     public function __construct(
@@ -19,6 +21,9 @@ public function __construct(
         private readonly \DateTimeImmutable $firstRun,
         private readonly \DateTimeImmutable $priorTo,
     ) {
+        if (0 >= $this->intervalInSeconds) {
+            throw new InvalidArgumentException('The interval must be greater then zero.');
+        }
     }
 
     public static function create(
@@ -36,9 +41,10 @@ public static function create(
         if (\is_string($interval)) {
             if ('P' === $interval[0]) {
                 $interval = new \DateInterval($interval);
-            } else {
-                \assert((string) (int) $interval === $interval);
+            } elseif (ctype_digit($interval)) {
                 $interval = (int) $interval;
+            } else {
+                throw new InvalidArgumentException('The interval must be a positive integer.');
             }
         }
         if (!\is_int($interval)) {
