Hotfix | Add support laravel 8 (#10)

* Fix for Laravel 8, because "stop()" does not exit the worker anymore.

* CS refactor and better reason explanation

Author: josvar

src/Worker.php

@@ -13,7 +13,7 @@
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Throwable;
 
-/*final*/ class Worker extends IlluminateWorker
+class Worker extends IlluminateWorker
 {
     /**
      * @var EntityManagerInterface
@@ -42,33 +42,39 @@ public function __construct(
     }
 
     /**
-     * Wrap parent::runJob to make sure we have a good EM.
+     * Wrap parent::getNextJob to make sure we have a good EM before processing the next job.
+     * This allow us to avoid incrementing the attempts on the job if the worker fails because of the EM.
      *
-     * Most exception handling is done in the parent method, so we consider any new
-     * exceptions to be a result of our setup.
+     * Get the next job from the queue connection.
      *
-     * @param \Illuminate\Contracts\Queue\Job $job
-     * @param string                          $connectionName
-     * @param WorkerOptions                   $options
+     * @param  \Illuminate\Contracts\Queue\Queue  $connection
+     * @param  string  $queue
+     * @return \Illuminate\Contracts\Queue\Job|null
      */
-    protected function runJob($job, $connectionName, WorkerOptions $options)
+    protected function getNextJob($connection, $queue)
     {
+        $exception = null;
+
         try {
             $this->assertEntityManagerOpen();
             $this->assertEntityManagerClear();
             $this->assertGoodDatabaseConnection();
-
-            parent::runJob($job, $connectionName, $options);
         } catch (EntityManagerClosedException $e) {
-            $this->exceptions->report($e);
-            $this->stop(1);
+            $exception = $e;
         } catch (Exception $e) {
-            $this->exceptions->report(new QueueSetupException("Error in queue setup while running a job", 0, $e));
-            $this->stop(1);
+            $exception = new QueueSetupException("Error in queue setup while getting next job", 0, $e);
         } catch (Throwable $e) {
-            $this->exceptions->report(new QueueSetupException("Error in queue setup while running a job", 0, new FatalThrowableError($e)));
-            $this->stop(1);
+            $exception = new QueueSetupException("Error in queue setup while getting next job", 0, new FatalThrowableError($e));
+        } 
+        
+        if ($exception) {
+            $this->shouldQuit = true;
+            $this->exceptions->report($exception);
+
+            return null;
         }
+
+        return parent::getNextJob($connection, $queue);
     }
 
     /**