laravel 6

Author: vyuldashev

.travis.yml

@@ -1,13 +1,9 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
 
-env:
-  - DOCKER_COMPOSE_VERSION=1.23.2
-
 services:
   - docker
 
@@ -17,7 +13,7 @@ cache:
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
 

composer.json

@@ -9,17 +9,17 @@
     }
   ],
   "require": {
-    "php": "^7.1.3",
+    "php": "^7.2",
     "ext-json": "*",
-    "illuminate/database": "5.7.*|5.8.*",
-    "illuminate/support": "5.7.*|5.8.*",
-    "illuminate/queue": "5.7.*|5.8.*",
+    "illuminate/database": "^6.0",
+    "illuminate/support": "^6.0",
+    "illuminate/queue": "^6.0",
     "enqueue/amqp-lib": "0.9.*",
     "queue-interop/amqp-interop": "0.8.*"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0",
-    "illuminate/events": "5.7.*|5.8.*",
+    "illuminate/events": "^6.0",
     "mockery/mockery": "^1.0",
     "laravel/horizon": "^3.0"
   },
@@ -35,7 +35,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "8.0-dev"
+      "dev-master": "9.0-dev"
     },
     "laravel": {
       "providers": [

src/Queue/Jobs/RabbitMQJob.php

@@ -9,14 +9,14 @@
 use Interop\Amqp\AmqpConsumer;
 use Illuminate\Queue\Jobs\JobName;
 use Illuminate\Container\Container;
-use Illuminate\Database\DetectsDeadlocks;
+use Illuminate\Database\DetectsLostConnections;
 use Illuminate\Contracts\Queue\Job as JobContract;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
 
 class RabbitMQJob extends Job implements JobContract
 {
-    use DetectsDeadlocks;
+    use DetectsLostConnections;
 
     /**
      * Same as RabbitMQQueue, used for attempt counts.
@@ -58,7 +58,7 @@ public function fire(): void
             with($this->instance = $this->resolve($class))->{$method}($this, $payload['data']);
         } catch (Exception $exception) {
             if (
-                $this->causedByDeadlock($exception) ||
+                $this->causedByLostConnection($exception) ||
                 Str::contains($exception->getMessage(), ['detected deadlock'])
             ) {
                 sleep(2);
@@ -136,7 +136,6 @@ public function release($delay = 0): void
      * Get the job identifier.
      *
      * @return string
-     * @throws \Interop\Queue\Exception
      */
     public function getJobId(): string
     {
@@ -171,7 +170,7 @@ protected function unserialize(array $body)
             return unserialize($body['data']['command']);
         } catch (Exception $exception) {
             if (
-                $this->causedByDeadlock($exception) ||
+                $this->causedByLostConnection($exception) ||
                 Str::contains($exception->getMessage(), ['detected deadlock'])
             ) {
                 sleep(2);