symfony
diff --git a/‎src/Symfony/Component/Messenger/CHANGELOG.md
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Messenger/CHANGELOG.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Messenger/Stamp/DelayStamp.php
Lines changed: 6 additions & 8 deletions b/‎src/Symfony/Component/Messenger/Stamp/DelayStamp.php
Lines changed: 6 additions & 8 deletions
diff --git a/‎src/Symfony/Component/Messenger/Tests/Stamp/DelayStampTest.php
Lines changed: 14 additions & 10 deletions b/‎src/Symfony/Component/Messenger/Tests/Stamp/DelayStampTest.php
Lines changed: 14 additions & 10 deletions
@@ -6,7 +6,7 @@ CHANGELOG
 
 * The `RedeliveryStamp` will no longer be populated with error data. This information is now stored in the `ErrorDetailsStamp` instead.
 * Added `FlattenExceptionNormalizer` to give more information about the exception on Messenger background processes. The `FlattenExceptionNormalizer` has a higher priority than `ProblemNormalizer` and it is only used when the Messenger serialization context is set.
-* Added factory methods to `DelayStamp`.
+* Added factory methods `DelayStamp::delayFor(\DateInterval)` and `DelayStamp::delayUntil(\DateTimeInterface)`.
 * Removed the exception when dispatching a message with a `DispatchAfterCurrentBusStamp` and not in a context of another dispatch call
 * Added `WorkerMessageRetriedEvent`
 * Added `WorkerMessageReceivedEvent::setEnvelope()` and made event mutable
 
@@ -31,18 +31,16 @@ public function getDelay(): int
         return $this->delay;
     }
 
-    public static function delayForSeconds(int $seconds): self
+    public static function delayFor(\DateInterval $interval): self
     {
-        return new self($seconds * 1000);
-    }
+        $now = new \DateTimeImmutable();
+        $end = $now->add($interval);
 
-    public static function delayForMinutes(int $minutes): self
-    {
-        return self::delayForSeconds($minutes * 60);
+        return new self(($end->getTimestamp() - $now->getTimestamp()) * 1000);
     }
 
-    public static function delayForHours(int $hours): self
+    public static function delayUntil(\DateTimeInterface $dateTime): self
     {
-        return self::delayForMinutes($hours * 60);
+        return new self(($dateTime->getTimestamp() - time()) * 1000);
     }
 }
@@ -19,21 +19,25 @@
  */
 class DelayStampTest extends TestCase
 {
-    public function testSeconds()
+    public function testDelayFor()
     {
-        $stamp = DelayStamp::delayForSeconds(30);
+        $stamp = DelayStamp::delayFor(\DateInterval::createFromDateString('30 seconds'));
         $this->assertSame(30000, $stamp->getDelay());
-    }
-
-    public function testMinutes()
-    {
-        $stamp = DelayStamp::delayForMinutes(30);
+        $stamp = DelayStamp::delayFor(\DateInterval::createFromDateString('30 minutes'));
         $this->assertSame(1800000, $stamp->getDelay());
+        $stamp = DelayStamp::delayFor(\DateInterval::createFromDateString('30 hours'));
+        $this->assertSame(108000000, $stamp->getDelay());
+
+        $stamp = DelayStamp::delayFor(\DateInterval::createFromDateString('-5 seconds'));
+        $this->assertSame(-5000, $stamp->getDelay());
     }
 
-    public function testHours()
+    public function testDelayUntil()
     {
-        $stamp = DelayStamp::delayForHours(30);
-        $this->assertSame(108000000, $stamp->getDelay());
+        $stamp = DelayStamp::delayUntil(new \DateTimeImmutable('+30 seconds'));
+        $this->assertSame(30000, $stamp->getDelay());
+
+        $stamp = DelayStamp::delayUntil(new \DateTimeImmutable('-5 seconds'));
+        $this->assertSame(-5000, $stamp->getDelay());
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -31,18 +31,16 @@ public function getDelay(): int`
`31`	`31`	`return $this->delay;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static function delayForSeconds(int $seconds): self`
	`34`	`+ public static function delayFor(\DateInterval $interval): self`
`35`	`35`	`{`
`36`		`- return new self($seconds * 1000);`
`37`		`- }`
	`36`	`+ $now = new \DateTimeImmutable();`
	`37`	`+ $end = $now->add($interval);`
`38`	`38`
`39`		`- public static function delayForMinutes(int $minutes): self`
`40`		`- {`
`41`		`- return self::delayForSeconds($minutes * 60);`
	`39`	`+ return new self(($end->getTimestamp() - $now->getTimestamp()) * 1000);`
`42`	`40`	`}`
`43`	`41`
`44`		`- public static function delayForHours(int $hours): self`
	`42`	`+ public static function delayUntil(\DateTimeInterface $dateTime): self`
`45`	`43`	`{`
`46`		`- return self::delayForMinutes($hours * 60);`
	`44`	`+ return new self(($dateTime->getTimestamp() - time()) * 1000);`
`47`	`45`	`}`
`48`	`46`	`}`