Merge branch '4.2' into 4.3

* 4.2:
  Use willReturn() instead of will(returnValue()).

Author: nicolas-grekas

Tests/MessageBusTest.php

@@ -49,9 +49,9 @@ public function testItCallsMiddleware()
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->will($this->returnCallback(function ($envelope, $stack) {
+            ->willReturnCallback(function ($envelope, $stack) {
                 return $stack->next()->handle($envelope, $stack);
-            }));
+            });
 
         $secondMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $secondMiddleware->expects($this->once())
@@ -78,17 +78,17 @@ public function testThatAMiddlewareCanAddSomeStampsToTheEnvelope()
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->will($this->returnCallback(function ($envelope, $stack) {
+            ->willReturnCallback(function ($envelope, $stack) {
                 return $stack->next()->handle($envelope->with(new AnEnvelopeStamp()), $stack);
-            }));
+            });
 
         $secondMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $secondMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelopeWithAnotherStamp, $this->anything())
-            ->will($this->returnCallback(function ($envelope, $stack) {
+            ->willReturnCallback(function ($envelope, $stack) {
                 return $stack->next()->handle($envelope, $stack);
-            }));
+            });
 
         $thirdMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $thirdMiddleware->expects($this->once())
@@ -118,9 +118,9 @@ public function testThatAMiddlewareCanUpdateTheMessageWhileKeepingTheEnvelopeSta
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->will($this->returnCallback(function ($envelope, $stack) use ($expectedEnvelope) {
+            ->willReturnCallback(function ($envelope, $stack) use ($expectedEnvelope) {
                 return $stack->next()->handle($expectedEnvelope, $stack);
-            }));
+            });
 
         $secondMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $secondMiddleware->expects($this->once())

Tests/Middleware/SendMessageMiddlewareTest.php

@@ -37,7 +37,7 @@ public function testItSendsTheMessageToAssignedSender()
         $sendersLocator = $this->createSendersLocator([DummyMessage::class => ['my_sender']], ['my_sender' => $sender]);
         $middleware = new SendMessageMiddleware($sendersLocator);
 
-        $sender->expects($this->once())->method('send')->with($envelope->with(new SentStamp(\get_class($sender), 'my_sender')))->will($this->returnArgument(0));
+        $sender->expects($this->once())->method('send')->with($envelope->with(new SentStamp(\get_class($sender), 'my_sender')))->willReturnArgument(0);
 
         $envelope = $middleware->handle($envelope, $this->getStackMock(false));
 
@@ -65,7 +65,7 @@ public function testItSendsTheMessageToMultipleSenders()
                 // last SentStamp should be the "foo" alias
                 return null !== $lastSentStamp && 'foo' === $lastSentStamp->getSenderAlias();
             }))
-            ->will($this->returnArgument(0));
+            ->willReturnArgument(0);
         $sender2->expects($this->once())
             ->method('send')
             ->with($this->callback(function (Envelope $envelope) {
@@ -75,7 +75,7 @@ public function testItSendsTheMessageToMultipleSenders()
                 // last SentStamp should be the "bar" alias
                 return null !== $lastSentStamp && 'bar' === $lastSentStamp->getSenderAlias();
             }))
-            ->will($this->returnArgument(0));
+            ->willReturnArgument(0);
 
         $envelope = $middleware->handle($envelope, $this->getStackMock(false));
 
@@ -102,7 +102,7 @@ public function testItSendsToOnlyOneSenderOnRedelivery()
         ;
         $sender2->expects($this->once())
             ->method('send')
-            ->will($this->returnArgument(0));
+            ->willReturnArgument(0);
 
         $mockStack = $this->getStackMock(false); // false because next should not be called
         $envelope = $middleware->handle($envelope, $mockStack);

Tests/Middleware/TraceableMiddlewareTest.php

@@ -34,9 +34,9 @@ public function testHandle()
         $middleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->will($this->returnCallback(function ($envelope, StackInterface $stack) {
+            ->willReturnCallback(function ($envelope, StackInterface $stack) {
                 return $stack->next()->handle($envelope, $stack);
-            }))
+            })
         ;
 
         $stopwatch = $this->createMock(Stopwatch::class);

Tests/RoutableMessageBusTest.php

@@ -31,7 +31,7 @@ public function testItRoutesToTheCorrectBus()
 
         $container = $this->createMock(ContainerInterface::class);
         $container->expects($this->once())->method('has')->with('foo_bus')->willReturn(true);
-        $container->expects($this->once())->method('get')->will($this->returnValue($bus2));
+        $container->expects($this->once())->method('get')->willReturn($bus2);
 
         $stamp = new DelayStamp(5);
         $bus1->expects($this->never())->method('dispatch');

Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php

@@ -58,9 +58,9 @@ public function testCreateTransportMustThrowAnExceptionIfManagerIsNotFound()
         $registry = $this->getMockBuilder(RegistryInterface::class)->getMock();
         $registry->expects($this->once())
             ->method('getConnection')
-            ->will($this->returnCallback(function () {
+            ->willReturnCallback(function () {
                 throw new \InvalidArgumentException();
-            }));
+            });
 
         $factory = new DoctrineTransportFactory($registry);
         $factory->createTransport('doctrine://default', [], $this->createMock(SerializerInterface::class));