From d096fa1ec97784dd205f266f3c53987a9ff2f013 Mon Sep 17 00:00:00 2001 From: Denisson Leal Date: Wed, 16 Oct 2019 22:28:26 -0300 Subject: [PATCH 1/2] fix find null failed job --- .../Mongodb/Queue/Failed/MongoFailedJobProvider.php | 4 ++++ tests/QueueTest.php | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php b/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php index a02639f88..bea7c6a74 100644 --- a/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php +++ b/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php @@ -46,6 +46,10 @@ public function find($id) { $job = $this->getTable()->find($id); + if (!$job) { + return null; + } + $job['id'] = (string) $job['_id']; return (object) $job; diff --git a/tests/QueueTest.php b/tests/QueueTest.php index 6ff26d35c..21306bfb1 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -55,4 +55,12 @@ public function testQueueJobExpired(): void $job->delete(); $this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count()); } + + public function testFindFailJobNull(): void + { + Config::set('queue.failed.database', 'mongodb'); + $provider = app('queue.failer'); + + $this->assertNull($provider->find(1)); + } } From b040f1426af748cb8e2bbecf36098dd599ef1abc Mon Sep 17 00:00:00 2001 From: Denisson Leal Date: Wed, 16 Oct 2019 22:33:22 -0300 Subject: [PATCH 2/2] fix standards --- src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php b/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php index bea7c6a74..9067a2838 100644 --- a/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php +++ b/src/Jenssegers/Mongodb/Queue/Failed/MongoFailedJobProvider.php @@ -47,7 +47,7 @@ public function find($id) $job = $this->getTable()->find($id); if (!$job) { - return null; + return; } $job['id'] = (string) $job['_id'];