feature #37480 [Messenger] add redeliveredAt in RedeliveryStamp construct (qkdreyer)

fabpot · fabpot · commit 681c66675eea · 2020-08-02T10:17:01.000+02:00
This PR was squashed before being merged into the 5.2-dev branch. Discussion ---------- [Messenger] add redeliveredAt in RedeliveryStamp construct | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - --- this would allows one to correctly unserialize a RedeliveryStamp with a custom serializer not using the php serialize function Commits ------- 64d2683 [Messenger] add redeliveredAt in RedeliveryStamp construct
diff --git a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php
@@ -24,12 +24,12 @@ final class RedeliveryStamp implements StampInterface
     private $exceptionMessage;
     private $flattenException;
 
-    public function __construct(int $retryCount, string $exceptionMessage = null, FlattenException $flattenException = null)
+    public function __construct(int $retryCount, string $exceptionMessage = null, FlattenException $flattenException = null, \DateTimeImmutable $redeliveredAt = null)
     {
         $this->retryCount = $retryCount;
         $this->exceptionMessage = $exceptionMessage;
         $this->flattenException = $flattenException;
-        $this->redeliveredAt = new \DateTimeImmutable();
+        $this->redeliveredAt = $redeliveredAt ?? new \DateTimeImmutable();
     }
 
     public static function getRetryCountFromEnvelope(Envelope $envelope): int
diff --git a/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/RedeliveryStampTest.php
@@ -33,4 +33,10 @@ public function testGettersPopulated()
         $this->assertSame('exception message', $stamp->getExceptionMessage());
         $this->assertSame($flattenException, $stamp->getFlattenException());
     }
+
+    public function testSerialization()
+    {
+        $stamp = new RedeliveryStamp(10, null, null, \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, '2005-08-15T15:52:01+0000'));
+        $this->assertSame('2005-08-15T15:52:01+0000', $stamp->getRedeliveredAt()->format(\DateTimeInterface::ISO8601));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ final class RedeliveryStamp implements StampInterface`
`24`	`24`	`private $exceptionMessage;`
`25`	`25`	`private $flattenException;`
`26`	`26`
`27`		`- public function __construct(int $retryCount, string $exceptionMessage = null, FlattenException $flattenException = null)`
	`27`	`+ public function __construct(int $retryCount, string $exceptionMessage = null, FlattenException $flattenException = null, \DateTimeImmutable $redeliveredAt = null)`
`28`	`28`	`{`
`29`	`29`	`$this->retryCount = $retryCount;`
`30`	`30`	`$this->exceptionMessage = $exceptionMessage;`
`31`	`31`	`$this->flattenException = $flattenException;`
`32`		`- $this->redeliveredAt = new \DateTimeImmutable();`
	`32`	`+ $this->redeliveredAt = $redeliveredAt ?? new \DateTimeImmutable();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public static function getRetryCountFromEnvelope(Envelope $envelope): int`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,10 @@ public function testGettersPopulated()`
`33`	`33`	`$this->assertSame('exception message', $stamp->getExceptionMessage());`
`34`	`34`	`$this->assertSame($flattenException, $stamp->getFlattenException());`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public function testSerialization()`
	`38`	`+ {`
	`39`	`+ $stamp = new RedeliveryStamp(10, null, null, \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, '2005-08-15T15:52:01+0000'));`
	`40`	`+ $this->assertSame('2005-08-15T15:52:01+0000', $stamp->getRedeliveredAt()->format(\DateTimeInterface::ISO8601));`
	`41`	`+ }`
`36`	`42`	`}`