symfony
diff --git a/‎src/Symfony/Component/Messenger/Envelope.php
Lines changed: 3 additions & 14 deletions b/‎src/Symfony/Component/Messenger/Envelope.php
Lines changed: 3 additions & 14 deletions
diff --git a/‎src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php
Lines changed: 0 additions & 7 deletions b/‎src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php
Lines changed: 0 additions & 7 deletions
@@ -73,7 +73,7 @@ public function withoutAll(string $stampFqcn): self
     {
         $cloned = clone $this;
 
-        unset($cloned->stamps[$this->resolveAlias($stampFqcn)]);
+        unset($cloned->stamps[$stampFqcn]);
 
         return $cloned;
     }
@@ -84,7 +84,6 @@ public function withoutAll(string $stampFqcn): self
     public function withoutStampsOfType(string $type): self
     {
         $cloned = clone $this;
-        $type = $this->resolveAlias($type);
 
         foreach ($cloned->stamps as $class => $stamps) {
             if ($class === $type || is_subclass_of($class, $type)) {
@@ -97,7 +96,7 @@ public function withoutStampsOfType(string $type): self
 
     public function last(string $stampFqcn): ?StampInterface
     {
-        return isset($this->stamps[$stampFqcn = $this->resolveAlias($stampFqcn)]) ? end($this->stamps[$stampFqcn]) : null;
+        return isset($this->stamps[$stampFqcn = $stampFqcn]) ? end($this->stamps[$stampFqcn]) : null;
     }
 
     /**
@@ -106,7 +105,7 @@ public function last(string $stampFqcn): ?StampInterface
     public function all(string $stampFqcn = null): array
     {
         if (null !== $stampFqcn) {
-            return $this->stamps[$this->resolveAlias($stampFqcn)] ?? [];
+            return $this->stamps[$stampFqcn] ?? [];
         }
 
         return $this->stamps;
@@ -119,14 +118,4 @@ public function getMessage(): object
     {
         return $this->message;
     }
-
-    /**
-     * BC to be removed in 6.0.
-     */
-    private function resolveAlias(string $fqcn): string
-    {
-        static $resolved;
-
-        return $resolved[$fqcn] ?? ($resolved[$fqcn] = (new \ReflectionClass($fqcn))->getName());
-    }
 }
@@ -14,7 +14,6 @@
 use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpReceivedStamp;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\RejectRedeliveredMessageException;
-use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceivedStamp as LegacyAmqpReceivedStamp;
 
 /**
  * Middleware that throws a RejectRedeliveredMessageException when a message is detected that has been redelivered by AMQP.
@@ -39,12 +38,6 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
             throw new RejectRedeliveredMessageException('Redelivered message from AMQP detected that will be rejected and trigger the retry logic.');
         }
 
-        // Legacy code to support symfony/messenger < 5.1
-        $amqpReceivedStamp = $envelope->last(LegacyAmqpReceivedStamp::class);
-        if ($amqpReceivedStamp instanceof LegacyAmqpReceivedStamp && $amqpReceivedStamp->getAmqpEnvelope()->isRedelivery()) {
-            throw new RejectRedeliveredMessageException('Redelivered message from AMQP detected that will be rejected and trigger the retry logic.');
-        }
-
         return $stack->next()->handle($envelope, $stack);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function withoutAll(string $stampFqcn): self`
`73`	`73`	`{`
`74`	`74`	`$cloned = clone $this;`
`75`	`75`
`76`		`- unset($cloned->stamps[$this->resolveAlias($stampFqcn)]);`
	`76`	`+ unset($cloned->stamps[$stampFqcn]);`
`77`	`77`
`78`	`78`	`return $cloned;`
`79`	`79`	`}`
`@@ -84,7 +84,6 @@ public function withoutAll(string $stampFqcn): self`
`84`	`84`	`public function withoutStampsOfType(string $type): self`
`85`	`85`	`{`
`86`	`86`	`$cloned = clone $this;`
`87`		`- $type = $this->resolveAlias($type);`
`88`	`87`
`89`	`88`	`foreach ($cloned->stamps as $class => $stamps) {`
`90`	`89`	`if ($class === $type \|\| is_subclass_of($class, $type)) {`
`@@ -97,7 +96,7 @@ public function withoutStampsOfType(string $type): self`
`97`	`96`
`98`	`97`	`public function last(string $stampFqcn): ?StampInterface`
`99`	`98`	`{`
`100`		`- return isset($this->stamps[$stampFqcn = $this->resolveAlias($stampFqcn)]) ? end($this->stamps[$stampFqcn]) : null;`
	`99`	`+ return isset($this->stamps[$stampFqcn = $stampFqcn]) ? end($this->stamps[$stampFqcn]) : null;`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`/**`
`@@ -106,7 +105,7 @@ public function last(string $stampFqcn): ?StampInterface`
`106`	`105`	`public function all(string $stampFqcn = null): array`
`107`	`106`	`{`
`108`	`107`	`if (null !== $stampFqcn) {`
`109`		`- return $this->stamps[$this->resolveAlias($stampFqcn)] ?? [];`
	`108`	`+ return $this->stamps[$stampFqcn] ?? [];`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`return $this->stamps;`
`@@ -119,14 +118,4 @@ public function getMessage(): object`
`119`	`118`	`{`
`120`	`119`	`return $this->message;`
`121`	`120`	`}`
`122`		`-`
`123`		`- /**`
`124`		`- * BC to be removed in 6.0.`
`125`		`- */`
`126`		`- private function resolveAlias(string $fqcn): string`
`127`		`- {`
`128`		`- static $resolved;`
`129`		`-`
`130`		`- return $resolved[$fqcn] ?? ($resolved[$fqcn] = (new \ReflectionClass($fqcn))->getName());`
`131`		`- }`
`132`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpReceivedStamp;`
`15`	`15`	`use Symfony\Component\Messenger\Envelope;`
`16`	`16`	`use Symfony\Component\Messenger\Exception\RejectRedeliveredMessageException;`
`17`		`-use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceivedStamp as LegacyAmqpReceivedStamp;`
`18`	`17`
`19`	`18`	`/**`
`20`	`19`	`* Middleware that throws a RejectRedeliveredMessageException when a message is detected that has been redelivered by AMQP.`
`@@ -39,12 +38,6 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope`
`39`	`38`	`throw new RejectRedeliveredMessageException('Redelivered message from AMQP detected that will be rejected and trigger the retry logic.');`
`40`	`39`	`}`
`41`	`40`
`42`		`- // Legacy code to support symfony/messenger < 5.1`
`43`		`- $amqpReceivedStamp = $envelope->last(LegacyAmqpReceivedStamp::class);`
`44`		`- if ($amqpReceivedStamp instanceof LegacyAmqpReceivedStamp && $amqpReceivedStamp->getAmqpEnvelope()->isRedelivery()) {`
`45`		`- throw new RejectRedeliveredMessageException('Redelivered message from AMQP detected that will be rejected and trigger the retry logic.');`
`46`		`- }`
`47`		`-`
`48`	`41`	`return $stack->next()->handle($envelope, $stack);`
`49`	`42`	`}`
`50`	`43`	`}`