Update phpstan level to 6

Command/AnonConsumerCommand.php

@@ -4,7 +4,7 @@
 
 class AnonConsumerCommand extends BaseConsumerCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -15,7 +15,7 @@ protected function configure()
 
     }
 
-    protected function getConsumerService()
+    protected function getConsumerService(): string
     {
         return 'old_sound_rabbit_mq.%s_anon';
     }

Command/BaseConsumerCommand.php

@@ -2,7 +2,11 @@
 
 namespace OldSound\RabbitMqBundle\Command;
 
-use OldSound\RabbitMqBundle\RabbitMq\BaseConsumer as Consumer;
+use OldSound\RabbitMqBundle\RabbitMq\AnonConsumer;
+use OldSound\RabbitMqBundle\RabbitMq\BaseConsumer;
+use OldSound\RabbitMqBundle\RabbitMq\Consumer;
+use OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer;
+use OldSound\RabbitMqBundle\RabbitMq\MultipleConsumer;
 use PhpAmqpLib\Exception\AMQPTimeoutException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -11,15 +15,20 @@
 
 abstract class BaseConsumerCommand extends BaseRabbitMqCommand
 {
+    /** @var DynamicConsumer|MultipleConsumer|AnonConsumer */
     protected $consumer;
 
+    /** @var string */
     protected $amount;
 
+    /**
+     * @return mixed
+     */
     abstract protected function getConsumerService();
 
-    public function stopConsumer()
+    public function stopConsumer(): void
     {
-        if ($this->consumer instanceof Consumer) {
+        if ($this->consumer instanceof BaseConsumer) {
             // Process current message, then halt consumer
             $this->consumer->forceStopConsumer();
 
@@ -30,20 +39,29 @@ public function stopConsumer()
         }
     }
 
-    public function restartConsumer()
+    public function restartConsumer():void
     {
-        // TODO: Implement restarting of consumer
+        if ($this->consumer instanceof BaseConsumer) {
+            // Process current message, then halt consumer
+            $this->consumer->forceStopConsumer();
+
+            // Halt consumer if waiting for a new message from the queue
+            try {
+                $this->consumer->start();
+            } catch (\ErrorException $e) {
+            }
+        }
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
         $this
             ->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
             ->addOption('messages', 'm', InputOption::VALUE_OPTIONAL, 'Messages to consume', 0)
             ->addOption('route', 'r', InputOption::VALUE_OPTIONAL, 'Routing Key', '')
-            ->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process (MB)', null)
+            ->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process (MB)')
             ->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging')
             ->addOption('without-signals', 'w', InputOption::VALUE_NONE, 'Disable catching of system signals')
         ;
@@ -52,15 +70,10 @@ protected function configure()
     /**
      * Executes the current command.
      *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     *
-     * @return integer 0 if everything went fine, or an error code
-     *
      * @throws \InvalidArgumentException When the number of messages to consume is less than 0
      * @throws \BadFunctionCallException When the pcntl is not installed and option -s is true
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (defined('AMQP_WITHOUT_SIGNALS') === false) {
             define('AMQP_WITHOUT_SIGNALS', $input->getOption('without-signals'));
@@ -87,17 +100,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $this->initConsumer($input);
 
-        return $this->consumer->consume($this->amount);
+        return $this->consumer->consume((int)$this->amount);
     }
 
-    protected function initConsumer($input)
+    protected function initConsumer(InputInterface $input): void
     {
         $this->consumer = $this->getContainer()
                 ->get(sprintf($this->getConsumerService(), $input->getArgument('name')));
 
-        if (!is_null($input->getOption('memory-limit')) && ctype_digit((string) $input->getOption('memory-limit')) && $input->getOption('memory-limit') > 0) {
+        if (!is_null($input->getOption('memory-limit')) && ctype_digit((string) $input->getOption('memory-limit')) && (int)$input->getOption('memory-limit') > 0) {
             $this->consumer->setMemoryLimit($input->getOption('memory-limit'));
         }
         $this->consumer->setRoutingKey($input->getOption('route'));
+
+        $this->consumer->setContext($input->getArgument('context'));
     }
 }

Command/BaseRabbitMqCommand.php

@@ -16,15 +16,12 @@ abstract class BaseRabbitMqCommand extends Command implements ContainerAwareInte
     /**
      * {@inheritDoc}
      */
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null): void
     {
         $this->container = $container;
     }
 
-    /**
-     * @return ContainerInterface
-     */
-    public function getContainer()
+    public function getContainer(): ContainerInterface
     {
         return $this->container;
     }

Command/BatchConsumerCommand.php

@@ -16,7 +16,7 @@ final class BatchConsumerCommand extends BaseRabbitMqCommand
      */
     protected $consumer;
 
-    public function stopConsumer()
+    public function stopConsumer(): void
     {
         if ($this->consumer instanceof BatchConsumer) {
             // Process current message, then halt consumer
@@ -29,7 +29,7 @@ public function stopConsumer()
         }
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -38,25 +38,25 @@ protected function configure()
             ->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
             ->addOption('batches', 'b', InputOption::VALUE_OPTIONAL, 'Number of batches to consume', 0)
             ->addOption('route', 'r', InputOption::VALUE_OPTIONAL, 'Routing Key', '')
-            ->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process', null)
+            ->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process')
             ->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging')
             ->addOption('without-signals', 'w', InputOption::VALUE_NONE, 'Disable catching of system signals')
             ->setDescription('Executes a Batch Consumer');
-        ;
     }
 
     /**
      * Executes the current command.
      *
+
      * @param   InputInterface      $input      An InputInterface instance
      * @param   OutputInterface     $output     An OutputInterface instance
      *
      * @return  integer                         0 if everything went fine, or an error code
      *
-     * @throws  \InvalidArgumentException       When the number of batches to consume is less than 0
-     * @throws  \BadFunctionCallException       When the pcntl is not installed and option -s is true
+     * @throws  \InvalidArgumentException       When the number of messages to consume is less than 0
+     * @throws  \BadFunctionCallException|\ErrorException       When the pcntl is not installed and option -s is true
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (defined('AMQP_WITHOUT_SIGNALS') === false) {
             define('AMQP_WITHOUT_SIGNALS', $input->getOption('without-signals'));
@@ -86,10 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         return $this->consumer->consume($batchAmountTarget);
     }
 
-    /**
-     * @param   InputInterface  $input
-     */
-    protected function initConsumer(InputInterface $input)
+    protected function initConsumer(InputInterface $input): void
     {
         $this->consumer = $this->getContainer()
             ->get(sprintf($this->getConsumerService(), $input->getArgument('name')));
@@ -103,10 +100,7 @@ protected function initConsumer(InputInterface $input)
         $this->consumer->setRoutingKey($input->getOption('route'));
     }
 
-    /**
-     * @return  string
-     */
-    protected function getConsumerService()
+    protected function getConsumerService(): string
     {
         return 'old_sound_rabbit_mq.%s_batch';
     }

Command/ConsumerCommand.php

@@ -4,14 +4,14 @@
 
 class ConsumerCommand extends BaseConsumerCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
         $this->setDescription('Executes a consumer');
         $this->setName('rabbitmq:consumer');
     }
 
-    protected function getConsumerService()
+    protected function getConsumerService(): string
     {
         return 'old_sound_rabbit_mq.%s_consumer';
     }

Command/DeleteCommand.php

@@ -13,7 +13,7 @@
  */
 class DeleteCommand extends ConsumerCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
              ->setDescription('Delete a consumer\'s queue')
@@ -22,13 +22,7 @@ protected function configure()
         $this->setName('rabbitmq:delete');
     }
 
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     *
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $noConfirmation = (bool) $input->getOption('no-confirmation');
 

