More cleanups and fixes

Author: nicolas-grekas

Tests/Transport/BeanstalkdReceiverTest.php

@@ -32,7 +32,7 @@ public function testItReturnsTheDecodedMessageToTheHandler()
         $tube = 'foo bar';
 
         $beanstalkdEnvelope = $this->createBeanstalkdEnvelope();
-        $connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $connection = $this->createMock(Connection::class);
         $connection->expects($this->once())->method('get')->willReturn($beanstalkdEnvelope);
         $connection->expects($this->once())->method('getTube')->willReturn($tube);
 
@@ -53,7 +53,7 @@ public function testItReturnsEmptyArrayIfThereAreNoMessages()
     {
         $serializer = $this->createSerializer();
 
-        $connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $connection = $this->createMock(Connection::class);
         $connection->expects($this->once())->method('get')->willReturn(null);
 
         $receiver = new BeanstalkdReceiver($connection, $serializer);
@@ -70,7 +70,7 @@ public function testItRejectTheMessageIfThereIsAMessageDecodingFailedException()
         $serializer->expects($this->once())->method('decode')->willThrowException(new MessageDecodingFailedException());
 
         $beanstalkdEnvelope = $this->createBeanstalkdEnvelope();
-        $connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $connection = $this->createMock(Connection::class);
         $connection->expects($this->once())->method('get')->willReturn($beanstalkdEnvelope);
         $connection->expects($this->once())->method('reject');
 

Tests/Transport/BeanstalkdSenderTest.php

@@ -26,12 +26,10 @@ public function testSend()
         $envelope = new Envelope(new DummyMessage('Oy'));
         $encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class]];
 
-        $connection = $this->getMockBuilder(Connection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $connection = $this->createMock(Connection::class);
         $connection->expects($this->once())->method('send')->with($encoded['body'], $encoded['headers'], 0);
 
-        $serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
+        $serializer = $this->createMock(SerializerInterface::class);
         $serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
 
         $sender = new BeanstalkdSender($connection, $serializer);