8000 [Messenger] remove classifying sub-namespaces in favor of semantic ones · symfony/symfony@16afb5e · GitHub
[go: up one dir, main page]
Skip to content

Commit 16afb5e

Browse files
nicolas-grekasnicolas-grekas
committed
[Messenger] remove classifying sub-namespaces in favor of semantic ones
1 parent 9aaec94 commit 16afb5e

34 files changed

+69
-66
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
6969
use Symfony\Component\Messenger\MessageBus;
7070
use Symfony\Component\Messenger\MessageBusInterface;
71-
use Symfony\Component\Messenger\Transport\ChainSender;
71+
use Symfony\Component\Messenger\Transport\Sender\ChainSender;
7272
use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
7373
use Symfony\Component\Messenger\Transport\TransportInterface;
7474
use Symfony\Component\PropertyAccess\PropertyAccessor;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<defaults public="false" />
99

1010
<!-- Asynchronous -->
11-
<service id="messenger.asynchronous.routing.sender_locator" class="Symfony\Component\Messenger\Asynchronous\Routing\ContainerSenderLocator">
11+
<service id="messenger.asynchronous.routing.sender_locator" class="Symfony\Component\Messenger\Transport\Sender\Locator\ContainerSenderLocator">
1212
<argument type="service" id="messenger.sender_locator" />
1313
<argument type="collection" /> <!-- Message to sender ID mapping -->
1414
</service>
15-
<service id="messenger.middleware.route_messages" class="Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware">
15+
<service id="messenger.middleware.route_messages" class="Symfony\Component\Messenger\Middleware\SendMessageMiddleware">
1616
<argument type="service" id="messenger.asynchronous.routing.sender_locator" />
1717
<argument type="collection" /> <!-- Message to send and handle mapping -->
1818
</service>

‎src/Symfony/Component/Messenger/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ CHANGELOG
3333
* `HandlerLocatorInterface::resolve()` has been replaced by `getHandler(Envelope $envelope)`
3434
* `SenderLocatorInterface::getSenderForMessage()` has been replaced by `getSender(Envelope $envelope)`
3535
* `SenderInterface::send()` returns `void`
36+
* Classes in the `Middleware\Enhancers` sub-namespace have been moved to the `Middleware` one
37+
* Classes in the `Asynchronous\Routing` sub-namespace have been moved to the `Transport\Sender\Locator` sub-namespace
38+
* The `Asynchronous/Middleware/SendMessageMiddleware` class has been moved to the `Middleware` namespace
39+
* `SenderInterface` and `ChainSender` classes have been moved to the `Transport\Sender` sub-namespace
40+
* `ReceiverInterface` and its implementations have been moved to the `Transport\Receiver` sub-namespace
41+
* `ActivationMiddlewareDecorator` has been renamed `ActivationMiddleware`
3642

3743
4.1.0
3844
-----

‎src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use Symfony\Component\Console\Input\InputOption;
2121
use Symfony\Component\Console\Output\OutputInterface;
2222
use Symfony\Component\Console\Style\SymfonyStyle;
23-
use Symfony\Component\Messenger\Transport\Enhancers\StopWhenMemoryUsageIsExceededReceiver;
24-
use Symfony\Component\Messenger\Transport\Enhancers\StopWhenMessageCountIsExceededReceiver;
25-
use Symfony\Component\Messenger\Transport\Enhancers\StopWhenTimeLimitIsReachedReceiver;
23+
use Symfony\Component\Messenger\Transport\Receiver\StopWhenMemoryUsageIsExceededReceiver;
24+
use Symfony\Component\Messenger\Transport\Receiver\StopWhenMessageCountIsExceededReceiver;
25+
use Symfony\Component\Messenger\Transport\Receiver\StopWhenTimeLimitIsReachedReceiver;
2626
use Symfony\Component\Messenger\Worker;
2727

2828
/**

‎src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
use Symfony\Component\Messenger\Handler\ChainHandler;
2323
use Symfony\Component\Messenger\Handler\Locator\ContainerHandlerLocator;
2424
use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
25-
use Symfony\Component\Messenger\Middleware\Enhancers\TraceableMiddleware;
25+
use Symfony\Component\Messenger\Middleware\TraceableMiddleware;
2626
use Symfony\Component\Messenger\TraceableMessageBus;
27-
use Symf 10000 ony\Component\Messenger\Transport\ReceiverInterface;
28-
use Symfony\Component\Messenger\Transport\SenderInterface;
27+
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
28+
use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
2929

3030
/**
3131
* @author Samuel Roze <samuel.roze@gmail.com>

‎src/Symfony/Component/Messenger/Middleware/Enhancers/ActivationMiddlewareDecorator.php renamed to ‎src/Symfony/Component/Messenger/Middleware/ActivationMiddleware.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
* file that was distributed with this source code.
1010
*/
1111

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

1414
use Symfony\Component\Messenger\Envelope;
15-
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1615

1716
/**
1817
* Execute the inner middleware according to an activation strategy.
1918
*
2019
* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
2120
*/
22-
class ActivationMiddlewareDecorator implements MiddlewareInterface
21+
class ActivationMiddleware implements MiddlewareInterface
2322
{
2423
private $inner;
2524
private $activated;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

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

14-
use Symfony\Component\Messenger\Asynchronous\Routing\AbstractSenderLocator;
15 17A7 -
use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
1614
use Symfony\Component\Messenger\Envelope;
17-
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1815
use Symfony\Component\Messenger\Stamp\ReceivedStamp;
16+
use Symfony\Component\Messenger\Transport\Sender\Locator\AbstractSenderLocator;
17+
use Symfony\Component\Messenger\Transport\Sender\Locator\SenderLocatorInterface;
1918

2019
/**
2120
* @author Samuel Roze <samuel.roze@gmail.com>

‎src/Symfony/Component/Messenger/Middleware/Enhancers/TraceableMiddleware.php renamed to ‎src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
* file that was distributed with this source code.
1010
*/
1111

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

1414
use Symfony\Component\Messenger\Envelope;
15-
use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
1615
use Symfony\Component\Stopwatch\Stopwatch;
1716

1817
/**

‎src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Messenger\Stamp;
1313

14-
use Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware;
14+
use Symfony\Component\Messenger\Middleware\SendMessageMiddleware;
1515

1616
/**
1717
* Marker config for a received message.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
4141
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
4242
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
43-
use Symfony\Component\Messenger\Transport\ReceiverInterface;
43+
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
4444
use Symfony\Component\Stopwatch\Stopwatch;
4545

4646
class MessengerPassTest extends TestCase
@@ -344,7 +344,7 @@ public function testItThrowsAnExceptionOnUnknownBus()
344344

345345
/**
346346
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
347-
* @expectedExceptionMessage Invalid sender "app.messenger.sender": class "Symfony\Component\Messenger\Tests\DependencyInjection\InvalidSender" must implement interface "Symfony\Component\Messenger\Transport\SenderInterface".
347+
* @expectedExceptionMessage Invalid sender "app.messenger.sender": class "Symfony\Component\Messenger\Tests\DependencyInjection\InvalidSender" must implement interface "Symfony\Component\Messenger\Transport\Sender\SenderInterface".
348348
*/
349349
public function testItDoesNotRegisterInvalidSender()
350350
{

0 commit comments

Comments
 (0)
0