diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php index bf82822443..da09206184 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php @@ -13,7 +13,7 @@ namespace Symfony\Bridge\Doctrine\Messenger; use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManagerInterface; -use Symfony\Component\Messenger\MiddlewareInterface; +use Symfony\Component\Messenger\Middleware\MiddlewareInterface; /** * Wraps all handlers in a single doctrine transaction. diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 84a5e3f7ea..c0ab2cc766 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -971,7 +971,7 @@ class Configuration implements ConfigurationInterface ->arrayNode('messenger') ->info('Messenger configuration') ->{!class_exists(FullStack::class) && interface_exists(MessageBusInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}() - ->fixXmlConfig('adapter') + ->fixXmlConfig('transport') ->fixXmlConfig('bus', 'buses') ->children() ->arrayNode('routing') @@ -1024,7 +1024,7 @@ class Configuration implements ConfigurationInterface ->end() ->scalarNode('encoder')->defaultValue('messenger.transport.serializer')->end() ->scalarNode('decoder')->defaultValue('messenger.transport.serializer')->end() - ->arrayNode('adapters') + ->arrayNode('transports') ->useAttributeAsKey('name') ->arrayPrototype() ->beforeNormalization() diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 757662a298..b25295e0f1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1449,7 +1449,7 @@ class FrameworkExtension extends Extension $loader->load('messenger.xml'); if ($this->isConfigEnabled($container, $config['serializer'])) { - if (\count($config['adapters']) > 0 && !$this->isConfigEnabled($container, $serializerConfig)) { + if (\count($config['transports']) > 0 && !$this->isConfigEnabled($container, $serializerConfig)) { throw new LogicException('Using the default encoder/decoder, Symfony Messenger requires the Serializer. Enable it or install it by running "composer require symfony/serializer-pack".'); } @@ -1505,17 +1505,17 @@ class FrameworkExtension extends Extension $container->getDefinition('messenger.asynchronous.routing.sender_locator')->replaceArgument(1, $messageToSenderIdsMapping); - foreach ($config['adapters'] as $name => $adapter) { + foreach ($config['transports'] as $name => $transport) { $senderDefinition = (new Definition(SenderInterface::class)) - ->setFactory(array(new Reference('messenger.adapter_factory'), 'createSender')) - ->setArguments(array($adapter['dsn'], $adapter['options'])) + ->setFactory(array(new Reference('messenger.transport_factory'), 'createSender')) + ->setArguments(array($transport['dsn'], $transport['options'])) ->addTag('messenger.sender', array('name' => $name)) ; $container->setDefinition('messenger.sender.'.$name, $senderDefinition); $receiverDefinition = (new Definition(ReceiverInterface::class)) - ->setFactory(array(new Reference('messenger.adapter_factory'), 'createReceiver')) - ->setArguments(array($adapter['dsn'], $adapter['options'])) + ->setFactory(array(new Reference('messenger.transport_factory'), 'createReceiver')) + ->setArguments(array($transport['dsn'], $transport['options'])) ->addTag('messenger.receiver', array('name' => $name)) ; $container->setDefinition('messenger.receiver.'.$name, $receiverDefinition); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml index f611a15793..8fc968cc34 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml @@ -8,7 +8,7 @@ - + @@ -60,16 +60,16 @@ - - + + - + %kernel.debug% - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd index 7b57e5d17d..925509ba27 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd @@ -356,7 +356,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -389,11 +389,6 @@ - - - - - diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index b453f9ab51..931edb5908 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -254,7 +254,7 @@ class ConfigurationTest extends TestCase 'messenger' => array( 'enabled' => !class_exists(FullStack::class) && interface_exists(MessageBusInterface::class), 'routing' => array(), - 'adapters' => array(), + 'transports' => array(), 'serializer' => array( 'enabled' => true, 'format' => 'json', diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php index 50bf53dfad..92dc5537b9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php @@ -8,7 +8,7 @@ $container->loadFromExtension('framework', array( 'serializer' => array( 'enabled' => true, ), - 'adapters' => array( + 'transports' => array( 'default' => 'amqp://localhost/%2f/messages', ), ), diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_adapter.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php similarity index 92% rename from src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_adapter.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php index d87bcfc232..3f90bda7f3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_adapter.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'serializer' => true, 'messenger' => array( - 'adapters' => array( + 'transports' => array( 'default' => 'amqp://localhost/%2f/messages', 'customised' => array( 'dsn' => 'amqp://localhost/%2f/messages?exchange_name=exchange_name', diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml index 40db4118a2..ebe6a631f0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml @@ -9,7 +9,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_adapter.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml similarity index 77% rename from src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_adapter.xml rename to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml index aaf9e7f11e..211135570c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_adapter.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml @@ -8,14 +8,14 @@ - - + + Queue - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml index f82d9789d7..524658133a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml @@ -4,5 +4,5 @@ framework: messenger: serializer: enabled: true - adapters: + transports: default: 'amqp://localhost/%2f/messages' diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml similarity index 93% rename from src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml rename to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml index ae2b3b435a..0c38638679 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml @@ -1,7 +1,7 @@ framework: serializer: true messenger: - adapters: + transports: default: 'amqp://localhost/%2f/messages' customised: dsn: 'amqp://localhost/%2f/messages?exchange_name=exchange_name' diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index b39bbca52b..49a87b5869 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -529,9 +529,9 @@ abstract class FrameworkExtensionTest extends TestCase $this->assertTrue($container->has('message_bus')); } - public function testMessengerAdapter() + public function testMessengerTransports() { - $container = $this->createContainerFromFile('messenger_adapter'); + $container = $this->createContainerFromFile('messenger_transports'); $this->assertTrue($container->hasDefinition('messenger.sender.default')); $this->assertTrue($container->getDefinition('messenger.sender.default')->hasTag('messenger.sender')); $this->assertEquals(array(array('name' => 'default')), $container->getDefinition('messenger.sender.default')->getTag('messenger.sender')); @@ -543,7 +543,7 @@ abstract class FrameworkExtensionTest extends TestCase $senderFactory = $container->getDefinition('messenger.sender.customised')->getFactory(); $senderArguments = $container->getDefinition('messenger.sender.customised')->getArguments(); - $this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createSender'), $senderFactory); + $this->assertEquals(array(new Reference('messenger.transport_factory'), 'createSender'), $senderFactory); $this->assertCount(2, $senderArguments); $this->assertSame('amqp://localhost/%2f/messages?exchange_name=exchange_name', $senderArguments[0]); $this->assertSame(array('queue' => array('name' => 'Queue')), $senderArguments[1]); @@ -552,7 +552,7 @@ abstract class FrameworkExtensionTest extends TestCase $receiverFactory = $container->getDefinition('messenger.receiver.customised')->getFactory(); $receiverArguments = $container->getDefinition('messenger.receiver.customised')->getArguments(); - $this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createReceiver'), $receiverFactory); + $this->assertEquals(array(new Reference('messenger.transport_factory'), 'createReceiver'), $receiverFactory); $this->assertCount(2, $receiverArguments); $this->assertSame('amqp://localhost/%2f/messages?exchange_name=exchange_name', $receiverArguments[0]); $this->assertSame(array('queue' => array('name' => 'Queue')), $receiverArguments[1]); diff --git a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php index 198738a28f..eeba363cc8 100644 --- a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Messenger\Asynchronous\Middleware; use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface; use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage; -use Symfony\Component\Messenger\MiddlewareInterface; +use Symfony\Component\Messenger\Middleware\MiddlewareInterface; /** * @author Samuel Roze diff --git a/src/Symfony/Component/Messenger/ContainerHandlerLocator.php b/src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php similarity index 94% rename from src/Symfony/Component/Messenger/ContainerHandlerLocator.php rename to src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php index bf218e68a9..7b45b4eac4 100644 --- a/src/Symfony/Component/Messenger/ContainerHandlerLocator.php +++ b/src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger; +namespace Symfony\Component\Messenger\Handler\Locator; use Psr\Container\ContainerInterface; use Symfony\Component\Messenger\Exception\NoHandlerForMessageException; diff --git a/src/Symfony/Component/Messenger/HandlerLocator.php b/src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php similarity index 94% rename from src/Symfony/Component/Messenger/HandlerLocator.php rename to src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php index 5ad44066a8..76d1a63d32 100644 --- a/src/Symfony/Component/Messenger/HandlerLocator.php +++ b/src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger; +namespace Symfony\Component\Messenger\Handler\Locator; use Symfony\Component\Messenger\Exception\NoHandlerForMessageException; diff --git a/src/Symfony/Component/Messenger/HandlerLocatorInterface.php b/src/Symfony/Component/Messenger/Handler/Locator/HandlerLocatorInterface.php similarity index 92% rename from src/Symfony/Component/Messenger/HandlerLocatorInterface.php rename to src/Symfony/Component/Messenger/Handler/Locator/HandlerLocatorInterface.php index 089acacc32..7d9cce2663 100644 --- a/src/Symfony/Component/Messenger/HandlerLocatorInterface.php +++ b/src/Symfony/Component/Messenger/Handler/Locator/HandlerLocatorInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger; +namespace Symfony\Component\Messenger\Handler\Locator; use Symfony\Component\Messenger\Exception\NoHandlerForMessageException; diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php index e33bc1e71b..ef0eb5b1c4 100644 --- a/src/Symfony/Component/Messenger/MessageBus.php +++ b/src/Symfony/Component/Messenger/MessageBus.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Messenger; +use Symfony\Component\Messenger\Middleware\MiddlewareInterface; + /** * @author Samuel Roze * @author Matthias Noback diff --git a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php index 428fd99231..4d63a8ae6c 100644 --- a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php @@ -11,8 +11,7 @@ namespace Symfony\Component\Messenger\Middleware; -use Symfony\Component\Messenger\MiddlewareInterface; -use Symfony\Component\Messenger\HandlerLocatorInterface; +use Symfony\Component\Messenger\Handler\Locator\HandlerLocatorInterface; /** * @author Samuel Roze diff --git a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php b/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php index 5f4f981c57..4de6e42575 100644 --- a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Messenger\Middleware; use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage; -use Symfony\Component\Messenger\MiddlewareInterface; use Psr\Log\LoggerInterface; /** diff --git a/src/Symfony/Component/Messenger/MiddlewareInterface.php b/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php similarity index 90% rename from src/Symfony/Component/Messenger/MiddlewareInterface.php rename to src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php index 98ae70119c..68fd7f45d3 100644 --- a/src/Symfony/Component/Messenger/MiddlewareInterface.php +++ b/src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger; +namespace Symfony\Component\Messenger\Middleware; /** * @author Samuel Roze diff --git a/src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php b/src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php index a8d4df916a..5f13aa25b4 100644 --- a/src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php +++ b/src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Messenger\Middleware; use Symfony\Component\Messenger\Exception\NoHandlerForMessageException; -use Symfony\Component\Messenger\MiddlewareInterface; /** * @author Samuel Roze diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php index 16b4e534ec..3b168367cd 100644 --- a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Messenger\Middleware; use Symfony\Component\Messenger\Exception\ValidationFailedException; -use Symfony\Component\Messenger\MiddlewareInterface; use Symfony\Component\Validator\Validator\ValidatorInterface; /** diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php index bc52e1f671..4f2636ab10 100644 --- a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php +++ b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php @@ -16,16 +16,16 @@ use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\ServiceLocator; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender; -use Symfony\Component\Messenger\ContainerHandlerLocator; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender; +use Symfony\Component\Messenger\Handler\Locator\ContainerHandlerLocator; use Symfony\Component\Messenger\DataCollector\MessengerDataCollector; use Symfony\Component\Messenger\DependencyInjection\MessengerPass; use Symfony\Component\Messenger\Handler\ChainHandler; use Symfony\Component\Messenger\Handler\MessageSubscriberInterface; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Middleware\TolerateNoHandler; -use Symfony\Component\Messenger\MiddlewareInterface; +use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage; use Symfony\Component\Messenger\Transport\ReceiverInterface; diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php index 786def636a..c78c9ed7c1 100644 --- a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php +++ b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Messenger\Tests; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\MessageBus; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Messenger\MiddlewareInterface; +use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; class MessageBusTest extends TestCase diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php index 4a74a6a069..993a2de812 100644 --- a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php +++ b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Messenger\Tests\Middleware; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\HandlerLocator; +use Symfony\Component\Messenger\Handler\Locator\HandlerLocator; use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php similarity index 94% rename from src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php rename to src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php index a1718af02f..5ce9c457e9 100644 --- a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender; -use Symfony\Component\Messenger\Adapter\AmqpExt\Connection; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender; +use Symfony\Component\Messenger\Transport\AmqpExt\Connection; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Transport\Serialization\Serializer; use Symfony\Component\Process\PhpProcess; diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php similarity index 88% rename from src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpReceiverTest.php rename to src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php index 18df3ac41f..2045764216 100644 --- a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpReceiverTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php @@ -9,12 +9,12 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver; -use Symfony\Component\Messenger\Adapter\AmqpExt\Connection; -use Symfony\Component\Messenger\Adapter\AmqpExt\Exception\RejectMessageExceptionInterface; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver; +use Symfony\Component\Messenger\Transport\AmqpExt\Connection; +use Symfony\Component\Messenger\Transport\AmqpExt\Exception\RejectMessageExceptionInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Transport\Serialization\Serializer; use Symfony\Component\Serializer as SerializerComponent; @@ -51,7 +51,7 @@ class AmqpReceiverTest extends TestCase } /** - * @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\InterruptException + * @expectedException \Symfony\Component\Messenger\Tests\Transport\AmqpExt\InterruptException */ public function testItNonAcknowledgeTheMessageIfAnExceptionHappened() { @@ -77,7 +77,7 @@ class AmqpReceiverTest extends TestCase } /** - * @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\WillNeverWorkException + * @expectedException \Symfony\Component\Messenger\Tests\Transport\AmqpExt\WillNeverWorkException */ public function testItRejectsTheMessageIfTheExceptionIsARejectMessageExceptionInterface() { diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpSenderTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php similarity index 86% rename from src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpSenderTest.php rename to src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php index 169ac97f9c..54859a58ac 100644 --- a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpSenderTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender; -use Symfony\Component\Messenger\Adapter\AmqpExt\Connection; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender; +use Symfony\Component\Messenger\Transport\AmqpExt\Connection; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface; diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php similarity index 97% rename from src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php rename to src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php index 62f6f94974..511f8fe3c4 100644 --- a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpFactory; -use Symfony\Component\Messenger\Adapter\AmqpExt\Connection; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpFactory; +use Symfony\Component\Messenger\Transport\AmqpExt\Connection; /** * @requires extension amqp diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php similarity index 87% rename from src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/Fixtures/long_receiver.php rename to src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php index ac973e4a6c..2115b1a81d 100644 --- a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/Fixtures/long_receiver.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php @@ -12,9 +12,9 @@ if (!file_exists($autoload)) { require_once $autoload; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver; -use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender; -use Symfony\Component\Messenger\Adapter\AmqpExt\Connection; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver; +use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender; +use Symfony\Component\Messenger\Transport\AmqpExt\Connection; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Transport\Serialization\Serializer; use Symfony\Component\Messenger\Worker; diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpFactory.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpFactory.php similarity index 93% rename from src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpFactory.php rename to src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpFactory.php index 8ff8270c20..5cbdbdd086 100644 --- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpFactory.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpFactory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Transport\AmqpExt; class AmqpFactory { diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php similarity index 93% rename from src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php rename to src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php index 89cd6df48f..e61ef03895 100644 --- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Transport\AmqpExt; -use Symfony\Component\Messenger\Adapter\AmqpExt\Exception\RejectMessageExceptionInterface; +use Symfony\Component\Messenger\Transport\AmqpExt\Exception\RejectMessageExceptionInterface; use Symfony\Component\Messenger\Transport\ReceiverInterface; use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface; diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpSender.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php similarity index 94% rename from src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpSender.php rename to src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php index d7711607fc..0c4bb18f31 100644 --- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpSender.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Transport\AmqpExt; use Symfony\Component\Messenger\Transport\SenderInterface; use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface; diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpAdapterFactory.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php similarity index 87% rename from src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpAdapterFactory.php rename to src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php index 1085355bd2..ddb385af52 100644 --- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpAdapterFactory.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Transport\AmqpExt; -use Symfony\Component\Messenger\Adapter\Factory\AdapterFactoryInterface; +use Symfony\Component\Messenger\Transport\Factory\TransportFactoryInterface; use Symfony\Component\Messenger\Transport\ReceiverInterface; use Symfony\Component\Messenger\Transport\SenderInterface; use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface; @@ -20,7 +20,7 @@ use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface; /** * @author Samuel Roze */ -class AmqpAdapterFactory implements AdapterFactoryInterface +class AmqpTransportFactory implements TransportFactoryInterface { private $encoder; private $decoder; diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php similarity index 99% rename from src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php rename to src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php index 1597c017ee..03258d0286 100644 --- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\AmqpExt; +namespace Symfony\Component\Messenger\Transport\AmqpExt; /** * An AMQP connection. diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Exception/RejectMessageExceptionInterface.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Exception/RejectMessageExceptionInterface.php similarity index 91% rename from src/Symfony/Component/Messenger/Adapter/AmqpExt/Exception/RejectMessageExceptionInterface.php rename to src/Symfony/Component/Messenger/Transport/AmqpExt/Exception/RejectMessageExceptionInterface.php index d353eda24a..b2ca5ae230 100644 --- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Exception/RejectMessageExceptionInterface.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/Exception/RejectMessageExceptionInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\AmqpExt\Exception; +namespace Symfony\Component\Messenger\Transport\AmqpExt\Exception; /** * If something goes wrong while consuming and handling a message from the AMQP broker, there are two choices: rejecting diff --git a/src/Symfony/Component/Messenger/Adapter/Factory/ChainAdapterFactory.php b/src/Symfony/Component/Messenger/Transport/Factory/ChainTransportFactory.php similarity index 77% rename from src/Symfony/Component/Messenger/Adapter/Factory/ChainAdapterFactory.php rename to src/Symfony/Component/Messenger/Transport/Factory/ChainTransportFactory.php index 92e2e101b0..779d365dc4 100644 --- a/src/Symfony/Component/Messenger/Adapter/Factory/ChainAdapterFactory.php +++ b/src/Symfony/Component/Messenger/Transport/Factory/ChainTransportFactory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\Factory; +namespace Symfony\Component\Messenger\Transport\Factory; use Symfony\Component\Messenger\Transport\ReceiverInterface; use Symfony\Component\Messenger\Transport\SenderInterface; @@ -17,12 +17,12 @@ use Symfony\Component\Messenger\Transport\SenderInterface; /** * @author Samuel Roze */ -class ChainAdapterFactory implements AdapterFactoryInterface +class ChainTransportFactory implements TransportFactoryInterface { private $factories; /** - * @param iterable|AdapterFactoryInterface[] $factories + * @param iterable|TransportFactoryInterface[] $factories */ public function __construct(iterable $factories) { @@ -37,7 +37,7 @@ class ChainAdapterFactory implements AdapterFactoryInterface } } - throw new \InvalidArgumentException(sprintf('No adapter supports the given DSN "%s".', $dsn)); + throw new \InvalidArgumentException(sprintf('No transport supports the given DSN "%s".', $dsn)); } public function createSender(string $dsn, array $options): SenderInterface @@ -48,7 +48,7 @@ class ChainAdapterFactory implements AdapterFactoryInterface } } - throw new \InvalidArgumentException(sprintf('No adapter supports the given DSN "%s".', $dsn)); + throw new \InvalidArgumentException(sprintf('No transport supports the given DSN "%s".', $dsn)); } public function supports(string $dsn, array $options): bool diff --git a/src/Symfony/Component/Messenger/Adapter/Factory/AdapterFactoryInterface.php b/src/Symfony/Component/Messenger/Transport/Factory/TransportFactoryInterface.php similarity index 83% rename from src/Symfony/Component/Messenger/Adapter/Factory/AdapterFactoryInterface.php rename to src/Symfony/Component/Messenger/Transport/Factory/TransportFactoryInterface.php index 766e86088d..071138e53a 100644 --- a/src/Symfony/Component/Messenger/Adapter/Factory/AdapterFactoryInterface.php +++ b/src/Symfony/Component/Messenger/Transport/Factory/TransportFactoryInterface.php @@ -9,17 +9,17 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Messenger\Adapter\Factory; +namespace Symfony\Component\Messenger\Transport\Factory; use Symfony\Component\Messenger\Transport\ReceiverInterface; use Symfony\Component\Messenger\Transport\SenderInterface; /** - * Creates a Messenger adapter. + * Creates a Messenger transport. * * @author Samuel Roze */ -interface AdapterFactoryInterface +interface TransportFactoryInterface { public function createReceiver(string $dsn, array $options): ReceiverInterface; diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/DecoderInterface.php b/src/Symfony/Component/Messenger/Transport/Serialization/DecoderInterface.php index 0099356aa3..a232dfbf10 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/DecoderInterface.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/DecoderInterface.php @@ -22,7 +22,7 @@ interface DecoderInterface * Decodes the message from an encoded-form. * * The `$encodedMessage` parameter is a key-value array that - * describes the message, that will be used by the different adapters. + * describes the message, that will be used by the different transports. * * The most common keys are: * - `body` (string) - the message body diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/EncoderInterface.php b/src/Symfony/Component/Messenger/Transport/Serialization/EncoderInterface.php index cdc4a75e93..658b9e5b5e 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/EncoderInterface.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/EncoderInterface.php @@ -19,7 +19,7 @@ namespace Symfony\Component\Messenger\Transport\Serialization; interface EncoderInterface { /** - * Encodes a message to a common format understandable by adapters. The encoded array should only + * Encodes a message to a common format understandable by transports. The encoded array should only * contain scalar and arrays. * * The most common keys of the encoded array are: diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index 9c600d282a..1767f4dab9 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -29,7 +29,7 @@ "symfony/var-dumper": "~3.4|~4.0" }, "suggest": { - "sroze/enqueue-bridge": "For using the php-enqueue library as an adapter." + "sroze/enqueue-bridge": "For using the php-enqueue library as a transport." }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\": "" },