making changes provided by @ivan1986 in branch 4.2

Author: vyuldashev

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

@@ -1,5 +1,6 @@
 <?php namespace FintechFab\LaravelQueueRabbitMQ\Queue\Jobs;
 
+use FintechFab\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Queue\Job as JobContract;
 use Illuminate\Queue\Jobs\Job;
@@ -10,18 +11,21 @@
 class RabbitMQJob extends Job implements JobContract
 {
 
+	protected $connection;
 	protected $channel;
 	protected $queue;
 	protected $message;
 
 	public function __construct(
 		Container $container,
+		RabbitMQQueue $connection,
 		AMQPChannel $channel,
 		$queue,
 		AMQPMessage $message
 	)
 	{
 		$this->container = $container;
+		$this->connection = $connection;
 		$this->channel = $channel;
 		$this->queue = $queue;
 		$this->message = $message;
@@ -91,11 +95,10 @@ public function release($delay = 0)
 		$job = $body['job'];
 		$data = $body['data'];
 
-		// push back to a queue
 		if ($delay > 0) {
-			Queue::later($delay, $job, $data, $this->getQueue());
+			$this->connection->later($delay, $job, $data, $this->getQueue());
 		} else {
-			Queue::push($job, $data, $this->getQueue());
+			$this->connection->push($job, $data, $this->getQueue());
 		}
 	}
 

src/FintechFab/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -4,7 +4,6 @@
 use FintechFab\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Queue;
-use Illuminate\Queue\QueueInterface;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AMQPConnection;
 use PhpAmqpLib\Message\AMQPMessage;
@@ -45,19 +44,7 @@ public function __construct(AMQPConnection $amqpConnection, $config)
 	 */
 	public function push($job, $data = '', $queue = null)
 	{
-		$queue = $this->getQueueName($queue);
-		$payload = $this->createPayload($job, $data);
-		$this->declareQueue($queue);
-
-		// push job to a queue
-		$message = new AMQPMessage($payload, [
-			'Content-Type'  => 'application/json',
-			'delivery_mode' => 2,
-		]);
-
-		$this->channel->basic_publish($message, $queue, $queue);
-
-		return true;
+		return $this->pushRaw($this->createPayload($job, $data), $queue, []);
 	}
 
 	/**
@@ -73,6 +60,9 @@ public function pushRaw($payload, $queue = null, array $options = [])
 	{
 		$queue = $this->getQueueName($queue);
 		$this->declareQueue($queue);
+		if (isset($options['delay'])) {
+			$queue = $this->declareDelayedQueue($queue, $options['delay']);
+		}
 
 		// push job to a queue
 		$message = new AMQPMessage($payload, [
@@ -98,19 +88,7 @@ public function pushRaw($payload, $queue = null, array $options = [])
 	 */
 	public function later($delay, $job, $data = '', $queue = null)
 	{
-		$payload = $this->createPayload($job, $data);
-		$this->declareQueue($queue);
-		$queue = $this->declareDelayedQueue($queue, $delay);
-
-		// push job to a queue
-		$message = new AMQPMessage($payload, [
-			'Content-Type'  => 'application/json',
-			'delivery_mode' => 2,
-		]);
-
-		$this->channel->basic_publish($message, $queue, $queue);
-
-		return true;
+		return $this->pushRaw($this->createPayload($job, $data), $queue, ['delay' => $delay]);
 	}
 
 	/**
@@ -131,7 +109,7 @@ public function pop($queue = null)
 		$message = $this->channel->basic_get($queue);
 
 		if ($message instanceof AMQPMessage) {
-			return new RabbitMQJob($this->container, $this->channel, $queue, $message);
+			return new RabbitMQJob($this->container, $this, $this->channel, $queue, $message);
 		}
 
 		return null;