Fix merge

nicolas-grekas · nicolas-grekas · commit 57361a5ab89d · 2019-12-16T15:00:54.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ env:
 matrix:
     include:
         - php: 7.1
-          env: php_extra="7.2 7.4snapshot"
+          env: php_extra="7.2 7.4"
         - php: 7.3
           env: deps=high
         - php: 7.4
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php
@@ -287,7 +287,7 @@ public function testBindingArguments()
         $factory->method('createQueue')->willReturn($amqpQueue);
 
         $amqpExchange->expects($this->once())->method('declareExchange');
-        $amqpExchange->expects($this->once())->method('publish')->with('body', null, AMQP_NOPARAM, ['headers' => []]);
+        $amqpExchange->expects($this->once())->method('publish')->with('body', null, AMQP_NOPARAM, ['headers' => [], 'delivery_mode' => 2]);
         $amqpQueue->expects($this->once())->method('declareQueue');
         $amqpQueue->expects($this->exactly(1))->method('bind')->withConsecutive(
             [self::DEFAULT_EXCHANGE_NAME, null, ['x-match' => 'all']]
