Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit76b17b0

Browse files
committed
Revert "feature#26945 [Messenger] Support configuring messages when dispatching (ogizanagi)"
This reverts commite7a0b80, reversingchanges made to388d684.
1 parente7a0b80 commit76b17b0

File tree

36 files changed

+125
-648
lines changed

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
useSymfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
1515
useSymfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
16-
useSymfony\Component\Messenger\Envelope;
17-
useSymfony\Component\Messenger\EnvelopeAwareInterface;
1816
useSymfony\Component\Messenger\Middleware\MiddlewareInterface;
1917

2018
/**
2119
* @author Samuel Roze <samuel.roze@gmail.com>
2220
*/
23-
class SendMessageMiddlewareimplements MiddlewareInterface, EnvelopeAwareInterface
21+
class SendMessageMiddlewareimplements MiddlewareInterface
2422
{
2523
private$senderLocator;
2624

@@ -34,19 +32,17 @@ public function __construct(SenderLocatorInterface $senderLocator)
3432
*/
3533
publicfunctionhandle($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 ($messageinstanceof 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 ($sendersas$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
namespaceSymfony\Component\Messenger\Asynchronous\Transport;
1313

1414
useSymfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware;
15-
useSymfony\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 <samuel.roze@gmail.com>
2523
*/
26-
finalclass ReceivedMessageimplements EnvelopeItemInterface
24+
finalclass ReceivedMessage
2725
{
28-
publicfunctionserialize()
26+
private$message;
27+
28+
publicfunction__construct($message)
2929
{
30-
return'';
30+
$this->message =$message;
3131
}
3232

33-
publicfunctionunserialize($serialized)
33+
publicfunctiongetMessage()
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
namespaceSymfony\Component\Messenger\Asynchronous\Transport;
1313

14-
useSymfony\Component\Messenger\Envelope;
1514
useSymfony\Component\Messenger\Transport\ReceiverInterface;
1615

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

2928
publicfunctionreceive(callable$handler):void
3029
{
31-
$this->decoratedReceiver->receive(function (?Envelope$envelope)use ($handler) {
32-
if (null !==$envelope) {
33-
$envelope =$envelope->with(newReceivedMessage());
30+
$this->decoratedReceiver->receive(function ($message)use ($handler) {
31+
if (null !==$message) {
32+
$message =newReceivedMessage($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
returnfunction ($message)use ($middleware,$index) {
58-
$message = Envelope::wrap($message);
59-
if (!$middlewareinstanceof 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
namespaceSymfony\Component\Messenger\Middleware;
1313

14+
useSymfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
1415
usePsr\Log\LoggerInterface;
1516

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

5152
privatefunctioncreateContext($message):array
5253
{
54+
if ($messageinstanceof ReceivedMessage) {
55+
$message =$message->getMessage();
56+
}
57+
5358
returnarray(
5459
'message' =>$message,
5560
'class' =>\get_class($message),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp