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
Appearance settings

Commit 47da23c

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
minor #27129 [Messenger] Rename Adapters to Transports (sroze)
This PR was squashed before being merged into the 4.1-dev branch (closes #27129). Discussion ---------- [Messenger] Rename Adapters to Transports | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ø | License | MIT | Doc PR | ø Last of our tasks on the "plan to beta", renaming "adapters" to "transports". This is a term that makes more sense and is commonly used within the "queue community". Commits ------- 13b7475 [Messenger] Rename Adapters to Transports
2 parents 926f240 + 13b7475 commit 47da23c
Copy full SHA for 47da23c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

42 files changed

+82
-89
lines changed

‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Doctrine\Common\Persistence\ManagerRegistry;
1515
use Doctrine\ORM\EntityManagerInterface;
16-
use Symfony\Component\Messenger\MiddlewareInterface;
16+
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1717

1818
/**
1919
* Wraps all handlers in a single doctrine transaction.

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ private function addMessengerSection(ArrayNodeDefinition $rootNode)
971971
->arrayNode('messenger')
972972
->info('Messenger configuration')
973973
->{!class_exists(FullStack::class) && interface_exists(MessageBusInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
974-
->fixXmlConfig('adapter')
974+
->fixXmlConfig('transport')
975975
->fixXmlConfig('bus', 'buses')
976976
->children()
977977
->arrayNode('routing')
@@ -1024,7 +1024,7 @@ function ($a) {
10241024
->end()
10251025
->scalarNode('encoder')->defaultValue('messenger.transport.serializer')->end()
10261026
->scalarNode('decoder')->defaultValue('messenger.transport.serializer')->end()
1027-
->arrayNode('adapters')
1027+
->arrayNode('transports')
10281028
->useAttributeAsKey('name')
10291029
->arrayPrototype()
10301030
->beforeNormalization()

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
14491449
$loader->load('messenger.xml');
14501450

14511451
if ($this->isConfigEnabled($container, $config['serializer'])) {
1452-
if (\count($config['adapters']) > 0 && !$this->isConfigEnabled($container, $serializerConfig)) {
1452+
if (\count($config['transports']) > 0 && !$this->isConfigEnabled($container, $serializerConfig)) {
14531453
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".');
14541454
}
14551455

@@ -1505,17 +1505,17 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
15051505

15061506
$container->getDefinition('messenger.asynchronous.routing.sender_locator')->replaceArgument(1, $messageToSenderIdsMapping);
15071507

1508-
foreach ($config['adapters'] as $name => $adapter) {
1508+
foreach ($config['transports'] as $name => $transport) {
15091509
$senderDefinition = (new Definition(SenderInterface::class))
1510-
->setFactory(array(new Reference('messenger.adapter_factory'), 'createSender'))
1511-
->setArguments(array($adapter['dsn'], $adapter['options']))
1510+
->setFactory(array(new Reference('messenger.transport_factory'), 'createSender'))
1511+
->setArguments(array($transport['dsn'], $transport['options']))
15121512
->addTag('messenger.sender', array('name' => $name))
15131513
;
15141514
$container->setDefinition('messenger.sender.'.$name, $senderDefinition);
15151515

15161516
$receiverDefinition = (new Definition(ReceiverInterface::class))
1517-
->setFactory(array(new Reference('messenger.adapter_factory'), 'createReceiver'))
1518-
->setArguments(array($adapter['dsn'], $adapter['options']))
1517+
->setFactory(array(new Reference('messenger.transport_factory'), 'createReceiver'))
1518+
->setArguments(array($transport['dsn'], $transport['options']))
15191519
->addTag('messenger.receiver', array('name' => $name))
15201520
;
15211521
$container->setDefinition('messenger.receiver.'.$name, $receiverDefinition);

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<defaults public="false" />
99

1010
<!-- Handlers -->
11-
<service id="messenger.handler_resolver" class="Symfony\Component\Messenger\ContainerHandlerLocator">
11+
<service id="messenger.handler_resolver" class="Symfony\Component\Messenger\Handler\Locator\ContainerHandlerLocator">
1212
<argument type="service" id="service_container"/>
1313
</service>
1414

@@ -60,16 +60,16 @@
6060
</service>
6161

6262
<!-- Adapters -->
63-
<service id="messenger.adapter_factory" class="Symfony\Component\Messenger\Adapter\Factory\ChainAdapterFactory">
64-
<argument type="tagged" tag="messenger.adapter_factory" />
63+
<service id="messenger.transport_factory" class="Symfony\Component\Messenger\Transport\Factory\ChainTransportFactory">
64+
<argument type="tagged" tag="messenger.transport_factory" />
6565
</service>
6666

67-
<service id="messenger.adapter.amqp.factory" class="Symfony\Component\Messenger\Adapter\AmqpExt\AmqpAdapterFactory">
67+
<service id="messenger.adapter.amqp.factory" class="Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory">
6868
<argument type="service" id="messenger.transport.encoder" />
6969
<argument type="service" id="messenger.transport.decoder" />
7070
<argument>%kernel.debug%</argument>
7171

72-
<tag name="messenger.adapter_factory" />
72+
<tag name="messenger.transport_factory" />
7373
</service>
7474
</services>
7575
</container>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+2-7Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
<xsd:element name="encoder" type="xsd:string" minOccurs="0" />
357357
<xsd:element name="decoder" type="xsd:string" minOccurs="0" />
358358
<xsd:element name="routing" type="messenger_routing" minOccurs="0" maxOccurs="unbounded" />
359-
<xsd:element name="adapter" type="messenger_adapter" minOccurs="0" maxOccurs="unbounded" />
359+
<xsd:element name="transport" type="messenger_transport" minOccurs="0" maxOccurs="unbounded" />
360360
<xsd:element name="bus" type="messenger_bus" minOccurs="0" maxOccurs="unbounded" />
361361
</xsd:sequence>
362362
<xsd:attribute name="default-bus" type="xsd:string" />
@@ -381,19 +381,14 @@
381381
<xsd:attribute name="service" type="xsd:string" use="required"/>
382382
</xsd:complexType>
383383

384-
<xsd:complexType name="messenger_adapter">
384+
<xsd:complexType name="messenger_transport">
385385
<xsd:sequence>
386386
<xsd:element name="options" type="metadata" minOccurs="0" maxOccurs="unbounded" />
387387
</xsd:sequence>
388388
<xsd:attribute name="name" type="xsd:string" />
389389
<xsd:attribute name="dsn" type="xsd:string" />
390390
</xsd:complexType>
391391

392-
<xsd:complexType name="messenger_adapter_option">
393-
<xsd:attribute name="name" type="xsd:string" />
394-
<xsd:attribute name="value" type="xsd:string" />
395-
</xsd:complexType>
396-
397392
<xsd:complexType name="messenger_bus">
398393
<xsd:sequence>
399394
<xsd:element name="middleware" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
254254
'messenger' => array(
255255
'enabled' => !class_exists(FullStack::class) && interface_exists(MessageBusInterface::class),
256256
'routing' => array(),
257-
'adapters' => array(),
257+
'transports' => array(),
258258
'serializer' => array(
259259
'enabled' => true,
260260
'format' => 'json',

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport_no_serializer.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'serializer' => array(
99
'enabled' => true,
1010
),
11-
'adapters' => array(
11+
'transports' => array(
1212
'default' => 'amqp://localhost/%2f/messages',
1313
),
1414
),

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_adapter.php renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$container->loadFromExtension('framework', array(
44
'serializer' => true,
55
'messenger' => array(
6-
'adapters' => array(
6+
'transports' => array(
77
'default' => 'amqp://localhost/%2f/messages',
88
'customised' => array(
99
'dsn' => 'amqp://localhost/%2f/messages?exchange_name=exchange_name',

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport_no_serializer.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<framework:serializer enabled="false" />
1010
<framework:messenger>
1111
<framework:serializer enabled="true" />
12-
<framework:adapter name="default" dsn="amqp://localhost/%2f/messages" />
12+
<framework:transport name="default" dsn="amqp://localhost/%2f/messages" />
1313
</framework:messenger>
1414
</framework:config>
1515
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_adapter.xml renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<framework:config>
99
<framework:serializer enabled="true" />
1010
<framework:messenger>
11-
<framework:adapter name="default" dsn="amqp://localhost/%2f/messages" />
12-
<framework:adapter name="customised" dsn="amqp://localhost/%2f/messages?exchange_name=exchange_name">
11+
<framework:transport name="default" dsn="amqp://localhost/%2f/messages" />
12+
<framework:transport name="customised" dsn="amqp://localhost/%2f/messages?exchange_name=exchange_name">
1313
<framework:options>
1414
<framework:queue>
1515
<framework:name>Queue</framework:name>
1616
</framework:queue>
1717
</framework:options>
18-
</framework:adapter>
18+
</framework:transport>
1919
</framework:messenger>
2020
</framework:config>
2121
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport_no_serializer.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ framework:
44
messenger:
55
serializer:
66
enabled: true
7-
adapters:
7+
transports:
88
default: 'amqp://localhost/%2f/messages'

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
framework:
22
serializer: true
33
messenger:
4-
adapters:
4+
transports:
55
default: 'amqp://localhost/%2f/messages'
66
customised:
77
dsn: 'amqp://localhost/%2f/messages?exchange_name=exchange_name'

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,9 @@ public function testMessenger()
529529
$this->assertTrue($container->has('message_bus'));
530530
}
531531

532-
public function testMessengerAdapter()
532+
public function testMessengerTransports()
533533
{
534-
$container = $this->createContainerFromFile('messenger_adapter');
534+
$container = $this->createContainerFromFile('messenger_transports');
535535
$this->assertTrue($container->hasDefinition('messenger.sender.default'));
536536
$this->assertTrue($container->getDefinition('messenger.sender.default')->hasTag('messenger.sender'));
537537
$this->assertEquals(array(array('name' => 'default')), $container->getDefinition('messenger.sender.default')->getTag('messenger.sender'));
@@ -543,7 +543,7 @@ public function testMessengerAdapter()
543543
$senderFactory = $container->getDefinition('messenger.sender.customised')->getFactory();
544544
$senderArguments = $container->getDefinition('messenger.sender.customised')->getArguments();
545545

546-
$this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createSender'), $senderFactory);
546+
$this->assertEquals(array(new Reference('messenger.transport_factory'), 'createSender'), $senderFactory);
547547
$this->assertCount(2, $senderArguments);
548548
$this->assertSame('amqp://localhost/%2f/messages?exchange_name=exchange_name', $senderArguments[0]);
549549
$this->assertSame(array('queue' => array('name' => 'Queue')), $senderArguments[1]);
@@ -552,7 +552,7 @@ public function testMessengerAdapter()
552552
$receiverFactory = $container->getDefinition('messenger.receiver.customised')->getFactory();
553553
$receiverArguments = $container->getDefinition('messenger.receiver.customised')->getArguments();
554554

555-
$this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createReceiver'), $receiverFactory);
555+
$this->assertEquals(array(new Reference('messenger.transport_factory'), 'createReceiver'), $receiverFactory);
556556
$this->assertCount(2, $receiverArguments);
557557
$this->assertSame('amqp://localhost/%2f/messages?exchange_name=exchange_name', $receiverArguments[0]);
558558
$this->assertSame(array('queue' => array('name' => 'Queue')), $receiverArguments[1]);

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
1515
use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
16-
use Symfony\Component\Messenger\MiddlewareInterface;
16+
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1717

1818
/**
1919
* @author Samuel Roze <samuel.roze@gmail.com>

‎src/Symfony/Component/Messenger/ContainerHandlerLocator.php renamed to ‎src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Handler/Locator/ContainerHandlerLocator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Messenger;
12+
namespace Symfony\Component\Messenger\Handler\Locator;
1313

1414
use Psr\Container\ContainerInterface;
1515
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;

‎src/Symfony/Component/Messenger/HandlerLocator.php renamed to ‎src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Handler/Locator/HandlerLocator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Messenger;
12+
namespace Symfony\Component\Messenger\Handler\Locator;
1313

1414
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
1515

‎src/Symfony/Component/Messenger/HandlerLocatorInterface.php renamed to ‎src/Symfony/Component/Messenger/Handler/Locator/HandlerLocatorInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Handler/Locator/HandlerLocatorInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Messenger;
12+
namespace Symfony\Component\Messenger\Handler\Locator;
1313

1414
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
1515

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/MessageBus.php
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Messenger;
1313

14+
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
15+
1416
/**
1517
* @author Samuel Roze <samuel.roze@gmail.com>
1618
* @author Matthias Noback <matthiasnoback@gmail.com>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
namespace Symfony\Component\Messenger\Middleware;
1313

14-
use Symfony\Component\Messenger\MiddlewareInterface;
15-
use Symfony\Component\Messenger\HandlerLocatorInterface;
14+
use Symfony\Component\Messenger\Handler\Locator\HandlerLocatorInterface;
1615

1716
/**
1817
* @author Samuel Roze <samuel.roze@gmail.com>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Messenger\Middleware;
1313

1414
use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
15-
use Symfony\Component\Messenger\MiddlewareInterface;
1615
use Psr\Log\LoggerInterface;
1716

1817
/**

‎src/Symfony/Component/Messenger/MiddlewareInterface.php renamed to ‎src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/MiddlewareInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Messenger;
12+
namespace Symfony\Component\Messenger\Middleware;
1313

1414
/**
1515
* @author Samuel Roze <samuel.roze@gmail.com>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Messenger\Middleware;
1313

1414
use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
15-
use Symfony\Component\Messenger\MiddlewareInterface;
1615

1716
/**
1817
* @author Samuel Roze <samuel.roze@gmail.com>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Messenger\Middleware;
1313

1414
use Symfony\Component\Messenger\Exception\ValidationFailedException;
15-
use Symfony\Component\Messenger\MiddlewareInterface;
1615
use Symfony\Component\Validator\Validator\ValidatorInterface;
1716

1817
/**

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
use Symfony\Component\DependencyInjection\ContainerBuilder;
1717
use Symfony\Component\DependencyInjection\Reference;
1818
use Symfony\Component\DependencyInjection\ServiceLocator;
19-
use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
20-
use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
21-
use Symfony\Component\Messenger\ContainerHandlerLocator;
19+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
20+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
21+
use Symfony\Component\Messenger\Handler\Locator\ContainerHandlerLocator;
2222
use Symfony\Component\Messenger\DataCollector\MessengerDataCollector;
2323
use Symfony\Component\Messenger\DependencyInjection\MessengerPass;
2424
use Symfony\Component\Messenger\Handler\ChainHandler;
2525
use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
2626
use Symfony\Component\Messenger\MessageBusInterface;
2727
use Symfony\Component\Messenger\Middleware\TolerateNoHandler;
28-
use Symfony\Component\Messenger\MiddlewareInterface;
28+
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
2929
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
3030
use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
3131
use Symfony\Component\Messenger\Transport\ReceiverInterface;

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/MessageBusTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Messenger\MessageBus;
1616
use Symfony\Component\Messenger\MessageBusInterface;
17-
use Symfony\Component\Messenger\MiddlewareInterface;
17+
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1818
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
1919

2020
class MessageBusTest extends TestCase

‎src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Messenger\Tests\Middleware;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\Messenger\HandlerLocator;
15+
use Symfony\Component\Messenger\Handler\Locator\HandlerLocator;
1616
use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware;
1717
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
1818

‎src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php renamed to ‎src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
12+
namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
16-
use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
17-
use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
15+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
16+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
17+
use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
1818
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
1919
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
2020
use Symfony\Component\Process\PhpProcess;

‎src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpReceiverTest.php renamed to ‎src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpReceiverTest.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
12+
namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
16-
use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
17-
use Symfony\Component\Messenger\Adapter\AmqpExt\Exception\RejectMessageExceptionInterface;
15+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
16+
use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
17+
use Symfony\Component\Messenger\Transport\AmqpExt\Exception\RejectMessageExceptionInterface;
1818
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
1919
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
2020
use Symfony\Component\Serializer as SerializerComponent;
@@ -51,7 +51,7 @@ public function testItSendTheDecodedMessageToTheHandlerAndAcknowledgeIt()
5151
}
5252

5353
/**
54-
* @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\InterruptException
54+
* @expectedException \Symfony\Component\Messenger\Tests\Transport\AmqpExt\InterruptException
5555
*/
5656
public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
5757
{
@@ -77,7 +77,7 @@ public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
7777
}
7878

7979
/**
80-
* @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\WillNeverWorkException
80+
* @expectedException \Symfony\Component\Messenger\Tests\Transport\AmqpExt\WillNeverWorkException
8181
*/
8282
public function testItRejectsTheMessageIfTheExceptionIsARejectMessageExceptionInterface()
8383
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.