Merge branch '6.0' into 6.1

* 6.0:
  [Console] fix tests
  [Cache] Fix phpdoc
  [Console] Fix typo in completion command help text
  [Messenger] Retain correlation id from \AmqpEnvelope when retrying a message

Author: nicolas-grekas

Tests/Transport/AmqpStampTest.php

@@ -42,13 +42,15 @@ public function testCreateFromAmqpEnvelope()
         $amqpEnvelope->method('getDeliveryMode')->willReturn(2);
         $amqpEnvelope->method('getPriority')->willReturn(5);
         $amqpEnvelope->method('getAppId')->willReturn('appid');
+        $amqpEnvelope->method('getCorrelationId')->willReturn('foo');
 
         $stamp = AmqpStamp::createFromAmqpEnvelope($amqpEnvelope);
 
         $this->assertSame($amqpEnvelope->getRoutingKey(), $stamp->getRoutingKey());
         $this->assertSame($amqpEnvelope->getDeliveryMode(), $stamp->getAttributes()['delivery_mode']);
         $this->assertSame($amqpEnvelope->getPriority(), $stamp->getAttributes()['priority']);
         $this->assertSame($amqpEnvelope->getAppId(), $stamp->getAttributes()['app_id']);
+        $this->assertSame($amqpEnvelope->getCorrelationId(), $stamp->getAttributes()['correlation_id']);
         $this->assertSame(\AMQP_NOPARAM, $stamp->getFlags());
     }
 
@@ -59,15 +61,20 @@ public function testCreateFromAmqpEnvelopeWithPreviousStamp()
         $amqpEnvelope->method('getDeliveryMode')->willReturn(2);
         $amqpEnvelope->method('getPriority')->willReturn(5);
         $amqpEnvelope->method('getAppId')->willReturn('appid');
+        $amqpEnvelope->method('getCorrelationId')->willReturn('foo');
 
-        $previousStamp = new AmqpStamp('otherroutingkey', \AMQP_MANDATORY, ['priority' => 8]);
+        $previousStamp = new AmqpStamp('otherroutingkey', \AMQP_MANDATORY, [
+            'priority' => 8,
+            'correlation_id' => 'bar',
+        ]);
 
         $stamp = AmqpStamp::createFromAmqpEnvelope($amqpEnvelope, $previousStamp);
 
         $this->assertSame('otherroutingkey', $stamp->getRoutingKey());
         $this->assertSame($amqpEnvelope->getDeliveryMode(), $stamp->getAttributes()['delivery_mode']);
         $this->assertSame(8, $stamp->getAttributes()['priority']);
         $this->assertSame($amqpEnvelope->getAppId(), $stamp->getAttributes()['app_id']);
+        $this->assertSame('bar', $stamp->getAttributes()['correlation_id']);
         $this->assertSame(\AMQP_MANDATORY, $stamp->getFlags());
     }
 }

Transport/AmqpStamp.php

@@ -50,18 +50,19 @@ public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, self
     {
         $attr = $previousStamp->attributes ?? [];
 
-        $attr['headers'] = $attr['headers'] ?? $amqpEnvelope->getHeaders();
-        $attr['content_type'] = $attr['content_type'] ?? $amqpEnvelope->getContentType();
-        $attr['content_encoding'] = $attr['content_encoding'] ?? $amqpEnvelope->getContentEncoding();
-        $attr['delivery_mode'] = $attr['delivery_mode'] ?? $amqpEnvelope->getDeliveryMode();
-        $attr['priority'] = $attr['priority'] ?? $amqpEnvelope->getPriority();
-        $attr['timestamp'] = $attr['timestamp'] ?? $amqpEnvelope->getTimestamp();
-        $attr['app_id'] = $attr['app_id'] ?? $amqpEnvelope->getAppId();
-        $attr['message_id'] = $attr['message_id'] ?? $amqpEnvelope->getMessageId();
-        $attr['user_id'] = $attr['user_id'] ?? $amqpEnvelope->getUserId();
-        $attr['expiration'] = $attr['expiration'] ?? $amqpEnvelope->getExpiration();
-        $attr['type'] = $attr['type'] ?? $amqpEnvelope->getType();
-        $attr['reply_to'] = $attr['reply_to'] ?? $amqpEnvelope->getReplyTo();
+        $attr['headers'] ??= $amqpEnvelope->getHeaders();
+        $attr['content_type'] ??= $amqpEnvelope->getContentType();
+        $attr['content_encoding'] ??= $amqpEnvelope->getContentEncoding();
+        $attr['delivery_mode'] ??= $amqpEnvelope->getDeliveryMode();
+        $attr['priority'] ??= $amqpEnvelope->getPriority();
+        $attr['timestamp'] ??= $amqpEnvelope->getTimestamp();
+        $attr['app_id'] ??= $amqpEnvelope->getAppId();
+        $attr['message_id'] ??= $amqpEnvelope->getMessageId();
+        $attr['user_id'] ??= $amqpEnvelope->getUserId();
+        $attr['expiration'] ??= $amqpEnvelope->getExpiration();
+        $attr['type'] ??= $amqpEnvelope->getType();
+        $attr['reply_to'] ??= $amqpEnvelope->getReplyTo();
+        $attr['correlation_id'] ??= $amqpEnvelope->getCorrelationId();
 
         if (null === $retryRoutingKey) {
             $stamp = new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? \AMQP_NOPARAM, $attr);