Moves queue arguments decoding from config to RabbitMQQueue constructor. JSON decoding doesn't seem right to be in the config file.

Author: Ratko Rudic

config/rabbitmq.php

@@ -39,7 +39,7 @@
         'durable'     => env('RABBITMQ_QUEUE_DURABLE', true),
         'exclusive'   => env('RABBITMQ_QUEUE_EXCLUSIVE', false),
         'auto_delete' => env('RABBITMQ_QUEUE_AUTODELETE', false),
-        'arguments'   => json_decode(env('RABBITMQ_QUEUE_ARGUMENTS', '{}'), 1),
+        'arguments'   => env('RABBITMQ_QUEUE_ARGUMENTS', null),
     ],
     'exchange_params' => [
         'name' => env('RABBITMQ_EXCHANGE_NAME', null),

src/Queue/RabbitMQQueue.php

@@ -33,6 +33,7 @@ class RabbitMQQueue extends Queue implements QueueContract
 
     protected $defaultQueue;
     protected $configQueue;
+    protected $configQueueArguments;
     protected $configExchange;
 
     /**
@@ -54,6 +55,7 @@ public function __construct(AMQPStreamConnection $amqpConnection, $config)
         $this->connection = $amqpConnection;
         $this->defaultQueue = $config['queue'];
         $this->configQueue = $config['queue_params'];
+        $this->configQueueArguments = json_decode($this->configQueue['arguments'], 1) ?: [];
         $this->configExchange = $config['exchange_params'];
         $this->declareExchange = $config['exchange_declare'];
         $this->declareBindQueue = $config['queue_declare_bind'];
@@ -231,7 +233,7 @@ private function declareQueue($name)
                 $this->configQueue['exclusive'],
                 $this->configQueue['auto_delete'],
                 false,
-                new AMQPTable($this->configQueue['arguments'])
+                new AMQPTable($this->configQueueArguments)
             );
 
             // bind queue to the exchange
@@ -274,7 +276,7 @@ private function declareDelayedQueue($destination, $delay)
                     'x-dead-letter-exchange'    => $destinationExchange,
                     'x-dead-letter-routing-key' => $destination,
                     'x-message-ttl'             => $delay * 1000,
-                ], (array)$this->configQueue['arguments']);
+                ], (array)$this->configQueueArguments);
 
             $this->channel->queue_declare(
                 $name,

tests/RabbitMQConnectorTest.php

@@ -25,7 +25,7 @@ public function test_connect()
                 'durable'     => true,
                 'exclusive'   => false,
                 'auto_delete' => false,
-                'arguments'   => [],
+                'arguments'   => null,
             ],
             'exchange_params' => [
                 'name'        => null,

tests/RabbitMQQueueTest.php

@@ -32,7 +32,7 @@ public function setUp()
                 'durable'     => true,
                 'exclusive'   => false,
                 'auto_delete' => false,
-                'arguments'   => [],
+                'arguments'   => null,
             ],
             'exchange_params' => [
                 'name'        => 'exchange_name',