10000 Minor tweak for previous commit · symfony/symfony@22fd05a · GitHub
[go: up one dir, main page]
Skip to content

Commit 22fd05a

Browse files
ogizanagiogizanagi
committed
Minor tweak for previous commit
removed unrelated AsMessageHandler attribute for test case
1 parent e875021 commit 22fd05a

File tree

3 files changed

+56
-51
lines changed

3 files changed

+56
-51
lines changed

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

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
use Symfony\Component\Messenger\Middleware\StackInterface;
4141
use Symfony\Component\Messenger\Tests\Fixtures\DummyCommand;
4242
use Symfony\Component\Messenger\Tests\Fixtures\DummyCommandHandler;
43+
use Symfony\Component\Messenger\Tests\Fixtures\DummyHandlerWithCustomMethods;
4344
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
4445
use Symfony\Component\Messenger\Tests\Fixtures\DummyQuery;
4546
use Symfony\Component\Messenger\Tests\Fixtures\DummyQueryHandler;
4647
use Symfony\Component\Messenger\Tests\Fixtures\MultipleBusesMessage;
4748
use Symfony\Component\Messenger\Tests\Fixtures\MultipleBusesMessageHandler;
4849
use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
4950
use Symfony\Component\Messenger\Tests\Fixtures\TaggedDummyHandler;
50-
use Symfony\Component\Messenger\Tests\Fixtures\TaggedDummyHandlerWithCustomMethods;
5151
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
5252

5353
class MessengerPassTest extends TestCase
@@ -106,40 +106,11 @@ public function testFromTransportViaTagAttribute()
106106
$this->assertHandlerDescriptor($container, $handlerDescriptionMapping, DummyMessage::class, [DummyHandler::class], [['from_transport' => 'async']]);
107107
}
108108

109-
public function testTaggedMessageHandler()
109+
public function testHandledMessageTypeResolvedWithMethodAndNoHandlesViaTagAttributes()
110110
{
111111
$container = $this->getContainerBuilder($busId = 'message_bus');
112-
$container->registerAttributeForAutoconfiguration(AsMessageHandler::class, static function (ChildDefinition $definition, AsMessageHandler $attribute): void {
113-
$tagAttributes = get_object_vars($attribute);
114-
$tagAttributes['from_transport'] = $tagAttributes['fromTransport'];
115-
unset($tagAttributes['fromTransport']);
116-
117-
$definition->addTag('messenger.message_handler', $tagAttributes);
118-
});
119112
$container
120-
->register(TaggedDummyHandler::class, TaggedDummyHandler::class)
121-
->setAutoconfigured(true)
122-
;
123-
124-
(new AttributeAutoconfigurationPass())->process($container);
125-
(new ResolveInstanceofConditionalsPass())->process($container);
126-
(new MessengerPass())->process($container);
127-
128-
$handlersLocatorDefinition = $container->getDefinition($busId.'.messenger.handlers_locator');
129-
$this->assertSame(HandlersLocator::class, $handlersLocatorDefinition->getClass());
130-
131-
$handlerDescriptionMapping = $handlersLocatorDefinition->getArgument(0);
132-
$this->assertCount(1, $handlerDescriptionMapping);
133-
134-
$this->assertHandlerDescriptor($container, $handlerDescriptionMapping, DummyMessage::class, [TaggedDummyHandler::class], [[]]);
135-
}
136-
137-
public function testTaggedMessageHandlerWithGivenMethodAndNotGivenMessageType()
138-
{
139-
$container = $this->getContainerBuilder($busId = 'message_bus');
140-
$container
141-
->register(TaggedDummyHandlerWithCustomMethods::class, TaggedDummyHandlerWithCustomMethods::class)
142-
->setAutoconfigured(true)
113+
->register(DummyHandlerWithCustomMethods::class, DummyHandlerWithCustomMethods::class)
143114
->addTag('messenger.message_handler', [
144115
'method' => 'handleDummyMessage',
145116
])
@@ -156,18 +127,46 @@ public function testTaggedMessageHandlerWithGivenMethodAndNotGivenMessageType()
156127
$container,
157128
$handlersMapping,
158129
DummyMessage::class,
159-
[[TaggedDummyHandlerWithCustomMethods::class, 'handleDummyMessage']]
130+
[[DummyHandlerWithCustomMethods::class, 'handleDummyMessage']]
160131
);
161132

162133
$this->assertArrayHasKey(SecondMessage::class, $handlersMapping);
163134
$this->assertHandlerDescriptor(
164135
$container,
165136
$handlersMapping,
166137
SecondMessage::class,
167-
[[TaggedDummyHandlerWithCustomMethods::class, 'handleSecondMessage']]
138+
[[DummyHandlerWithCustomMethods::class, 'handleSecondMessage']]
168139
);
169140
}
170141

142+
public function testTaggedMessageHandler()
143+
{
144+
$container = $this->getContainerBuilder($busId = 'message_bus');
145+
$container->registerAttributeForAutoconfiguration(AsMessageHandler::class, static function (ChildDefinition $definition, AsMessageHandler $attribute): void {
146+
$tagAttributes = get_object_vars($attribute);
147+
$tagAttributes['from_transport'] = $tagAttributes['fromTransport'];
148+
unset($tagAttributes['fromTransport']);
149+
150+
$definition->addTag('messenger.message_handler', $tagAttributes);
151+
});
152+
$container
153+
->register(TaggedDummyHandler::class, TaggedDummyHandler::class)
154+
->setAutoconfigured(true)
155+
;
156+
157+
(new AttributeAutoconfigurationPass())->process($container);
158+
(new ResolveInstanceofConditionalsPass())->process($container);
159+
(new MessengerPass())->process($container);
160+
161+
$handlersLocatorDefinition = $container->getDefinition($busId.'.messenger.handlers_locator');
162+
$this->assertSame(HandlersLocator::class, $handlersLocatorDefinition->getClass());
163+
164+
$handlerDescriptionMapping = $handlersLocatorDefinition->getArgument(0);
165+
$this->assertCount(1, $handlerDescriptionMapping);
166+
167+
$this->assertHandlerDescriptor($container, $handlerDescriptionMapping, DummyMessage::class, [TaggedDummyHandler::class], [[]]);
168+
}
169+
171170
public function testProcessHandlersByBus()
172171
{
173172
$container = $this->getContainerBuilder($commandBusId = 'command_bus');

‎src/Symfony/Component/Messenger/Tests/Fixtures/DummyHandlerWithCustomMethods.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Messenger\Tests\Fixtures;
13+
14+
class DummyHandlerWithCustomMethods
15+
{
16+
public function handleDummyMessage(DummyMessage $message)
17+
{
18+
}
19+
20+
public function handleSecondMessage(SecondMessage $message)
21+
{
22+
}
23+
}

‎src/Symfony/Component/Messenger/Tests/Fixtures/TaggedDummyHandlerWithCustomMethods.php

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

0 commit comments

Comments
 (0)
0