Command/DynamicConsumerCommand.php

@@ -10,11 +10,13 @@
  */
 namespace OldSound\RabbitMqBundle\Command;
 
+use OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 
 class DynamicConsumerCommand extends BaseConsumerCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -25,12 +27,12 @@ protected function configure()
             ;
     }
 
-    protected function getConsumerService()
+    protected function getConsumerService(): string
     {
         return 'old_sound_rabbit_mq.%s_dynamic';
     }
 
-    protected function initConsumer($input)
+    protected function initConsumer(InputInterface $input): void
     {
         parent::initConsumer($input);
         $this->consumer->setContext($input->getArgument('context'));

Command/MultipleConsumerCommand.php

@@ -3,10 +3,11 @@
 namespace OldSound\RabbitMqBundle\Command;
 
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 
 class MultipleConsumerCommand extends BaseConsumerCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -16,12 +17,12 @@ protected function configure()
         ;
     }
 
-    protected function getConsumerService()
+    protected function getConsumerService(): string
     {
         return 'old_sound_rabbit_mq.%s_multiple';
     }
 
-    protected function initConsumer($input)
+    protected function initConsumer(InputInterface $input): void
     {
         parent::initConsumer($input);
         $this->consumer->setContext($input->getArgument('context'));

Command/PurgeConsumerCommand.php

@@ -13,7 +13,7 @@
  */
 class PurgeConsumerCommand extends ConsumerCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
              ->setDescription('Purge a consumer\'s queue')
@@ -22,13 +22,7 @@ protected function configure()
         $this->setName('rabbitmq:purge');
     }
 
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     *
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $noConfirmation = (bool) $input->getOption('no-confirmation');
 
@@ -50,7 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->consumer = $this->getContainer()
             ->get(sprintf($this->getConsumerService(), $input->getArgument('name')));
-        $this->consumer->purge($input->getArgument('name'));
+        $this->consumer->purge();
 
         return 0;
     }

Command/RpcServerCommand.php

@@ -9,7 +9,7 @@
 
 class RpcServerCommand extends BaseRabbitMqCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -32,7 +32,7 @@ protected function configure()
      *
      * @throws \InvalidArgumentException When the number of messages to consume is less than 0
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         define('AMQP_DEBUG', (bool) $input->getOption('debug'));
         $amount = $input->getOption('messages');

Command/SetupFabricCommand.php

@@ -9,7 +9,7 @@
 
 class SetupFabricCommand extends BaseRabbitMqCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('rabbitmq:setup-fabric')
@@ -18,7 +18,7 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (defined('AMQP_DEBUG') === false) {
             define('AMQP_DEBUG', (bool) $input->getOption('debug'));