Add Laravel 8 support

Author: Watercycle

.travis.yml

@@ -2,7 +2,6 @@ dist: trusty
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
@@ -18,7 +17,7 @@ cache:
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.0
       env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
 
 before_script:

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to `expbackoffworker` will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [3.0.0] - 2021-08-01
+
+### Added
+- Compatibility with Laravel 8
+
+### Removed
+- Compatibility with Laravel 5 and 6 _(use `2.X.X` instead)_
+- Compatibility with PHP 5.6 _(officially; it was broken already)_
+
 ## [2.1.0] - 2019-06-06
 
 ### Added

composer.json

@@ -11,9 +11,9 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
-        "illuminate/queue": "5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*",
-        "illuminate/support": "5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*"
+        "php": ">=7.0",
+        "illuminate/queue": "8.*",
+        "illuminate/support": "8.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0"

src/QueueServiceProvider.php

@@ -12,16 +12,25 @@ class QueueServiceProvider extends IlluminateQueueServiceProvider
      */
     protected function registerWorker()
     {
-        $this->app->singleton('queue.worker', function () {
+        $this->app->singleton('queue.worker', function ($app) {
             $isDownForMaintenance = function () {
                 return $this->app->isDownForMaintenance();
             };
 
+            $resetScope = function () use ($app) {
+                if (method_exists($app['log']->driver(), 'withoutContext')) {
+                    $app['log']->withoutContext();
+                }
+
+                return $app->forgetScopedInstances();
+            };
+
             return new Worker(
-                $this->app['queue'],
-                $this->app['events'],
-                $this->app[ExceptionHandler::class],
-                $isDownForMaintenance
+                $app['queue'],
+                $app['events'],
+                $app[ExceptionHandler::class],
+                $isDownForMaintenance,
+                $resetScope
             );
         });
     }

src/Worker.php

@@ -11,14 +11,14 @@ class Worker extends IlluminateQueueWorker
      * @param  string  $connectionName
      * @param  \Illuminate\Contracts\Queue\Job  $job
      * @param  \Illuminate\Queue\WorkerOptions  $options
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @return void
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
     protected function handleJobException($connectionName, $job, WorkerOptions $options, $e)
     {
-        $options->delay = (new GetDelay)($options->delay, $job->attempts());
+        $options->backoff = (new GetDelay)($options->backoff, $job->attempts());
 
         parent::handleJobException($connectionName, $job, $options, $e);
     }