Skip to content

Commit 347eb2f

Browse files
srozesroze
committed
Rename the component from "Message" to "Messenger"
1 parent 1b4be4e commit 347eb2f

37 files changed

+137
-136
lines changed

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"symfony/intl": "self.version",
5656
"symfony/ldap": "self.version",
5757
"symfony/lock": "self.version",
58+
"symfony/messenger": "self.version",
5859
"symfony/monolog-bridge": "self.version",
5960
"symfony/options-resolver": "self.version",
6061
"symfony/process": "self.version",

‎src/Symfony/Bundle/FrameworkBundle/Command/MessageConsumeCommand.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
use Symfony\Component\Console\Input\InputInterface;
1818
use Symfony\Component\Console\Input\InputOption;
1919
use Symfony\Component\Console\Output\OutputInterface;
20-
use Symfony\Component\Message\MessageBusInterface;
21-
use Symfony\Component\Message\Transport\Enhancers\MaximumCountReceiver;
22-
use Symfony\Component\Message\Transport\ReceiverInterface;
23-
use Symfony\Component\Message\Worker;
20+
use Symfony\Component\Messenger\MessageBusInterface;
21+
use Symfony\Component\Messenger\Transport\Enhancers\MaximumCountReceiver;
22+
use Symfony\Component\Messenger\Transport\ReceiverInterface;
23+
use Symfony\Component\Messenger\Worker;
2424

