Merge pull request #29 from lukewaite/fix_batch_queue_retry

fix: Correctly set the queue on construction of a BatchJob

Author: lukewaite

composer.json

@@ -24,7 +24,7 @@
   },
   "require-dev": {
     "mockery/mockery": "^0.9.6",
-    "laravel/framework": ">5.1.0 <5.4",
+    "laravel/framework": ">5.1.0 <5.2",
     "phpunit/phpunit": "~4.8",
     "squizlabs/php_codesniffer": "^2.8",
     "scrutinizer/ocular": "^1.3"

src/Console/QueueWorkBatchCommand.php

@@ -53,6 +53,12 @@ public function fire()
         }
     }
 
+    /**
+     * @return array|null
+     * @throws JobNotFoundException
+     * @throws UnsupportedException
+     * @throws \Throwable
+     */
     protected function runJob()
     {
         $maxTries = $this->option('tries');
@@ -68,7 +74,7 @@ protected function runJob()
             throw new UnsupportedException('queue:work-batch can only be run on batch queues');
         }
 
-        $job = $connection->getJobById($jobId, $connectionName);
+        $job = $connection->getJobById($jobId);
 
         // If we're able to pull a job off of the stack, we will process it and
         // then immediately return back out.

src/Queues/BatchQueue.php

@@ -94,7 +94,12 @@ protected function pushToBatch($queue, $payload, $jobName)
         return $jobId;
     }
 
-    public function getJobById($id, $queue)
+    /**
+     * @param $id
+     * @return BatchJob
+     * @throws JobNotFoundException
+     */
+    public function getJobById($id)
     {
         $job = $this->database->table($this->table)->where('id', $id)->first();
         if (!isset($job)) {
@@ -105,7 +110,7 @@ public function getJobById($id, $queue)
             $this->container,
             $this,
             $job,
-            $queue
+            $job->queue
         );
     }
 

tests/BatchQueueTest.php

@@ -75,8 +75,10 @@ public function testGetJobById()
         $query->shouldReceive('where')->once()->with('id', 1)->andReturn($results = m::mock('StdClass'));
         $results->shouldReceive('first')->once()->andReturn($queryResult = m::mock('StdClass'));
         $queryResult->attempts = 0;
+        $queryResult->queue = 'defaultQueue';
 
-        $this->queue->getJobById(1, 'default');
+        $job = $this->queue->getJobById(1, 'default');
+        $this->assertEquals('defaultQueue', $job->getQueue());
     }
 
     public function testRelease()