Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commiteafe882

Browse files
author
scyzoryck
committed
[Messenger] Add completion for failed messages commands.
1 parent85bf403 commiteafe882

File tree

7 files changed

+269
-4
lines changed

7 files changed

+269
-4
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
4242
// explicit trigger_error tests
4343
->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
44+
// stop removing spaces on the end of the line in strings
45+
->notPath('Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php')
4446
)
4547
->setCacheFile('.php-cs-fixer.cache')
4648
;

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespaceSymfony\Component\Messenger\Command;
1313

1414
useSymfony\Component\Console\Command\Command;
15+
useSymfony\Component\Console\Completion\CompletionInput;
16+
useSymfony\Component\Console\Completion\CompletionSuggestions;
1517
useSymfony\Component\Console\Helper\Dumper;
1618
useSymfony\Component\Console\Question\ChoiceQuestion;
1719
useSymfony\Component\Console\Style\SymfonyStyle;
@@ -23,6 +25,7 @@
2325
useSymfony\Component\Messenger\Stamp\RedeliveryStamp;
2426
useSymfony\Component\Messenger\Stamp\SentToFailureTransportStamp;
2527
useSymfony\Component\Messenger\Stamp\TransportMessageIdStamp;
28+
useSymfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
2629
useSymfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
2730
useSymfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
2831
useSymfony\Component\VarDumper\Caster\Caster;
@@ -263,4 +266,29 @@ protected function interactiveChooseFailureTransport(SymfonyStyle $io)
263266

264267
return$io->askQuestion($question);
265268
}
269+
270+
publicfunctioncomplete(CompletionInput$input,CompletionSuggestions$suggestions):void
271+
{
272+
if ($input->mustSuggestOptionValuesFor('transport')) {
273+
$suggestions->suggestValues(array_keys($this->failureTransports->getProvidedServices()));
274+
275+
return;
276+
}
277+
278+
if ($input->mustSuggestArgumentValuesFor('id')) {
279+
$transport =$input->getOption('transport');
280+
$receiver =$this->getReceiver($transport);
281+
if (!$receiverinstanceof ListableReceiverInterface) {
282+
return;
283+
}
284+
285+
$ids = [];
286+
foreach ($receiver->all(50)as$envelope) {
287+
$ids[] =$this->getMessageId($envelope);
288+
}
289+
$suggestions->suggestValues($ids);
290+
291+
return;
292+
}
293+
}
266294
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function configure(): void
6161
->setDefinition([
6262
newInputArgument('id', InputArgument::IS_ARRAY,'Specific message id(s) to retry'),
6363
newInputOption('force',null, InputOption::VALUE_NONE,'Force action without confirmation'),
64-
newInputOption('transport',null, InputOption::VALUE_OPTIONAL,'Use a specific failure transport',self::DEFAULT_TRANSPORT_OPTION),
64+
newInputOption('transport',null, InputOption::VALUE_OPTIONAL,'Use a specific failure transport'),
6565
])
6666
->setDescription(self::$defaultDescription)
6767
->setHelp(<<<'EOF'
@@ -100,9 +100,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
100100
}
101101

