Merge branch '3.4' into 4.2

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

Author: nicolas-grekas

Tests/MessageBusTest.php

@@ -47,9 +47,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())
@@ -76,17 +76,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())
@@ -116,9 +116,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/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);