diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
index da09206184194..b6882e41e2d70 100644
--- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
+++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
@@ -31,7 +31,7 @@ public function __construct(ManagerRegistry $managerRegistry, ?string $entityMan
$this->entityManagerName = $entityManagerName;
}
- public function handle($message, callable $next)
+ public function handle($message, callable $next): void
{
$entityManager = $this->managerRegistry->getManager($this->entityManagerName);
@@ -41,7 +41,7 @@ public function handle($message, callable $next)
$entityManager->getConnection()->beginTransaction();
try {
- $result = $next($message);
+ $next($message);
$entityManager->flush();
$entityManager->getConnection()->commit();
} catch (\Throwable $exception) {
@@ -49,7 +49,5 @@ public function handle($message, callable $next)
throw $exception;
}
-
- return $result;
}
}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
index f7b8fc3104037..04a567bd42a8f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -168,16 +168,6 @@
{% endfor %}
-
- | Result |
-
- {% if dispatchCall.result is defined %}
- {{ profiler_dump(dispatchCall.result.seek('value'), maxDepth=2) }}
- {% elseif dispatchCall.exception is defined %}
- No result as an exception occurred
- {% endif %}
- |
-
{% if dispatchCall.exception is defined %}
| Exception |
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
index f09d7d6f5430c..072d83c8dd0b1 100644
--- a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
+++ b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
@@ -38,11 +38,13 @@ public function __construct(SenderLocatorInterface $senderLocator, array $messag
*
* {@inheritdoc}
*/
- public function handle($envelope, callable $next)
+ public function handle($envelope, callable $next): void
{
if ($envelope->get(ReceivedStamp::class)) {
// It's a received message. Do not send it back:
- return $next($envelope);
+ $next($envelope);
+
+ return;
}
$sender = $this->senderLocator->getSenderForMessage($envelope->getMessage());
@@ -55,7 +57,7 @@ public function handle($envelope, callable $next)
}
}
- return $next($envelope);
+ $next($envelope);
}
private function mustSendAndHandle($message): bool
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 1588f73c68836..058473bf6afe4 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
* The component is not experimental anymore
* All the changes below are BC BREAKS
+ * `MessageBusInterface::dispatch()` and `MiddlewareInterface::handle()` now return `void`
* The signature of `Amqp*` classes changed to take a `Connection` as a first argument and an optional
`Serializer` as a second argument.
* `SenderLocator` has been renamed to `ContainerSenderLocator`
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
index eb34262909608..77415c5c2879e 100644
--- a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
+++ b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -98,14 +98,6 @@ private function collectMessage(string $busName, array $tracedMessage)
'caller' => $tracedMessage['caller'],
);
- if (array_key_exists('result', $tracedMessage)) {
- $result = $tracedMessage['result'];
- $debugRepresentation['result'] = array(
- 'type' => \is_object($result) ? \get_class($result) : \gettype($result),
- 'value' => $result,
- );
- }
-
if (isset($tracedMessage['exception'])) {
$exception = $tracedMessage['exception'];
diff --git a/src/Symfony/Component/Messenger/Handler/ChainHandler.php b/src/Symfony/Component/Messenger/Handler/ChainHandler.php
index c21d492e03217..79cf3a4682de4 100644
--- a/src/Symfony/Component/Messenger/Handler/ChainHandler.php
+++ b/src/Symfony/Component/Messenger/Handler/ChainHandler.php
@@ -39,12 +39,8 @@ public function __construct(array $handlers)
public function __invoke($message)
{
- $results = array();
-
foreach ($this->handlers as $handler) {
- $results[] = $handler($message);
+ $handler($message);
}
-
- return $results;
}
}
diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php
index 89fa8e04fa23c..0fc7075904465 100644
--- a/src/Symfony/Component/Messenger/MessageBus.php
+++ b/src/Symfony/Component/Messenger/MessageBus.php
@@ -38,13 +38,13 @@ public function __construct(iterable $middlewareHandlers = array())
/**
* {@inheritdoc}
*/
- public function dispatch($message)
+ public function dispatch($message): void
{
if (!\is_object($message)) {
throw new InvalidArgumentException(sprintf('Invalid type for message argument. Expected object, but got "%s".', \gettype($message)));
}
- return \call_user_func($this->callableForNextMiddleware(0, Envelope::wrap($message)), $message);
+ \call_user_func($this->callableForNextMiddleware(0, Envelope::wrap($message)), $message);
}
private function callableForNextMiddleware(int $index, Envelope $currentEnvelope): callable
@@ -71,7 +71,7 @@ private function callableForNextMiddleware(int $index, Envelope $currentEnvelope
$message = $message->getMessage();
}
- return $middleware->handle($message, $this->callableForNextMiddleware($index + 1, $currentEnvelope));
+ $middleware->handle($message, $this->callableForNextMiddleware($index + 1, $currentEnvelope));
};
}
}
diff --git a/src/Symfony/Component/Messenger/MessageBusInterface.php b/src/Symfony/Component/Messenger/MessageBusInterface.php
index c44b3dfbb5194..ea715feb58fd5 100644
--- a/src/Symfony/Component/Messenger/MessageBusInterface.php
+++ b/src/Symfony/Component/Messenger/MessageBusInterface.php
@@ -19,11 +19,7 @@ interface MessageBusInterface
/**
* Dispatches the given message.
*
- * The bus can return a value coming from handlers, but is not required to do so.
- *
* @param object|Envelope $message The message or the message pre-wrapped in an envelope
- *
- * @return mixed
*/
- public function dispatch($message);
+ public function dispatch($message): void;
}
diff --git a/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php b/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php
index 33494548f832f..a419f1d93a845 100644
--- a/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php
@@ -18,10 +18,10 @@
*/
class AllowNoHandlerMiddleware implements MiddlewareInterface
{
- public function handle($message, callable $next)
+ public function handle($message, callable $next): void
{
try {
- return $next($message);
+ $next($message);
} catch (NoHandlerForMessageException $e) {
// We allow not having a handler for this message.
}
diff --git a/src/Symfony/Component/Messenger/Middleware/Enhancers/ActivationMiddlewareDecorator.php b/src/Symfony/Component/Messenger/Middleware/Enhancers/ActivationMiddlewareDecorator.php
index c9244acbc4bbb..97b16ae67f2d0 100644
--- a/src/Symfony/Component/Messenger/Middleware/Enhancers/ActivationMiddlewareDecorator.php
+++ b/src/Symfony/Component/Messenger/Middleware/Enhancers/ActivationMiddlewareDecorator.php
@@ -37,12 +37,12 @@ public function __construct(MiddlewareInterface $inner, $activated)
/**
* @param Envelope $envelope
*/
- public function handle($envelope, callable $next)
+ public function handle($envelope, callable $next): void
{
if (\is_callable($this->activated) ? ($this->activated)($envelope) : $this->activated) {
- return $this->inner->handle($envelope->getMessageFor($this->inner), $next);
+ $this->inner->handle($envelope->getMessageFor($this->inner), $next);
+ } else {
+ $next($envelope);
}
-
- return $next($envelope);
}
}
diff --git a/src/Symfony/Component/Messenger/Middleware/Enhancers/TraceableMiddleware.php b/src/Symfony/Component/Messenger/Middleware/Enhancers/TraceableMiddleware.php
index 61cbca8c23cab..eaac35897b7cc 100644
--- a/src/Symfony/Component/Messenger/Middleware/Enhancers/TraceableMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/Enhancers/TraceableMiddleware.php
@@ -39,7 +39,7 @@ public function __construct(MiddlewareInterface $inner, Stopwatch $stopwatch, st
/**
* @param Envelope $envelope
*/
- public function handle($envelope, callable $next)
+ public function handle($envelope, callable $next): void
{
$class = \get_class($this->inner);
$eventName = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).'@anonymous' : $class;
@@ -51,19 +51,15 @@ public function handle($envelope, callable $next)
$this->stopwatch->start($eventName, $this->eventCategory);
try {
- $result = $this->inner->handle($envelope->getMessageFor($this->inner), function ($message) use ($next, $eventName) {
+ $this->inner->handle($envelope->getMessageFor($this->inner), function ($message) use ($next, $eventName) {
$this->stopwatch->stop($eventName);
- $result = $next($message);
+ $next($message);
$this->stopwatch->start($eventName, $this->eventCategory);
-
- return $result;
});
} finally {
if ($this->stopwatch->isStarted($eventName)) {
$this->stopwatch->stop($eventName);
}
}
-
- return $result;
}
}
diff --git a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php
index 4d63a8ae6c5a4..7f47c2891b1ad 100644
--- a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php
@@ -28,13 +28,11 @@ public function __construct(HandlerLocatorInterface $messageHandlerResolver)
/**
* {@inheritdoc}
*/
- public function handle($message, callable $next)
+ public function handle($message, callable $next): void
{
$handler = $this->messageHandlerResolver->resolve($message);
- $result = $handler($message);
+ $handler($message);
$next($message);
-
- return $result;
}
}
diff --git a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php b/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php
index ebaf8525c0407..d42f671c86e13 100644
--- a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php
@@ -28,12 +28,12 @@ public function __construct(LoggerInterface $logger)
/**
* {@inheritdoc}
*/
- public function handle($message, callable $next)
+ public function handle($message, callable $next): void
{
$this->logger->debug('Starting handling message {class}', $this->createContext($message));
try {
- $result = $next($message);
+ $next($message);
} catch (\Throwable $e) {
$this->logger->warning('An exception occurred while handling message {class}', array_merge(
$this->createContext($message),
@@ -44,8 +44,6 @@ public function handle($message, callable $next)
}
$this->logger->debug('Finished handling message {class}', $this->createContext($message));
-
- return $result;
}
private function createContext($message): array
diff --git a/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php b/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php
index 0d1c3e29e497e..c01a604817d8f 100644
--- a/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php
+++ b/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php
@@ -18,8 +18,6 @@ interface MiddlewareInterface
{
/**
* @param object $message
- *
- * @return mixed
*/
- public function handle($message, callable $next);
+ public function handle($message, callable $next): void;
}
diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
index 361fb7bbb34d2..d003fd5a7bcf3 100644
--- a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
@@ -32,7 +32,7 @@ public function __construct(ValidatorInterface $validator)
/**
* @param Envelope $envelope
*/
- public function handle($envelope, callable $next)
+ public function handle($envelope, callable $next): void
{
$message = $envelope->getMessage();
$groups = null;
@@ -46,6 +46,6 @@ public function handle($envelope, callable $next)
throw new ValidationFailedException($message, $violations);
}
- return $next($envelope);
+ $next($envelope);
}
}
diff --git a/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php b/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
index 62556edfd24f7..71278b02da93d 100644
--- a/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
+++ b/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
@@ -33,15 +33,12 @@ protected function setUp()
$this->dumper->setColors(false);
}
- /**
- * @dataProvider getHandleTestData
- */
- public function testHandle($returnedValue, $expected)
+ public function testHandle()
{
$message = new DummyMessage('dummy message');
$bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
- $bus->method('dispatch')->with($message)->willReturn($returnedValue);
+ $bus->method('dispatch')->with($message);
$bus = new TraceableMessageBus($bus);
$collector = new MessengerDataCollector();
@@ -54,13 +51,9 @@ public function testHandle($returnedValue, $expected)
$messages = $collector->getMessages();
$this->assertCount(1, $messages);
- $this->assertStringMatchesFormat($expected, $this->getDataAsString($messages[0]));
- }
-
- public function getHandleTestData()
- {
$file = __FILE__;
- $messageDump = << "default"
"stamps" => null
"message" => array:2 [
@@ -74,48 +67,10 @@ public function getHandleTestData()
"file" => "$file"
"line" => %d
]
-DUMP;
-
- yield 'no returned value' => array(
- null,
- << array:2 [
- "type" => "NULL"
- "value" => null
- ]
-]
-DUMP
- );
-
- yield 'scalar returned value' => array(
- 'returned value',
- << array:2 [
- "type" => "string"
- "value" => "returned value"
- ]
]
-DUMP
- );
+DUMP;
- yield 'array returned value' => array(
- array('returned value'),
- << array:2 [
- "type" => "array"
- "value" => array:1 [
- 0 => "returned value"
- ]
- ]
-]
-DUMP
- );
+ $this->assertStringMatchesFormat($expected, $this->getDataAsString($messages[0]));
}
public function testHandleWithException()
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
index 9a81f3d951318..f969b4be43617 100644
--- a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
+++ b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -852,8 +852,8 @@ public function dummyMethodForSomeBus()
class UselessMiddleware implements MiddlewareInterface
{
- public function handle($message, callable $next)
+ public function handle($message, callable $next): void
{
- return $next($message);
+ $next($message);
}
}
diff --git a/src/Symfony/Component/Messenger/Tests/Handler/ChainHandlerTest.php b/src/Symfony/Component/Messenger/Tests/Handler/ChainHandlerTest.php
index 5126697fb9df2..5dc293e7e26b4 100644
--- a/src/Symfony/Component/Messenger/Tests/Handler/ChainHandlerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Handler/ChainHandlerTest.php
@@ -17,7 +17,7 @@
class ChainHandlerTest extends TestCase
{
- public function testItCallsTheHandlersAndReturnsAllResults()
+ public function testItCallsTheHandlers()
{
$message = new DummyMessage('Hey');
@@ -26,19 +26,15 @@ public function testItCallsTheHandlersAndReturnsAllResults()
->expects($this->once())
->method('__invoke')
->with($message)
- ->willReturn('Hello')
;
$handler2 = $this->createPartialMock(\stdClass::class, array('__invoke'));
$handler2
->expects($this->once())
->method('__invoke')
->with($message)
- ->willReturn('World')
;
- $results = (new ChainHandler(array($handler1, $handler2)))($message);
-
- $this->assertSame(array('Hello', 'World'), $results);
+ (new ChainHandler(array($handler1, $handler2)))($message);
}
/**
diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
index ae4d639adfe4e..0f8e8a5b0121c 100644
--- a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
+++ b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
@@ -39,7 +39,7 @@ public function testItDispatchInvalidMessageType()
(new MessageBus())->dispatch('wrong');
}
- public function testItCallsMiddlewareAndChainTheReturnValue()
+ public function testItCallsMiddleware()
{
$message = new DummyMessage('Hello');
$responseFromDepthMiddleware = 1234;
@@ -49,21 +49,21 @@ public function testItCallsMiddlewareAndChainTheReturnValue()
->method('handle')
->with($message, $this->anything())
->will($this->returnCallback(function ($message, $next) {
- return $next($message);
+ $next($message);
}));
$secondMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
$secondMiddleware->expects($this->once())
->method('handle')
->with($message, $this->anything())
- ->willReturn($responseFromDepthMiddleware);
+ ;
$bus = new MessageBus(array(
$firstMiddleware,
$secondMiddleware,
));
- $this->assertEquals($responseFromDepthMiddleware, $bus->dispatch($message));
+ $bus->dispatch($message);
}
public function testItKeepsTheEnvelopeEvenThroughAMiddlewareThatIsNotEnvelopeAware()
@@ -76,7 +76,7 @@ public function testItKeepsTheEnvelopeEvenThroughAMiddlewareThatIsNotEnvelopeAwa
->method('handle')
->with($message, $this->anything())
->will($this->returnCallback(function ($message, $next) {
- return $next($message);
+ $next($message);
}));
$secondMiddleware = $this->getMockBuilder(array(MiddlewareInterface::class, EnvelopeAwareInterface::class))->getMock();
@@ -104,7 +104,7 @@ public function testThatAMiddlewareCanAddSomeStampsToTheEnvelope()
->method('handle')
->with($envelope, $this->anything())
->will($this->returnCallback(function ($message, $next) {
- return $next($message->with(new AnEnvelopeStamp()));
+ $next($message->with(new AnEnvelopeStamp()));
}));
$secondMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
@@ -112,7 +112,7 @@ public function testThatAMiddlewareCanAddSomeStampsToTheEnvelope()
->method('handle')
->with($message, $this->anything())
->will($this->returnCallback(function ($message, $next) {
- return $next($message);
+ $next($message);
}));
$thirdMiddleware = $this->getMockBuilder(array(MiddlewareInterface::class, EnvelopeAwareInterface::class))->getMock();
@@ -143,7 +143,7 @@ public function testThatAMiddlewareCanUpdateTheMessageWhileKeepingTheEnvelopeSta
->method('handle')
->with($message, $this->anything())
->will($this->returnCallback(function ($message, $next) use ($changedMessage) {
- return $next($changedMessage);
+ $next($changedMessage);
}));
$secondMiddleware = $this->getMockBuilder(array(MiddlewareInterface::class, EnvelopeAwareInterface::class))->getMock();
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php
index 74610d8029c70..efbefb9586a3f 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php
@@ -18,15 +18,15 @@
class AllowNoHandlerMiddlewareTest extends TestCase
{
- public function testItCallsNextMiddlewareAndReturnsItsResult()
+ public function testItCallsNextMiddleware()
{
$message = new DummyMessage('Hey');
$next = $this->createPartialMock(\stdClass::class, array('__invoke'));
- $next->expects($this->once())->method('__invoke')->with($message)->willReturn('Foo');
+ $next->expects($this->once())->method('__invoke')->with($message);
$middleware = new AllowNoHandlerMiddleware();
- $this->assertSame('Foo', $middleware->handle($message, $next));
+ $middleware->handle($message, $next);
}
public function testItCatchesTheNoHandlerException()
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/ActivationMiddlewareDecoratorTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/ActivationMiddlewareDecoratorTest.php
index 32b4a7d0f2fdf..6f7517808fb15 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/ActivationMiddlewareDecoratorTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/ActivationMiddlewareDecoratorTest.php
@@ -32,11 +32,11 @@ public function testExecuteMiddlewareOnActivated()
$next->expects($this->never())->method('__invoke');
$middleware = $this->createMock(MiddlewareInterface::class);
- $middleware->expects($this->once())->method('handle')->with($message, $next)->willReturn('Hello from middleware');
+ $middleware->expects($this->once())->method('handle')->with($message, $next);
$decorator = new ActivationMiddlewareDecorator($middleware, true);
- $this->assertSame('Hello from middleware', $decorator->handle($envelope, $next));
+ $decorator->handle($envelope, $next);
}
public function testExecuteMiddlewareOnActivatedWithCallable()
@@ -51,11 +51,11 @@ public function testExecuteMiddlewareOnActivatedWithCallable()
$next->expects($this->never())->method('__invoke');
$middleware = $this->createMock(MiddlewareInterface::class);
- $middleware->expects($this->once())->method('handle')->with($message, $next)->willReturn('Hello from middleware');
+ $middleware->expects($this->once())->method('handle')->with($message, $next);
$decorator = new ActivationMiddlewareDecorator($middleware, $activated);
- $this->assertSame('Hello from middleware', $decorator->handle($envelope, $next));
+ $decorator->handle($envelope, $next);
}
public function testExecuteEnvelopeAwareMiddlewareWithEnvelope()
@@ -67,11 +67,11 @@ public function testExecuteEnvelopeAwareMiddlewareWithEnvelope()
$next->expects($this->never())->method('__invoke');
$middleware = $this->createMock(array(MiddlewareInterface::class, EnvelopeAwareInterface::class));
- $middleware->expects($this->once())->method('handle')->with($envelope, $next)->willReturn('Hello from middleware');
+ $middleware->expects($this->once())->method('handle')->with($envelope, $next);
$decorator = new ActivationMiddlewareDecorator($middleware, true);
- $this->assertSame('Hello from middleware', $decorator->handle($envelope, $next));
+ $decorator->handle($envelope, $next);
}
public function testExecuteMiddlewareOnDeactivated()
@@ -80,13 +80,13 @@ public function testExecuteMiddlewareOnDeactivated()
$envelope = Envelope::wrap($message);
$next = $this->createPartialMock(\stdClass::class, array('__invoke'));
- $next->expects($this->once())->method('__invoke')->with($envelope)->willReturn('Hello from $next');
+ $next->expects($this->once())->method('__invoke')->with($envelope);
$middleware = $this->createMock(MiddlewareInterface::class);
$middleware->expects($this->never())->method('handle');
$decorator = new ActivationMiddlewareDecorator($middleware, false);
- $this->assertSame('Hello from $next', $decorator->handle($envelope, $next));
+ $decorator->handle($envelope, $next);
}
}
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/TraceableMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/TraceableMiddlewareTest.php
index 88cf149670fc1..5e772a88fd809 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/TraceableMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/Enhancers/TraceableMiddlewareTest.php
@@ -33,7 +33,7 @@ public function testHandle()
->method('handle')
->with($message, $this->anything())
->will($this->returnCallback(function ($message, callable $next) {
- return $next($message);
+ $next($message);
}))
;
@@ -42,7 +42,6 @@ public function testHandle()
->expects($this->once())
->method('__invoke')
->with($message)
- ->willReturn($expectedReturnedValue = 'Hello')
;
$stopwatch = $this->createMock(Stopwatch::class);
@@ -58,7 +57,7 @@ public function testHandle()
$traced = new TraceableMiddleware($middleware, $stopwatch, $busId);
- $this->assertSame($expectedReturnedValue, $traced->handle($envelope, $next));
+ $traced->handle($envelope, $next);
}
/**
@@ -75,7 +74,7 @@ public function testHandleWithException()
->method('handle')
->with($message, $this->anything())
->will($this->returnCallback(function ($message, callable $next) {
- return $next($message);
+ $next($message);
}))
;
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
index 993a2de81265d..51c32cb10546c 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -23,7 +23,6 @@ public function testItCallsTheHandlerAndNextMiddleware()
$message = new DummyMessage('Hey');
$handler = $this->createPartialMock(\stdClass::class, array('__invoke'));
- $handler->method('__invoke')->willReturn('Hello');
$next = $this->createPartialMock(\stdClass::class, array('__invoke'));
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php
index e662a130fbba9..b3bbad8bdd781 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php
@@ -32,12 +32,9 @@ public function testDebugLogAndNextMiddleware()
->expects($this->once())
->method('__invoke')
->with($message)
- ->willReturn('Hello')
;
- $result = (new LoggingMiddleware($logger))->handle($message, $next);
-
- $this->assertSame('Hello', $result);
+ (new LoggingMiddleware($logger))->handle($message, $next);
}
/**
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
index 27f7da675210c..141da8e9740f6 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
@@ -38,12 +38,9 @@ public function testValidateAndNextMiddleware()
->expects($this->once())
->method('__invoke')
->with($envelope)
- ->willReturn('Hello')
;
- $result = (new ValidationMiddleware($validator))->handle($envelope, $next);
-
- $this->assertSame('Hello', $result);
+ (new ValidationMiddleware($validator))->handle($envelope, $next);
}
public function testValidateWithStampAndNextMiddleware()
@@ -61,12 +58,9 @@ public function testValidateWithStampAndNextMiddleware()
->expects($this->once())
->method('__invoke')
->with($envelope)
- ->willReturn('Hello')
;
- $result = (new ValidationMiddleware($validator))->handle($envelope, $next);
-
- $this->assertSame('Hello', $result);
+ (new ValidationMiddleware($validator))->handle($envelope, $next);
}
/**
diff --git a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
index 8de1ef05208ff..2c3be75f98d67 100644
--- a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
+++ b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
@@ -20,20 +20,18 @@
class TraceableMessageBusTest extends TestCase
{
- public function testItTracesResult()
+ public function testItTracesDispatch()
{
$message = new DummyMessage('Hello');
$bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
- $bus->expects($this->once())->method('dispatch')->with($message)->willReturn($result = array('foo' => 'bar'));
$traceableBus = new TraceableMessageBus($bus);
$line = __LINE__ + 1;
- $this->assertSame($result, $traceableBus->dispatch($message));
+ $this->assertNull($traceableBus->dispatch($message));
$this->assertCount(1, $tracedMessages = $traceableBus->getDispatchedMessages());
$this->assertArraySubset(array(
'message' => $message,
- 'result' => $result,
'stamps' => null,
'caller' => array(
'name' => 'TraceableMessageBusTest.php',
@@ -43,20 +41,18 @@ public function testItTracesResult()
), $tracedMessages[0], true);
}
- public function testItTracesResultWithEnvelope()
+ public function testItTracesDispatchWithEnvelope()
{
$envelope = Envelope::wrap($message = new DummyMessage('Hello'))->with($stamp = new AnEnvelopeStamp());
$bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
- $bus->expects($this->once())->method('dispatch')->with($envelope)->willReturn($result = array('foo' => 'bar'));
$traceableBus = new TraceableMessageBus($bus);
$line = __LINE__ + 1;
- $this->assertSame($result, $traceableBus->dispatch($envelope));
+ $this->assertNull($traceableBus->dispatch($envelope));
$this->assertCount(1, $tracedMessages = $traceableBus->getDispatchedMessages());
$this->assertArraySubset(array(
'message' => $message,
- 'result' => $result,
'stamps' => array($stamp),
'caller' => array(
'name' => 'TraceableMessageBusTest.php',
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
index 61a5466033b26..7ee1730c70a7c 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
@@ -29,7 +29,7 @@
$receiver = new AmqpReceiver($connection, $serializer);
$worker = new Worker($receiver, new class() implements MessageBusInterface {
- public function dispatch($envelope)
+ public function dispatch($envelope): void
{
echo 'Get envelope with message: '.get_class($envelope->getMessage())."\n";
echo sprintf("with stamps: %s\n", json_encode(array_keys($envelope->all()), JSON_PRETTY_PRINT));
diff --git a/src/Symfony/Component/Messenger/TraceableMessageBus.php b/src/Symfony/Component/Messenger/TraceableMessageBus.php
index 3efeaba94558b..68d9d5eb0c249 100644
--- a/src/Symfony/Component/Messenger/TraceableMessageBus.php
+++ b/src/Symfony/Component/Messenger/TraceableMessageBus.php
@@ -27,7 +27,7 @@ public function __construct(MessageBusInterface $decoratedBus)
/**
* {@inheritdoc}
*/
- public function dispatch($message)
+ public function dispatch($message): void
{
$caller = $this->getCaller();
$callTime = microtime(true);
@@ -35,17 +35,14 @@ public function dispatch($message)
$stamps = $message instanceof Envelope ? array_values($message->all()) : null;
try {
- $result = $this->decoratedBus->dispatch($message);
+ $this->decoratedBus->dispatch($message);
$this->dispatchedMessages[] = array(
'stamps' => $stamps,
'message' => $messageToTrace,
- 'result' => $result,
'callTime' => $callTime,
'caller' => $caller,
);
-
- return $result;
} catch (\Throwable $e) {
$this->dispatchedMessages[] = array(
'stamps' => $stamps,