8000 [Messenger] make middlewares truly lazy on a bus · symfony/symfony@b1539b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit b1539b6

Browse files
nicolas-grekasnicolas-grekas
committed
[Messenger] make middlewares truly lazy on a bus
1 parent dd432c4 commit b1539b6

File tree

3 files changed

+50
-39
lines changed

3 files changed

+50
-39
lines changed

‎src/Symfony/Component/Messenger/MessageBus.php

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,29 @@
1111

1212
namespace Symfony\Component\Messenger;
1313

14-
use Symfony\Component\Messenger\Exception\InvalidArgumentException;
1514
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1615

1716
/**
1817
* @author Samuel Roze <samuel.roze@gmail.com>
1918
* @author Matthias Noback <matthiasnoback@gmail.com>
19+
* @author Nicolas Grekas <p@tchwork.com>
2020
*/
2121
class MessageBus implements MessageBusInterface
2222
{
23-
private $middlewareHandlers;
24-
25-
/**
26-
* @var MiddlewareInterface[]|null
27-
*/
28-
private $indexedMiddlewareHandlers;
23+
private $middlewareAggregate;
2924

3025
/**
3126
* @param MiddlewareInterface[]|iterable $middlewareHandlers
3227
*/
3328
public function __construct(iterable $middlewareHandlers = array())
3429
{
35-
$this->middlewareHandlers = $middlewareHandlers;
30+
if ($middlewareHandlers instanceof \IteratorAggregate) {
31+
$this->middlewareAggregate = $middlewareHandlers;
32+
} elseif (\is_array($middlewareHandlers)) {
33+
$this->middlewareAggregate = new \ArrayObject($middlewareHandlers);
34+
} else {
35+
$this->middlewareAggregate = $middlewareHandlers;
36+
}
3637
}
3738

3839
/**
@@ -41,37 +42,47 @@ public function __construct(iterable $middlewareHandlers = array())
4142
public function dispatch($message)
4243
{
4344
if (!\is_object($message)) {
44-
throw new InvalidArgumentException(sprintf('Invalid type for message argument. Expected object, but got "%s".', \gettype($message)));
45+
throw new \TypeError(sprintf('Invalid argument provided to "%s()": expected object, but got %s.', __METHOD__, \gettype($message)));
4546
}
4647

47-
return \call_user_func($this->callableForNextMiddleware(0, Envelope::wrap($message)), $message);
48-
}
49-
50-
private function callableForNextMiddleware(int $index, Envelope $currentEnvelope): callable
51-
{
52-
if (null === $this->indexedMiddlewareHandlers) {
53-
$this->indexedMiddlewareHandlers = \is_array($this->middlewareHandlers) ? array_values($this->middlewareHandlers) : iterator_to_array($this->middlewareHandlers, false);
48+
if (!$this->middlewareAggregate instanceof \IteratorAggregate) {
49+
$this->middlewareAggregate = new \ArrayObject(iterator_to_array($this->middlewareAggregate, false));
5450
}
5551

56-
if (!isset($this->indexedMiddlewareHandlers[$index])) {
57-
return function () {};
52+
$middlewareIterator = $this->middlewareAggregate->getIterator();
53+
while ($middlewareIterator instanceof \IteratorAggregate) {
54+
$middlewareIterator = $middlewareIterator->getIterator();
5855
}
5956

60-
$middleware = $this->indexedMiddlewareHandlers[$index];
57+
foreach ($middlewareIterator as $middleware) {
58+
$currentEnvelope = Envelope::wrap($message);
6159

62-
return function ($message) use ($middleware, $index, $currentEnvelope) {
63-
if ($message instanceof Envelope) {
64-
$currentEnvelope = $message;
65-
} else {
66-
$message = $currentEnvelope->withMessage($message);
67-
}
60+
// Do not provide the envelope if the middleware cannot read it:
61+
$message = $middleware instanceof EnvelopeAwareInterface ? $currentEnvelope : $currentEnvelope->getMessage();
6862

69-
if (!$middleware instanceof EnvelopeAwareInterface) {
70-
// Do not provide the envelope if the middleware cannot read it:
71-
$message = $message->getMessage();
72-
}
63+
$next = static function ($message) use ($middlewareIterator, &$currentEnvelope, &$next) {
64+
$middlewareIterator->next();
7365

74-
return $middleware->handle($message, $this->callableForNextMiddleware($index + 1, $currentEnvelope));
75-
};
66+
if (!$middlewareIterator->valid()) {
67+
return;
68+
}
69+
70+
$middleware = $middlewareIterator->current();
71+
72+
if ($message instanceof Envelope) {
73+
$currentEnvelope = $message;
74+
} else {
75+
$message = $currentEnvelope->withMessage($message);
76+
}
77+
78+
if (!$middleware instanceof EnvelopeAwareInterface) {
79+
$message = $message->getMessage();
80+
}
81+
82+
return $middleware->handle($message, $next);
83+
};
84+
85+
return $middleware->handle($message, $next);
86+
}
7687
}
7788
}

‎src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ public function testProcessHandlersByBus()
9090
->setAbstract(true)
9191
;
9292

93-
$middlewares = array(array('id' => 'call_message_handler'));
93+
$middlewareHandlers = array(array('id' => 'call_message_handler'));
9494

95-
$container->setParameter($commandBusId.'.middleware', $middlewares);
96-
$container->setParameter($queryBusId.'.middleware', $middlewares);
95+
$container->setParameter($commandBusId.'.middleware', $middlewareHandlers);
96+
$container->setParameter($queryBusId.'.middleware', $middlewareHandlers);
9797

9898
$container->register(DummyCommandHandler::class)->addTag('messenger.message_handler', array('bus' => $commandBusId));
9999
$container->register(DummyQueryHandler::class)->addTag('messenger.message_handler', array('bus' => $queryBusId));
@@ -607,10 +607,10 @@ public function testItRegistersTheDebugCommand()
607607

608608
$container->register('console.command.messenger_debug', DebugCommand::class)->addArgument(array());
609609

610-
$middlewares = array(array('id' => 'call_message_handler'));
610+
$middlewareHandlers = array(array('id' => 'call_message_handler'));
611611

612-
$container->setParameter($commandBusId.'.middleware', $middlewares);
613-
$container->setParameter($queryBusId.'.middleware', $middlewares);
612+
$container->setParameter($commandBusId.'.middleware', $middlewareHandlers);
613+
$container->setParameter($queryBusId.'.middleware', $middlewareHandlers);
614614

615615
$container->register(DummyCommandHandler::class)->addTag('messenger.message_handler', array('bus' => $commandBusId));
616616
$container->register(DummyQueryHandler::class)->addTag('messenger.message_handler', array('bus' => $queryBusId));

‎src/Symfony/Component/Messenger/Tests/MessageBusTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public function testItHasTheRightInterface()
3131
}
3232

3333
/**
34-
* @expectedException \Symfony\Component\Messenger\Exception\InvalidArgumentException
35-
* @expectedExceptionMessage Invalid type for message argument. Expected object, but got "string".
34+
* @expectedException \TypeError
35+
* @expectedExceptionMessage Invalid argument provided to "Symfony\Component\Messenger\MessageBus::dispatch()": expected object, but got string.
3636
*/
3737
public function testItDispatchInvalidMessageType()
3838
{

0 commit comments

Comments
 (0)
0