[change-req] implemented change requests

Author: Bogdan Rancichi

Command/BatchConsumerCommand.php

@@ -9,16 +9,13 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class BatchConsumerCommand extends BaseRabbitMqCommand
+final class BatchConsumerCommand extends BaseRabbitMqCommand
 {
     /**
      * @var BatchConsumer
      */
     protected $consumer;
 
-    /**
-     * @return  void
-     */
     public function stopConsumer()
     {
         if ($this->consumer instanceof BatchConsumer) {
@@ -32,12 +29,6 @@ public function stopConsumer()
         }
     }
 
-    public function restartConsumer()
-    {
-        // TODO: Implement restarting of consumer
-    }
-
-
     protected function configure()
     {
         parent::configure();
@@ -97,7 +88,10 @@ protected function initConsumer(InputInterface $input)
         $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 (null !== $input->getOption('memory-limit') &&
+            ctype_digit((string) $input->getOption('memory-limit')) &&
+            $input->getOption('memory-limit') > 0
+        ) {
             $this->consumer->setMemoryLimit($input->getOption('memory-limit'));
         }
         $this->consumer->setRoutingKey($input->getOption('route'));

README.md

@@ -776,7 +776,7 @@ batch_consumers:
         idle_timeout_exit_code: -2
 ```
 
-You can implement a batch consumer that will acknoledge all messages in one return or you can have control on what message to acknoledge.
+You can implement a batch consumer that will acknowledge all messages in one return or you can have control on what message to acknoledge.
 
 ```php
 namespace AppBundle\Service;
@@ -800,8 +800,9 @@ class DevckBasicConsumer implements BatchConsumerInterface
         return true; 
     }
 }
-
 ```
+
+```php
 namespace AppBundle\Service;
 
 use OldSound\RabbitMqBundle\RabbitMq\BatchConsumerInterface;

RabbitMq/BatchConsumer.php

@@ -7,57 +7,57 @@
 use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage;
 
-class BatchConsumer extends BaseAmqp implements DequeuerInterface
+final class BatchConsumer extends BaseAmqp implements DequeuerInterface
 {
     /**
      * @var int
      */
-    protected $consumed = 0;
+    private $consumed = 0;
 
     /**
      * @var \Closure|callable
      */
-    protected $callback;
+    private $callback;
 
     /**
      * @var bool
      */
-    protected $forceStop = false;
+    private $forceStop = false;
 
     /**
      * @var int
      */
-    protected $idleTimeout = 0;
+    private $idleTimeout = 0;
 
     /**
      * @var int
      */
-    protected $idleTimeoutExitCode;
+    private $idleTimeoutExitCode;
 
     /**
      * @var int
      */
-    protected $memoryLimit = null;
+    private $memoryLimit = null;
 
     /**
      * @var int
      */
-    protected $prefetchCount;
+    private $prefetchCount;
 
     /**
      * @var int
      */
-    protected $timeoutWait = 3;
+    private $timeoutWait = 3;
 
     /**
      * @var array
      */
-    protected $messages = array();
+    private $messages = array();
 
     /**
      * @var int
      */
-    protected $batchCounter = 0;
+    private $batchCounter = 0;
 
     /**
      * @param   \Closure|callable    $callback
@@ -86,7 +86,7 @@ public function execute(AMQPMessage $msg)
 
         $this->maybeStopConsumer();
 
-        if (!is_null($this->getMemoryLimit()) && $this->isRamAlmostOverloaded()) {
+        if (null !== $this->getMemoryLimit() && $this->isRamAlmostOverloaded()) {
             $this->stopConsuming();
         }
     }
@@ -188,7 +188,7 @@ protected function handleProcessMessages($processFlags = null)
         $this->consumed++;
         $this->maybeStopConsumer();
 
-        if (!is_null($this->getMemoryLimit()) && $this->isRamAlmostOverloaded()) {
+        if (null !== $this->getMemoryLimit() && $this->isRamAlmostOverloaded()) {
             $this->stopConsuming();
         }
     }