102102
$failureTransportName =$input->getOption('transport');
103-
if (self::DEFAULT_TRANSPORT_OPTION ===$failureTransportName) {
103+
if (null ===$failureTransportName) {
104+
$failureTransportName =$this->getGlobalFailureReceiverName();
104105
$this->printWarningAvailableFailureTransports($io,$this->getGlobalFailureReceiverName());
105106
}
107+
106108
if ('' ===$failureTransportName ||null ===$failureTransportName) {
107109
$failureTransportName =$this->interactiveChooseFailureTransport($io);
108110
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function configure(): void
4141
->setDefinition([
4242
newInputArgument('id', InputArgument::OPTIONAL,'Specific message id to show'),
4343
newInputOption('max',null, InputOption::VALUE_REQUIRED,'Maximum number of messages to list',50),
44-
newInputOption('transport',null, InputOption::VALUE_OPTIONAL,'Use a specific failure transport',self::DEFAULT_TRANSPORT_OPTION),
44+
newInputOption('transport',null, InputOption::VALUE_OPTIONAL,'Use a specific failure transport'),
4545
])
4646
->setDescription(self::$defaultDescription)
4747
->setHelp(<<<'EOF'
@@ -65,7 +65,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
6565
$io =newSymfonyStyle($input,$outputinstanceof ConsoleOutputInterface ?$output->getErrorOutput() :$output);
6666

6767
$failureTransportName =$input->getOption('transport');
68-
if (self::DEFAULT_TRANSPORT_OPTION ===$failureTransportName) {
68+
if (null ===$failureTransportName) {
69+
$failureTransportName =$this->getGlobalFailureReceiverName();
6970
$this->printWarningAvailableFailureTransports($io,$this->getGlobalFailureReceiverName());
7071
}
7172
if ('' ===$failureTransportName ||null ===$failureTransportName) {

‎src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRemoveCommandTest.php‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
namespaceSymfony\Component\Messenger\Tests\Command;
1313

1414
usePHPUnit\Framework\TestCase;
15+
useSymfony\Component\Console\Tester\CommandCompletionTester;
1516
useSymfony\Component\Console\Tester\CommandTester;
1617
useSymfony\Component\DependencyInjection\ServiceLocator;
1718
useSymfony\Component\Messenger\Command\FailedMessagesRemoveCommand;
1819
useSymfony\Component\Messenger\Envelope;
1920
useSymfony\Component\Messenger\Exception\InvalidArgumentException;
21+
useSymfony\Component\Messenger\Stamp\TransportMessageIdStamp;
2022
useSymfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
2123

2224
class FailedMessagesRemoveCommandTestextends TestCase
@@ -268,4 +270,78 @@ public function testRemoveMultipleMessagesAndDisplayMessagesWithServiceLocator()
268270
$this->assertStringContainsString('Message with id 20 removed.',$tester->getDisplay());
269271
$this->assertStringContainsString('Message with id 30 removed.',$tester->getDisplay());
270272
}
273+
274+
publicfunctiontestCompletingTransport()
275+
{
276+
$globalFailureReceiverName ='failure_receiver';
277+
278+
$receiver =$this->createMock(ListableReceiverInterface::class);
279+
280+
$serviceLocator =$this->createMock(ServiceLocator::class);
281+
$serviceLocator->expects($this->once())->method('getProvidedServices')->willReturn([
282+
'global_receiver' =>$receiver,
283+
$globalFailureReceiverName =>$receiver,
284+
]);
285+
286+
$command =newFailedMessagesRemoveCommand(
287+
$globalFailureReceiverName,
288+
$serviceLocator
289+
);
290+
$tester =newCommandCompletionTester($command);
291+
292+
$suggestions =$tester->complete(['--transport']);
293+
$this->assertSame(['global_receiver','failure_receiver'],$suggestions);
294+
}
295+
296+
publicfunctiontestCompleteId()
297+
{
298+
$globalFailureReceiverName ='failure_receiver';
299+
300+
$receiver =$this->createMock(ListableReceiverInterface::class);
301+
$receiver->expects($this->once())->method('all')->with(50)->willReturn([
302+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('2ab50dfa1fbf')]),
303+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('78c2da843723')]),
304+
]);
305+
306+
$serviceLocator =$this->createMock(ServiceLocator::class);
307+
$serviceLocator->expects($this->once())->method('has')->with($globalFailureReceiverName)->willReturn(true);
308+
$serviceLocator->expects($this->any())->method('get')->with($globalFailureReceiverName)->willReturn($receiver);
309+
310+
$command =newFailedMessagesRemoveCommand(
311+
$globalFailureReceiverName,
312+
$serviceLocator
313+
);
314+
$tester =newCommandCompletionTester($command);
315+
316+
$suggestions =$tester->complete(['']);
317+
318+
$this->assertSame(['2ab50dfa1fbf','78c2da843723'],$suggestions);
319+
}
320+
321+
publicfunctiontestCompleteIdWithSpecifiedTransport()
322+
{
323+
$globalFailureReceiverName ='failure_receiver';
324+
$anotherFailureReceiverName ='another_receiver';
325+
326+
$receiver =$this->createMock(ListableReceiverInterface::class);
327+
$receiver->expects($this->once())->method('all')->with(50)->willReturn([
328+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('2ab50dfa1fbf')]),
329+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('78c2da843723')]),
330+
]);
331+
332+
$serviceLocator =$this->createMock(ServiceLocator::class);
333+
$serviceLocator->expects($this->once())->method('has')->with($anotherFailureReceiverName)->willReturn(true);
334+
$serviceLocator->expects($this->any())->method('get')->with($anotherFailureReceiverName)->willReturn($receiver);
335+
336+
$command =newFailedMessagesRemoveCommand(
337+
$globalFailureReceiverName,
338+
$serviceLocator
339+
);
340+
341+
$tester =newCommandCompletionTester($command);
342+
343+
$suggestions =$tester->complete(['--transport',$anotherFailureReceiverName,'']);
344+
345+
$this->assertSame(['2ab50dfa1fbf','78c2da843723'],$suggestions);
346+
}
271347
}

