Merge branch '5.4' into 6.0

* 5.4:
  Run php-cs-fixer

Author: nicolas-grekas

Tests/Transport/ConnectionTest.php

@@ -462,7 +462,7 @@ public function testItDelaysTheMessage()
         $delayExchange = $this->createMock(\AMQPExchange::class);
         $delayExchange->expects($this->once())
             ->method('publish')
-            ->with('{}', 'delay_messages__5000_delay', AMQP_NOPARAM, [
+            ->with('{}', 'delay_messages__5000_delay', \AMQP_NOPARAM, [
                 'headers' => ['x-some-headers' => 'foo'],
                 'delivery_mode' => 2,
                 'timestamp' => time(),
@@ -477,7 +477,7 @@ public function testItRetriesTheMessage()
         $delayExchange = $this->createMock(\AMQPExchange::class);
         $delayExchange->expects($this->once())
             ->method('publish')
-            ->with('{}', 'delay_messages__5000_retry', AMQP_NOPARAM);
+            ->with('{}', 'delay_messages__5000_retry', \AMQP_NOPARAM);
         $connection = $this->createDelayOrRetryConnection($delayExchange, '', 'delay_messages__5000_retry');
 
         $amqpEnvelope = $this->createMock(\AMQPEnvelope::class);

Transport/AmqpStamp.php

@@ -64,9 +64,9 @@ public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, self
         $attr['reply_to'] = $attr['reply_to'] ?? $amqpEnvelope->getReplyTo();
 
         if (null === $retryRoutingKey) {
-            $stamp = new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? AMQP_NOPARAM, $attr);
+            $stamp = new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
         } else {
-            $stamp = new self($retryRoutingKey, $previousStamp->flags ?? AMQP_NOPARAM, $attr);
+            $stamp = new self($retryRoutingKey, $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
             $stamp->isRetryAttempt = true;
         }