Merge pull request vyuldashev#108 from pdscopes/master

[bugfix] laravel 5.4 now parses jobs uses JobName static method parse

Author: vyuldashev

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -7,14 +7,14 @@
 use Illuminate\Contracts\Queue\Job as JobContract;
 use Illuminate\Database\DetectsDeadlocks;
 use Illuminate\Queue\Jobs\Job;
+use Illuminate\Queue\Jobs\JobName;
 use Illuminate\Support\Str;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Message\AMQPMessage;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQJob extends Job implements JobContract
 {
-
     use DetectsDeadlocks;
 
     /**
@@ -30,20 +30,19 @@ class RabbitMQJob extends Job implements JobContract
     /**
      * Creates a new instance of RabbitMQJob.
      *
-     * @param \Illuminate\Container\Container $container
+     * @param \Illuminate\Container\Container                             $container
      * @param \VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue $connection
-     * @param \PhpAmqpLib\Channel\AMQPChannel $channel
-     * @param string $queue
-     * @param \PhpAmqpLib\Message\AMQPMessage $message
+     * @param \PhpAmqpLib\Channel\AMQPChannel                             $channel
+     * @param string                                                      $queue
+     * @param \PhpAmqpLib\Message\AMQPMessage                             $message
      */
     public function __construct(
         Container $container,
         RabbitMQQueue $connection,
         AMQPChannel $channel,
         $queue,
         AMQPMessage $message
-    )
-    {
+    ) {
         $this->container = $container;
         $this->connection = $connection;
         $this->channel = $channel;
@@ -53,14 +52,16 @@ public function __construct(
 
     /**
      * Fire the job.
-     * @return void
+     *
      * @throws Exception
+     *
+     * @return void
      */
     public function fire()
     {
         $payload = $this->payload();
 
-        list($class, $method) = $this->parseJob($payload['job']);
+        list($class, $method) = JobName::parse($payload['job']);
 
         $this->instance = $this->resolve($class);
 
@@ -73,6 +74,7 @@ public function fire()
             ) {
                 sleep(2);
                 $this->fire();
+
                 return;
             }
 
@@ -124,8 +126,10 @@ public function delete()
      * Release the job back into the queue.
      *
      * @param int $delay
-     * @return void
+     *
      * @throws Exception
+     *
+     * @return void
      */
     public function release($delay = 0)
     {
@@ -189,11 +193,13 @@ public function setJobId($id)
     }
 
     /**
-     * Unserialize job
+     * Unserialize job.
      *
      * @param array $body
-     * @return mixed
+     *
      * @throws Exception
+     *
+     * @return mixed
      */
     private function unserialize(array $body)
     {
@@ -205,11 +211,11 @@ private function unserialize(array $body)
                 Str::contains($exception->getMessage(), ['detected deadlock'])
             ) {
                 sleep(2);
+
                 return $this->unserialize($body);
             }
 
             throw $exception;
         }
     }
-
 }