renaming purge command to remove

weaverryan · weaverryan · commit dd1edf3710aa · 2019-04-30T08:45:38.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -286,7 +286,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('console.command.messenger_setup_transports');
             $container->removeDefinition('console.command.messenger_failed_messages_retry');
             $container->removeDefinition('console.command.messenger_failed_messages_show');
-            $container->removeDefinition('console.command.messenger_failed_messages_purge');
+            $container->removeDefinition('console.command.messenger_failed_messages_remove');
         }
 
         $propertyInfoEnabled = $this->isConfigEnabled($container, $config['property_info']);
@@ -1781,12 +1781,12 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
                 ->replaceArgument(4, $transportRetryReferences[$config['failure_transport']] ?? null);
             $container->getDefinition('console.command.messenger_failed_messages_show')
                 ->replaceArgument(0, $config['failure_transport']);
-            $container->getDefinition('console.command.messenger_failed_messages_purge')
+            $container->getDefinition('console.command.messenger_failed_messages_remove')
                 ->replaceArgument(0, $config['failure_transport']);
         } else {
             $container->removeDefinition('console.command.messenger_failed_messages_retry');
             $container->removeDefinition('console.command.messenger_failed_messages_show');
-            $container->removeDefinition('console.command.messenger_failed_messages_purge');
+            $container->removeDefinition('console.command.messenger_failed_messages_remove');
         }
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -132,11 +132,11 @@
             <tag name="console.command" command="messenger:failed:show" />
         </service>
 
-        <service id="console.command.messenger_failed_messages_purge" class="Symfony\Component\Messenger\Command\FailedMessagesPurgeCommand">
+        <service id="console.command.messenger_failed_messages_remove" class="Symfony\Component\Messenger\Command\FailedMessagesRemoveCommand">
             <argument /> <!-- Receiver name -->
             <argument /> <!-- Receiver locator -->
 
-            <tag name="console.command" command="messenger:failed:purge" />
+            <tag name="console.command" command="messenger:failed:remove" />
         </service>
 
         <service id="console.command.router_debug" class="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRemoveCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRemoveCommand.php
@@ -26,9 +26,9 @@
  *
  * @experimental in 4.3
  */
-class FailedMessagesPurgeCommand extends AbstractFailedMessagesCommand
+class FailedMessagesRemoveCommand extends AbstractFailedMessagesCommand
 {
-    protected static $defaultName = 'messenger:failed:purge';
+    protected static $defaultName = 'messenger:failed:remove';
 
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -132,7 +132,7 @@ private function runInteractive(SymfonyStyle $io, bool $shouldForce)
             while (true) {
                 $ids = [];
                 foreach ($receiver->all(1) as $envelope) {
-                    $count++;
+                    ++$count;
 
                     $id = $this->getMessageId($envelope);
                     if (null === $id) {
@@ -188,7 +188,7 @@ private function runWorker(ReceiverInterface $receiver, SymfonyStyle $io, bool $
         $count = 0;
         try {
             $worker->run([], function (?Envelope $envelope) use ($worker, $io, &$count) {
-                $count++;
+                ++$count;
                 if (null === $envelope) {
                     $worker->stop();
                 }
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
@@ -20,7 +20,6 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp;
 use Symfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
-use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
 
 /**
  * @author Ryan Weaver <ryan@symfonycasts.com>
@@ -124,7 +123,7 @@ private function showMessage($id, SymfonyStyle $io)
         $io->writeln([
             '',
             sprintf(' Run <comment>messenger:failed:retry %s</comment> to retry this message.', $id),
-            sprintf(' Run <comment>messenger:failed:purge %s</comment> to delete it.', $id),
+            sprintf(' Run <comment>messenger:failed:remove %s</comment> to delete it.', $id),
         ]);
     }
 }
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -274,7 +274,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
         $failedCommandIds = [
             'console.command.messenger_failed_messages_retry',
             'console.command.messenger_failed_messages_show',
-            'console.command.messenger_failed_messages_purge',
+            'console.command.messenger_failed_messages_remove',
         ];
         foreach ($failedCommandIds as $failedCommandId) {
             if ($container->hasDefinition($failedCommandId)) {
diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRemoveCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRemoveCommandTest.php
@@ -13,18 +13,18 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Messenger\Command\FailedMessagesPurgeCommand;
+use Symfony\Component\Messenger\Command\FailedMessagesRemoveCommand;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Transport\Receiver\ListableReceiverInterface;
 
-class FailedMessagesPurgeCommandTest extends TestCase
+class FailedMessagesRemoveCommandTest extends TestCase
 {
     public function testBasicRun()
     {
         $receiver = $this->createMock(ListableReceiverInterface::class);
         $receiver->expects($this->once())->method('find')->with(20)->willReturn(new Envelope(new \stdClass()));
 
-        $command = new FailedMessagesPurgeCommand(
+        $command = new FailedMessagesRemoveCommand(
             'failure_receiver',
             $receiver
         );

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@`
`26`	`26`	`*`
`27`	`27`	`* @experimental in 4.3`
`28`	`28`	`*/`
`29`		`-class FailedMessagesPurgeCommand extends AbstractFailedMessagesCommand`
	`29`	`+class FailedMessagesRemoveCommand extends AbstractFailedMessagesCommand`
`30`	`30`	`{`
`31`		`- protected static $defaultName = 'messenger:failed:purge';`
	`31`	`+ protected static $defaultName = 'messenger:failed:remove';`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* {@inheritdoc}`