fix connectionName.

Author: freyhsiao

src/Queue/CMQQueue.php

@@ -29,12 +29,12 @@ class CMQQueue extends Queue implements QueueContract
     protected $topicOptions;
 
     /**
-     * @var Account
+     * @var \Freyo\LaravelQueueCMQ\Queue\Driver\Account
      */
     private $queueAccount;
 
     /**
-     * @var Account
+     * @var \Freyo\LaravelQueueCMQ\Queue\Driver\Account
      */
     private $topicAccount;
 
@@ -46,13 +46,13 @@ class CMQQueue extends Queue implements QueueContract
     /**
      * @var \ReflectionMethod
      */
-    private static $createPayload;
+    private $createPayload;
 
     /**
      * CMQQueue constructor.
      *
-     * @param Account $queueAccount
-     * @param Account $topicAccount
+     * @param \Freyo\LaravelQueueCMQ\Queue\Driver\Account $queueAccount
+     * @param \Freyo\LaravelQueueCMQ\Queue\Driver\Account $topicAccount
      * @param array $config
      *
      * @throws \ReflectionException
@@ -67,7 +67,7 @@ public function __construct(Account $queueAccount, Account $topicAccount, array
 
         $this->plainOptions = Arr::get($config, 'plain', []);
 
-        self::$createPayload = new \ReflectionMethod($this, 'createPayload');
+        $this->createPayload = new \ReflectionMethod($this, 'createPayload');
     }
 
     /**
@@ -116,7 +116,7 @@ public function push($job, $data = '', $queue = null)
             return $this->pushRaw($job->getPayload(), $queue);
         }
 
-        $payload = self::$createPayload->getNumberOfParameters() === 3
+        $payload = $this->createPayload->getNumberOfParameters() === 3
             ? $this->createPayload($job, $queue, $data) // version >= 5.7
             : $this->createPayload($job, $data);
 
@@ -186,7 +186,7 @@ public function later($delay, $job, $data = '', $queue = null)
             return $this->pushRaw($job->getPayload(), $queue, ['delay' => $delay]);
         }
 
-        $payload = self::$createPayload->getNumberOfParameters() === 3
+        $payload = $this->createPayload->getNumberOfParameters() === 3
             ? $this->createPayload($job, $queue, $data) // version >= 5.7
             : $this->createPayload($job, $data);
 
@@ -212,7 +212,7 @@ public function pop($queue = null)
             throw $e;
         }
 
-        return new CMQJob($this->container, $this, $message, $queue);
+        return new CMQJob($this->container, $this, $message, $queue, $this->connectionName);
     }
 
     /**

src/Queue/Jobs/CMQJob.php

@@ -11,15 +11,32 @@
 
 class CMQJob extends Job implements JobContract
 {
+    /**
+     * @var \Freyo\LaravelQueueCMQ\Queue\CMQQueue
+     */
     protected $connection;
+
+    /**
+     * @var \Freyo\LaravelQueueCMQ\Queue\Driver\Message
+     */
     protected $message;
 
-    public function __construct(Container $container, CMQQueue $connection, Message $message, Queue $queue)
+    /**
+     * Create a new job instance.
+     *
+     * @param \Illuminate\Container\Container $container
+     * @param \Freyo\LaravelQueueCMQ\Queue\CMQQueue $connection
+     * @param \Freyo\LaravelQueueCMQ\Queue\Driver\Message $message
+     * @param \Freyo\LaravelQueueCMQ\Queue\Driver\Queue $queue
+     * @param string $connectionName
+     */
+    public function __construct(Container $container, CMQQueue $connection, Message $message, Queue $queue, $connectionName)
     {
         $this->container = $container;
         $this->connection = $connection;
         $this->message = $message;
         $this->queue = $queue->getQueueName();
+        $this->connectionName = $connectionName;
     }
 
     /**