Merge branch 'v5.4'

Author: vyuldashev

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -35,19 +35,22 @@ class RabbitMQJob extends Job implements JobContract
      * @param \PhpAmqpLib\Channel\AMQPChannel                             $channel
      * @param string                                                      $queue
      * @param \PhpAmqpLib\Message\AMQPMessage                             $message
+     * @param string                                                      $connectionName
      */
     public function __construct(
         Container $container,
         RabbitMQQueue $connection,
         AMQPChannel $channel,
         $queue,
-        AMQPMessage $message
+        AMQPMessage $message,
+        $connectionName
     ) {
         $this->container = $container;
         $this->connection = $connection;
         $this->channel = $channel;
         $this->queue = $queue;
         $this->message = $message;
+        $this->connectionName = $connectionName;
     }
 
     /**

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -165,7 +165,14 @@ public function pop($queue = null)
             $message = $this->channel->basic_get($queue);
 
             if ($message instanceof AMQPMessage) {
-                return new RabbitMQJob($this->container, $this, $this->channel, $queue, $message);
+                return new RabbitMQJob(
+                    $this->container,
+                    $this,
+                    $this->channel,
+                    $queue,
+                    $message,
+                    $this->connectionName
+                );
             }
         } catch (ErrorException $exception) {
             $this->reportConnectionError('pop', $exception);