2525
/**
2626
* @author Samuel Roze <samuel.roze@gmail.com>

‎src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\HttpFoundation\RequestStack;
1919
use Symfony\Component\HttpFoundation\Session\SessionInterface;
2020
use Symfony\Component\HttpKernel\HttpKernelInterface;
21-
use Symfony\Component\Message\MessageBusInterface;
21+
use Symfony\Component\Messenger\MessageBusInterface;
2222
use Symfony\Component\Routing\RouterInterface;
2323
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
2424
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;

‎src/Symfony/Bundle/FrameworkBundle/DataCollector/MessagesDataCollector.php‎ renamed to ‎src/Symfony/Bundle/FrameworkBundle/DataCollector/MessengerDataCollector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\HttpFoundation\Response;
1616
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
17-
use Symfony\Component\Message\MiddlewareInterface;
17+
use Symfony\Component\Messenger\MiddlewareInterface;
1818

1919
/**
2020
* @author Samuel Roze <samuel.roze@gmail.com>
2121
*/
22-
class MessagesDataCollector extends DataCollector implements MiddlewareInterface
22+
class MessengerDataCollector extends DataCollector implements MiddlewareInterface
2323
{
2424
/**
2525
* {@inheritdoc}

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Lock\Lock;
2323
use Symfony\Component\Lock\Store\SemaphoreStore;
2424
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
25-
use Symfony\Component\Message\MessageBusInterface;
25+
use Symfony\Component\Messenger\MessageBusInterface;
2626
use Symfony\Component\Serializer\Serializer;
2727
use Symfony\Component\Translation\Translator;
2828
use Symfony\Component\Validator\Validation;

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
use Symfony\Component\Lock\LockInterface;
6060
use Symfony\Component\Lock\Store\StoreFactory;
6161
use Symfony\Component\Lock\StoreInterface;
62-
use Symfony\Component\Message\Transport\ReceiverInterface;
63-
use Symfony\Component\Message\Transport\SenderInterface;
62+
use Symfony\Component\Messenger\Transport\ReceiverInterface;
63+
use Symfony\Component\Messenger\Transport\SenderInterface;
6464
use Symfony\Component\PropertyAccess\PropertyAccessor;
6565
use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
6666
use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
@@ -268,10 +268,10 @@ public function load(array $configs, ContainerBuilder $container)
268268
$this->registerLockConfiguration($config['lock'], $container, $loader);
269269
}
270270

271-
if ($this->isConfigEnabled($container, $config['message'])) {
272-
$this->registerMessageConfiguration($config['message'], $container, $loader);
271+
if ($this->isConfigEnabled($container, $config['messenger'])) {
272+
$this->registerMessengerConfiguration($config['messenger'], $container, $loader);
273273
} else {
274-
$container->removeDefinition('console.command.message_consume');
274+
$container->removeDefinition('console.command.messenger_consume');
275275
}
276276

277277
if ($this->isConfigEnabled($container, $config['web_link'])) {
@@ -1386,9 +1386,9 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
13861386
}
13871387
}
13881388

1389-
private function registerMessageConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
1389+
private function registerMessengerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
13901390
{
1391-
$loader->load('message.xml');
1391+
$loader->load('messenger.xml');
13921392

13931393
$senderLocatorMapping = array();
13941394
$messageToSenderIdsMapping = array();
@@ -1402,8 +1402,8 @@ private function registerMessageConfiguration(array $config, ContainerBuilder $c
14021402
$messageToSenderIdsMapping[$message] = $messageConfiguration['senders'];
14031403
}
14041404

1405-
$container->getDefinition('message.sender_locator')->replaceArgument(0, $senderLocatorMapping);
1406-
$container->getDefinition('message.asynchronous.routing.sender_locator')->replaceArgument(1, $messageToSenderIdsMapping);
1405+
$container->getDefinition('messenger.sender_locator')->replaceArgument(0, $senderLocatorMapping);
1406+
$container->getDefinition('messenger.asynchronous.routing.sender_locator')->replaceArgument(1, $messageToSenderIdsMapping);
14071407
}
14081408

14091409
private function registerCacheConfiguration(array $config, ContainerBuilder $container)

‎src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
3535
use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
3636
use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
37-
use Symfony\Component\Message\DependencyInjection\MessagePass;
37+
use Symfony\Component\Messenger\DependencyInjection\MessagePass;
3838
use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
3939
use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
4040
use Symfony\Component\Serializer\DependencyInjection\SerializerPass;

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/message.xml‎

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

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<services>
8+
<defaults public="false" />
9+
10+
<!-- Bus -->
11+
<service id="message_bus" class="Symfony\Component\Messenger\MessageBus" public="true">
12+
<argument type="tagged" tag="message_middleware" /> <!-- Middlewares -->
13+
</service>
14+
15+
<service id="Symfony\Component\Messenger\MessageBusInterface" alias="message_bus" />
16+
17+
<!-- Handlers -->
18+
<service id="messenger.handler_resolver" class="Symfony\Component\Messenger\ContainerHandlerLocator">
19+
<argument type="service" id="service_container"/>
20+
</service>
21+
22+
<service id="messenger.middleware.call_message_handler" class="Symfony\Component\Messenger\Middleware\HandleMessageMiddleware">
23+
<argument type="service" id="messenger.handler_resolver" />
24+
25+
<tag name="message_middleware" priority="-10" />
26+
</service>
27+
28+
<!-- Asynchronous -->
29+
<service id="messenger.asynchronous.routing.sender_locator" class="Symfony\Component\Messenger\Asynchronous\Routing\SenderLocator">
30+
<argument type="service" id="messenger.sender_locator" />
31+
<argument /> <!-- Message to sender ID mapping -->
32+
</service>
33+
<service id="messenger.asynchronous.middleware.send_message_to_producer" class="Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware">
34+
<argument type="service" id="message.asynchronous.routing.sender_locator" />
35+
36+
<tag name="message_middleware" priority="-5" />
37+
</service>
38+
39+
<!-- Message encoding/decoding -->
40+
<service id="messenger.transport.serialize_message_with_type_in_headers" class="Symfony\Component\Messenger\Transport\Serialization\Serializer">
41+
<argument type="service" id="serializer" />
42+
</service>
43+
44+
<service id="messenger.transport.default_encoder" alias="messenger.transport.serialize_message_with_type_in_headers" public="true" />
45+
<service id="messenger.transport.default_decoder" alias="messenger.transport.serialize_message_with_type_in_headers" public="true" />
46+
47+
<!-- Logging & Debug -->
48+
<service id="messenger.middleware.debug.logging" class="Symfony\Component\Messenger\Debug\LoggingMiddleware">
49+
<argument type="service" id="logger" />
50+
51+
<tag name="message_middleware" priority="10" />
52+
<tag name="monolog.logger" channel="messenger" />
53+
</service>
54+
55+
<service id="data_collector.messenger" class="Symfony\Bundle\FrameworkBundle\DataCollector\MessengerDataCollector">
56+
<tag name="data_collector" template="@WebProfiler/Collector/messages.html.twig" id="messenger" priority="100" />
57+
<tag name="message_middleware" />
58+
</service>
59+
60+
<!-- Discovery -->
61+
<service id="messenger.receiver_locator">
62+
<tag name="container.service_locator" />
63+
<argument type="collection" />
64+
</service>
65+
<service id="messenger.sender_locator">
66+
<tag name="container.service_locator" />
67+
<argument type="collection" />
68+
</service>
69+
</services>
70+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
1818
use Symfony\Component\Config\Definition\Processor;
1919
use Symfony\Component\Lock\Store\SemaphoreStore;
20-
use Symfony\Component\Message\MessageBusInterface;
20+
use Symfony\Component\Messenger\MessageBusInterface;
2121

2222
class ConfigurationTest extends TestCase
2323
{

0 commit comments

Comments
 (0)