‎src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
namespaceSymfony\Component\Messenger\Tests\Command;
1313

1414
usePHPUnit\Framework\TestCase;
15+
useSymfony\Component\Console\Tester\CommandCompletionTester;
1516
useSymfony\Component\Console\Tester\CommandTester;
1617
useSymfony\Component\DependencyInjection\ServiceLocator;
1718
useSymfony\Component\EventDispatcher\EventDispatcher;
1819
useSymfony\Component\Messenger\Command\FailedMessagesRetryCommand;
1920
useSymfony\Component\Messenger\Envelope;
2021
useSymfony\Component\Messenger\MessageBusInterface;
22+
useSymfony\Component\Messenger\Stamp\TransportMessageIdStamp;
2123
useSymfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
2224

2325
class FailedMessagesRetryCommandTestextends TestCase
@@ -144,4 +146,83 @@ public function testBasicRunWithServiceLocatorWithSpecificFailureTransport()
144146

145147
$this->assertStringContainsString('[OK]',$tester->getDisplay());
146148
}
149+
150+
publicfunctiontestCompletingTransport()
151+
{
152+
$globalFailureReceiverName ='failure_receiver';
153+
154+
$receiver =$this->createMock(ListableReceiverInterface::class);
155+
156+
$serviceLocator =$this->createMock(ServiceLocator::class);
157+
$serviceLocator->expects($this->once())->method('getProvidedServices')->willReturn([
158+
'global_receiver' =>$receiver,
159+
$globalFailureReceiverName =>$receiver,
160+
]);
161+
162+
$command =newFailedMessagesRetryCommand(
163+
$globalFailureReceiverName,
164+
$serviceLocator,
165+
$this->createMock(MessageBusInterface::class),
166+
newEventDispatcher()
167+
);
168+
$tester =newCommandCompletionTester($command);
169+
170+
$suggestions =$tester->complete(['--transport']);
171+
$this->assertSame(['global_receiver','failure_receiver'],$suggestions);
172+
}
173+
174+
publicfunctiontestCompleteId()
175+
{
176+
$globalFailureReceiverName ='failure_receiver';
177+
178+
$receiver =$this->createMock(ListableReceiverInterface::class);
179+
$receiver->expects($this->once())->method('all')->with(50)->willReturn([
180+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('2ab50dfa1fbf')]),
181+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('78c2da843723')]),
182+
]);
183+
184+
$serviceLocator =$this->createMock(ServiceLocator::class);
185+
$serviceLocator->expects($this->once())->method('has')->with($globalFailureReceiverName)->willReturn(true);
186+
$serviceLocator->expects($this->any())->method('get')->with($globalFailureReceiverName)->willReturn($receiver);
187+
188+
$command =newFailedMessagesRetryCommand(
189+
$globalFailureReceiverName,
190+
$serviceLocator,
191+
$this->createMock(MessageBusInterface::class),
192+
newEventDispatcher()
193+
);
194+
$tester =newCommandCompletionTester($command);
195+
196+
$suggestions =$tester->complete(['']);
197+
198+
$this->assertSame(['2ab50dfa1fbf','78c2da843723'],$suggestions);
199+
}
200+
201+
publicfunctiontestCompleteIdWithSpecifiedTransport()
202+
{
203+
$globalFailureReceiverName ='failure_receiver';
204+
$anotherFailureReceiverName ='another_receiver';
205+
206+
$receiver =$this->createMock(ListableReceiverInterface::class);
207+
$receiver->expects($this->once())->method('all')->with(50)->willReturn([
208+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('2ab50dfa1fbf')]),
209+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('78c2da843723')]),
210+
]);
211+
212+
$serviceLocator =$this->createMock(ServiceLocator::class);
213+
$serviceLocator->expects($this->once())->method('has')->with($anotherFailureReceiverName)->willReturn(true);
214+
$serviceLocator->expects($this->any())->method('get')->with($anotherFailureReceiverName)->willReturn($receiver);
215+
216+
$command =newFailedMessagesRetryCommand(
217+
$globalFailureReceiverName,
218+
$serviceLocator,
219+
$this->createMock(MessageBusInterface::class),
220+
newEventDispatcher()
221+
);
222+
$tester =newCommandCompletionTester($command);
223+
224+
$suggestions =$tester->complete(['--transport',$anotherFailureReceiverName,'']);
225+
226+
$this->assertSame(['2ab50dfa1fbf','78c2da843723'],$suggestions);
227+
}
147228
}

