Fix multiple issues

Author: lukewaite

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Fixed
 * Correct sanitation of job names which previously blocked creation of class based batch jobs
+* Fix: Failing jobs throw exception when logging about failing (Array to String Conversion)
+* Fix: `BatchQueue` methods `->push` and `->update` now return the `id` of the entry
+* Fix: BatchQueue now properly releases failed jobs back into the queue
 
 ## v0.2.0 (2017-04-07)
 

composer.json

@@ -1,7 +1,12 @@
 {
   "name": "lukewaite/laravel-queue-aws-batch",
   "description": "Laravel Queue for AWS Batch, enabling users to submit jobs for processing to a Batch queue.",
-  "keywords": ["laravel", "aws", "batch", "queue"],
+  "keywords": [
+    "laravel",
+    "aws",
+    "batch",
+    "queue"
+  ],
   "license": "MIT",
   "autoload": {
     "psr-4": {
@@ -20,6 +25,10 @@
   "require-dev": {
     "mockery/mockery": "^0.9.6",
     "laravel/framework": "~5.1.0",
-    "phpunit/phpunit": "~4.8"
+    "phpunit/phpunit": "~4.8",
+    "squizlabs/php_codesniffer": "^2.8"
+  },
+  "scripts": {
+    "cs": "phpcs --standard=psr2 src/"
   }
-}
+}

src/Console/QueueWorkBatchCommand.php

@@ -49,14 +49,14 @@ public function fire()
                 $this->exceptions->report($e);
             }
             $this->error($e->getMessage());
-            $this->error($e->getTrace());
+            $this->error($e->getTraceAsString());
             exit(1);
         } catch (\Throwable $e) {
             if ($this->exceptions) {
                 $this->exceptions->report(new FatalThrowableError($e));
             }
             $this->error($e->getMessage());
-            $this->error($e->getTrace());
+            $this->error($e->getTraceAsString());
             exit(1);
         }
     }
@@ -82,7 +82,10 @@ protected function runJob()
         // then immediately return back out.
         if (!is_null($job)) {
             return $this->worker->process(
-                $this->manager->getName($connectionName), $job, $maxTries, $delay
+                $this->manager->getName($connectionName),
+                $job,
+                $maxTries,
+                $delay
             );
         }
 

src/Queues/BatchQueue.php

@@ -76,20 +76,22 @@ protected function getDisplayName($job)
      * @param string      $payload
      * @param string      $jobName
      *
-     * @return mixed
+     * @return int
      */
     protected function pushToBatch($queue, $payload, $jobName)
     {
         $jobId = $this->pushToDatabase(0, $queue, $payload);
 
-        return $this->batch->submitJob([
+        $this->batch->submitJob([
             'jobDefinition' => $this->jobDefinition,
             'jobName'       => $jobName,
             'jobQueue'      => $this->getQueue($queue),
             'parameters'    => [
                 'jobId' => $jobId,
             ]
         ]);
+
+        return $jobId;
     }
 
     public function getJobById($id, $queue)
@@ -100,7 +102,10 @@ public function getJobById($id, $queue)
         }
 
         return new BatchJob(
-            $this->container, $this, $job, $queue
+            $this->container,
+            $this,
+            $job,
+            $queue
         );
     }
 
@@ -120,19 +125,17 @@ public function release($queue, $job, $delay)
             throw new UnsupportedException('The BatchJob does not support releasing back onto the queue with a delay');
         }
 
-        $attributes = [
-            'id'          => $job->id,
+        return $this->database->table($this->table)->where('id', $job->id)->update([
             'attempts'    => $job->attempts,
             'reserved'    => 0,
-            'reserved_at' => null,
-        ];
-
-        return $this->database->table($this->table)->update($attributes);
+            'reserved_at' => null
+        ]);
     }
 
     public function pop($queue = null)
     {
-        throw new UnsupportedException('The BatchQueue does not support running via a regular worker. Instead, you should use the queue:batch-work command with a job id.');
+        throw new UnsupportedException('The BatchQueue does not support running via a regular worker. ' .
+            'Instead, you should use the queue:batch-work command with a job id.');
     }
 
     public function bulk($jobs, $data = '', $queue = null)

tests/BatchQueueTest.php

@@ -14,7 +14,6 @@ public function tearDown()
 
     public function setUp()
     {
-        /** @var \LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue $queue */
         $this->queue = $this->getMockBuilder('LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue')->setMethods(null)->setConstructorArgs([
             $this->database = m::mock('Illuminate\Database\Connection'),
             'table',
@@ -50,7 +49,8 @@ public function testPushProperlyPushesJobOntoDatabase()
             $this->assertEquals(['jobId' => 100], $array['parameters']);
         });
 
-        $this->queue->push('foo', ['data']);
+        $result = $this->queue->push('foo', ['data']);
+        $this->assertEquals(100, $result);
     }
 
     public function testPushProperlySanitizesJobName()
@@ -81,21 +81,22 @@ public function testGetJobById()
 
     public function testRelease()
     {
-        $this->database->shouldReceive('table')->once()->with('table')->andReturn($query = m::mock('StdClass'));
+        $this->database->shouldReceive('table')->once()->with('table')->andReturn($table = m::mock('StdClass'));
+        $table->shouldReceive('where')->once()->with('id', 4)->andReturn($query = m::mock('StdClass'));
         $query->shouldReceive('update')->once()->with([
-            'id'          => 4,
             'attempts'    => 1,
             'reserved'    => 0,
             'reserved_at' => null,
-        ]);
+        ])->andReturn(4);
 
         $job = new \stdClass();
         $job->payload = '{"job":"foo","data":["data"]}';
         $job->id = 4;
         $job->queue = 'default';
         $job->attempts = 1;
 
-        $this->queue->release('default', $job, 0);
+        $result = $this->queue->release('default', $job, 0);
+        $this->assertEquals(4, $result);
     }
 
     /**