Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 76b17b0

Browse files
srozesroze
committed
Revert "feature #26945 [Messenger] Support configuring messages when dispatching (ogizanagi)"
This reverts commit e7a0b80, reversing changes made to 388d684.
1 parent e7a0b80 commit 76b17b0

36 files changed

+125
-648
lines changed

‎src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313

1414
use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
1515
use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
16-
use Symfony\Component\Messenger\Envelope;
17-
use Symfony\Component\Messenger\EnvelopeAwareInterface;
1816
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1917

2018
/**
2119
* @author Samuel Roze <[email protected]>
2220
*/
23-
class SendMessageMiddleware implements MiddlewareInterface, EnvelopeAwareInterface
21+
class SendMessageMiddleware implements MiddlewareInterface
2422
{
2523
private $senderLocator;
2624

@@ -34,19 +32,17 @@ public function __construct(SenderLocatorInterface $senderLocator)
3432
*/
3533
public function handle($message, callable $next)
3634
{
37-
$envelope = Envelope::wrap($message);
38-
if ($envelope->get(ReceivedMessage::class)) {
39-
// It's a received message. Do not send it back:
40-
return $next($message);
35+
if ($message instanceof ReceivedMessage) {
36+
return $next($message->getMessage());
4137
}
4238

43-
if (!empty($senders = $this->senderLocator->getSendersForMessage($envelope->getMessage()))) {
39+
if (!empty($senders = $this->senderLocator->getSendersForMessage($message))) {
4440
foreach ($senders as $sender) {
4541
if (null === $sender) {
4642
continue;
4743
}
4844

49-
$sender->send($envelope);
45+
$sender->send($message);
5046
}
5147

5248
if (!\in_array(null, $senders, true)) {

‎src/Symfony/Component/Messenger/Asynchronous/Transport/ReceivedMessage.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
namespace Symfony\Component\Messenger\Asynchronous\Transport;
1313

1414
use Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware;
15-
use Symfony\Component\Messenger\EnvelopeItemInterface;
1615

1716
/**
18-
* Marker config for a received message.
19-
* This is mainly used by the `SendMessageMiddleware` middleware to identify
17+
* Wraps a received message. This is mainly used by the `SendMessageMiddleware` middleware to identify
2018
* a message should not be sent if it was just received.
2119
*
2220
* @see SendMessageMiddleware
2321
*
2422
* @author Samuel Roze <[email protected]>
2523
*/
26-
final class ReceivedMessage implements EnvelopeItemInterface
24+
final class ReceivedMessage
2725
{
28-
public function serialize()
26+
private $message;
27+
28+
public function __construct($message)
2929
{
30-
return '';
30+
$this->message = $message;
3131
}
3232

33-
public function unserialize($serialized)
33+
public function getMessage()
3434
{
35-
// noop
35+
return $this->message;
3636
}
3737
}

‎src/Symfony/Component/Messenger/Asynchronous/Transport/WrapIntoReceivedMessage.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Messenger\Asynchronous\Transport;
1313

14-
use Symfony\Component\Messenger\Envelope;
1514
use Symfony\Component\Messenger\Transport\ReceiverInterface;
1615

1716
/**
@@ -28,12 +27,12 @@ public function __construct(ReceiverInterface $decoratedConsumer)
2827

2928
public function receive(callable $handler): void
3029
{
31-
$this->decoratedReceiver->receive(function (?Envelope $envelope) use ($handler) {
32-
if (null !== $envelope) {
33-
$envelope = $envelope->with(new ReceivedMessage());
30+
$this->decoratedReceiver->receive(function ($message) use ($handler) {
31+
if (null !== $message) {
32+
$message = new ReceivedMessage($message);
3433
}
3534

36-
$handler($envelope);
35+
$handler($message);
3736
});
3837
}
3938

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

Lines changed: 0 additions & 80 deletions
This file was deleted.

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ private function callableForNextMiddleware(int $index): callable
5555
$middleware = $this->indexedMiddlewareHandlers[$index];
5656

5757
return function ($message) use ($middleware, $index) {
58-
$message = Envelope::wrap($message);
59-
if (!$middleware instanceof EnvelopeAwareInterface) {
60-
// Do not provide the envelope if the middleware cannot read it:
61-
$message = $message->getMessage();
62-
}
63-
6458
return $middleware->handle($message, $this->callableForNextMiddleware($index + 1));
6559
};
6660
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface MessageBusInterface
2323
*
2424
* The bus can return a value coming from handlers, but is not required to do so.
2525
*
26-
* @param object|Envelope $message The message or the message pre-wrapped in an envelope
26+
* @param object $message
2727
*
2828
* @return mixed
2929
*/

‎src/Symfony/Component/Messenger/Middleware/Configuration/ValidationConfiguration.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Messenger\Middleware;
1313

14+
use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
1415
use Psr\Log\LoggerInterface;
1516

1617
/**
@@ -50,6 +51,10 @@ public function handle($message, callable $next)
5051

5152
private function createContext($message): array
5253
{
54+
if ($message instanceof ReceivedMessage) {
55+
$message = $message->getMessage();
56+
}
57+
5358
return array(
5459
'message' => $message,
5560
'class' => \get_class($message),

‎src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@
1111

1212
namespace Symfony\Component\Messenger\Middleware;
1313

14-
use Symfony\Component\Messenger\Envelope;
15-
use Symfony\Component\Messenger\EnvelopeAwareInterface;
1614
use Symfony\Component\Messenger\Exception\ValidationFailedException;
17-
use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
1815
use Symfony\Component\Validator\Validator\ValidatorInterface;
1916

2017
/**
2118
* @author Tobias Nyholm <[email protected]>
2219
*/
23-
class ValidationMiddleware implements MiddlewareInterface, EnvelopeAwareInterface
20+
class ValidationMiddleware implements MiddlewareInterface
2421
{
2522
private $validator;
2623

@@ -31,17 +28,9 @@ public function __construct(ValidatorInterface $validator)
3128

3229
public function handle($message, callable $next)
3330
{
34-
$envelope = Envelope::wrap($message);
35-
$subject = $envelope->getMessage();
36-
$groups = null;
37-
/** @var ValidationConfiguration|null $validationConfig */
38-
if ($validationConfig = $envelope->get(ValidationConfiguration::class)) {
39-
$groups = $validationConfig->getGroups();
40-
}
41-
42-
$violations = $this->validator->validate($subject, null, $groups);
31+
$violations = $this->validator->validate($message);
4332
if (\count($violations)) {
44-
throw new ValidationFailedException($subject, $violations);
33+
throw new ValidationFailedException($message, $violations);
4534
}
4635

4736
return $next($message);

0 commit comments

Comments
 (0)