‎src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
usePHPUnit\Framework\TestCase;
1515
useSymfony\Component\Console\Output\OutputInterface;
16+
useSymfony\Component\Console\Tester\CommandCompletionTester;
1617
useSymfony\Component\Console\Tester\CommandTester;
1718
useSymfony\Component\DependencyInjection\ServiceLocator;
1819
useSymfony\Component\Messenger\Command\FailedMessagesShowCommand;
@@ -607,4 +608,78 @@ public function testListMessagesWithServiceLocatorFromSpecificTransport()
607608
$redeliveryStamp->getRedeliveredAt()->format('Y-m-d H:i:s')),
608609
$tester->getDisplay(true));
609610
}
611+
612+
613+
publicfunctiontestCompletingTransport()
614+
{
615+
$globalFailureReceiverName ='failure_receiver';
616+
617+
$receiver =$this->createMock(ListableReceiverInterface::class);
618+
619+
$serviceLocator =$this->createMock(ServiceLocator::class);
620+
$serviceLocator->expects($this->once())->method('getProvidedServices')->willReturn([
621+
'global_receiver' =>$receiver,
622+
$globalFailureReceiverName =>$receiver,
623+
]);
624+
625+
$command =newFailedMessagesShowCommand(
626+
$globalFailureReceiverName,
627+
$serviceLocator
628+
);
629+
$tester =newCommandCompletionTester($command);
630+
631+
$suggestions =$tester->complete(['--transport']);
632+
$this->assertSame(['global_receiver','failure_receiver'],$suggestions);
633+
}
634+
635+
publicfunctiontestCompleteId()
636+
{
637+
$globalFailureReceiverName ='failure_receiver';
638+
639+
$receiver =$this->createMock(ListableReceiverInterface::class);
640+
$receiver->expects($this->once())->method('all')->with(50)->willReturn([
641+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('2ab50dfa1fbf')]),
642+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('78c2da843723')]),
643+
]);
644+
645+
$serviceLocator =$this->createMock(ServiceLocator::class);
646+
$serviceLocator->expects($this->once())->method('has')->with($globalFailureReceiverName)->willReturn(true);
647+
$serviceLocator->expects($this->any())->method('get')->with($globalFailureReceiverName)->willReturn($receiver);
648+
649+
$command =newFailedMessagesShowCommand(
650+
$globalFailureReceiverName,
651+
$serviceLocator
652+
);
653+
$tester =newCommandCompletionTester($command);
654+
655+
$suggestions =$tester->complete(['']);
656+
657+
$this->assertSame(['2ab50dfa1fbf','78c2da843723'],$suggestions);
658+
}
659+
660+
publicfunctiontestCompleteIdWithSpecifiedTransport()
661+
{
662+
$globalFailureReceiverName ='failure_receiver';
663+
$anotherFailureReceiverName ='another_receiver';
664+
665+
$receiver =$this->createMock(ListableReceiverInterface::class);
666+
$receiver->expects($this->once())->method('all')->with(50)->willReturn([
667+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('2ab50dfa1fbf')]),
668+
Envelope::wrap(new \stdClass(), [newTransportMessageIdStamp('78c2da843723')]),
669+
]);
670+
671+
$serviceLocator =$this->createMock(ServiceLocator::class);
672+
$serviceLocator->expects($this->once())->method('has')->with($anotherFailureReceiverName)->willReturn(true);
673+
$serviceLocator->expects($this->any())->method('get')->with($anotherFailureReceiverName)->willReturn($receiver);
674+
675+
$command =newFailedMessagesShowCommand(
676+
$globalFailureReceiverName,
677+
$serviceLocator
678+
);
679+
$tester =newCommandCompletionTester($command);
680+
681+
$suggestions =$tester->complete(['--transport',$anotherFailureReceiverName,'']);
682+
683+
$this->assertSame(['2ab50dfa1fbf','78c2da843723'],$suggestions);
684+
}
610685
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp