resolve vyuldashev#187 issue

Author: vyuldashev

config/rabbitmq.php

@@ -26,6 +26,8 @@
     'login' => env('RABBITMQ_LOGIN', 'guest'),
     'password' => env('RABBITMQ_PASSWORD', 'guest'),
 
+    'queue' => env('RABBITMQ_QUEUE', 'default'),
+
     'options' => [
 
         'exchange' => [
@@ -49,11 +51,6 @@
 
         'queue' => [
 
-            /*
-            * The name of default queue.
-            */
-            'name' => env('RABBITMQ_QUEUE', 'default'),
-
             /*
             * Determine if queue should be created if it does not exist.
             */

src/Queue/RabbitMQQueue.php

@@ -17,6 +17,7 @@ class RabbitMQQueue extends Queue implements QueueContract
 {
     protected $sleepOnError;
 
+    protected $queueName;
     protected $queueOptions;
     protected $exchangeOptions;
 
@@ -33,6 +34,7 @@ public function __construct(AmqpContext $context, array $config)
     {
         $this->context = $context;
 
+        $this->queueName = $config['queue'] ?? $config['options']['queue']['name'];
         $this->queueOptions = $config['options']['queue'];
         $this->queueOptions['arguments'] = isset($this->queueOptions['arguments']) ?
             json_decode($this->queueOptions['arguments'], true) : [];
@@ -182,7 +184,7 @@ public function getContext(): AmqpContext
      */
     private function declareEverything(string $queueName = null): array
     {
-        $queueName = $queueName ?: $this->queueOptions['name'];
+        $queueName = $queueName ?: $this->queueName;
         $exchangeName = $this->exchangeOptions['name'] ?: $queueName;
 
         $topic = $this->context->createTopic($exchangeName);