Merge remote-tracking branch 'origin/v4.2' into v5.0

Conflicts:
	README.md
	composer.json
	src/FintechFab/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php
	src/FintechFab/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

Author: vyuldashev

README.md

@@ -7,16 +7,10 @@ Require this package in your composer.json and run composer update (IMPORTANT! D
 
 	"fintech-fab/laravel-queue-rabbitmq": "5.0"
 
-or run:
-
-	composer require "fintech-fab/laravel-queue-rabbitmq"
-
 After composer update is finished you need to add ServiceProvider to your `providers` array in app.php:
 
-   
 	'FintechFab\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider',
 
-
 now you are able to configure your connections in queue.php:
 
 	return [
@@ -26,26 +20,30 @@ now you are able to configure your connections in queue.php:
 		'connections' => [
 
 			'rabbitmq' => [
-				'driver'         => 'rabbitmq',
-	
-				'host'           => '',
-				'port'           => '',
-	
-				'vhost'          => '',
-				'login'          => '',
-				'password'       => '',
-	
-				'queue'          => '', // name of the default queue
-	
-				'exchange_name'  => '', // name of the exchange
-	
-				// Type of your exchange
-				// Can be AMQP_EX_TYPE_DIRECT or AMQP_EX_TYPE_FANOUT
-				// see documentation for more info
-				// http://www.rabbitmq.com/tutorials/amqp-concepts.html
-				'exchange_type'  => AMQP_EX_TYPE_DIRECT,
-				'exchange_flags' => AMQP_DURABLE,
-	
+				'driver'          => 'rabbitmq',
+	
+				'host'            => '',
+				'port'            => 5672,
+	
+				'vhost'           => '/',
+				'login'           => '',
+				'password'        => '',
+	
+				'queue'           => '', // name of the default queue,
+	
+				'queue_params'    => [
+					'passive'     => false,
+					'durable'     => true,
+					'exclusive'   => false,
+					'auto_delete' => false,
+				],
+	
+				'exchange_params' => [
+					'type'        => 'direct', // more info at http://www.rabbitmq.com/tutorials/amqp-concepts.html
+					'passive'     => false,
+					'durable'     => true, // the exchange will survive server restarts
+					'auto_delete' => false, // the exchange won't be deleted once the channel is closed.
+				],
 
 			],
 

composer.json

@@ -12,10 +12,8 @@
   "require": {
     "php": ">=5.4.0",
     "illuminate/support": "5.0.*",
-    "illuminate/queue": "5.0.*"
-  },
-  "suggest": {
-    "ext-amqp": "PECL extension for the AMQP protocol - it won't work without"
+    "illuminate/queue": "5.0.*",
+    "videlalvaro/php-amqplib": "2.5.*"
   },
   "autoload": {
     "psr-0": {

src/FintechFab/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php

@@ -1,8 +1,8 @@
 <?php namespace FintechFab\LaravelQueueRabbitMQ\Queue\Connectors;
 
-use AMQPConnection;
 use FintechFab\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use Illuminate\Queue\Connectors\ConnectorInterface;
+use PhpAmqpLib\Connection\AMQPConnection;
 
 class RabbitMQConnector implements ConnectorInterface
 {
@@ -16,25 +16,12 @@ class RabbitMQConnector implements ConnectorInterface
 	 */
 	public function connect(array $config)
 	{
-
 		// create connection with AMQP
-		$connection = new AMQPConnection($config);
-		$connection->connect();
-
-		if (!isset($config['exchange_type'])) {
-			$config['exchange_type'] = AMQP_EX_TYPE_DIRECT;
-		}
-
-		if (!isset($config['exchange_flags'])) {
-			$config['exchange_flags'] = AMQP_DURABLE;
-		}
+		$connection = new AMQPConnection($config['host'], $config['port'], $config['login'], $config['password'], $config['vhost']);
 
 		return new RabbitMQQueue(
 			$connection,
-			$config['queue'],
-			$config['exchange_name'],
-			$config['exchange_type'],
-			$config['exchange_flags']
+			$config
 		);
 	}
 

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

@@ -1,25 +1,29 @@
 <?php namespace FintechFab\LaravelQueueRabbitMQ\Queue\Jobs;
 
-use AMQPEnvelope;
-use AMQPQueue;
 use Illuminate\Container\Container;
 use Illuminate\Queue\Jobs\Job;
+use PhpAmqpLib\Channel\AMQPChannel;
+use PhpAmqpLib\Message\AMQPMessage;
+use Queue;
 
 class RabbitMQJob extends Job
 {
 
+	protected $channel;
 	protected $queue;
-	protected $envelope;
+	protected $message;
 
 	public function __construct(
 		Container $container,
-		AMQPQueue $queue,
-		AMQPEnvelope $envelope
+		AMQPChannel $channel,
+		$queue,
+		AMQPMessage $message
 	)
 	{
 		$this->container = $container;
+		$this->channel = $channel;
 		$this->queue = $queue;
-		$this->envelope = $envelope;
+		$this->message = $message;
 	}
 
 	/**
@@ -29,7 +33,7 @@ public function __construct(
 	 */
 	public function fire()
 	{
-		$this->resolveAndFire(json_decode($this->envelope->getBody(), true));
+		$this->resolveAndFire(json_decode($this->message->body, true));
 	}
 
 	/**
@@ -39,7 +43,7 @@ public function fire()
 	 */
 	public function getRawBody()
 	{
-		return $this->envelope->getBody();
+		return $this->message->body;
 	}
 
 	/**
@@ -50,7 +54,18 @@ public function getRawBody()
 	public function delete()
 	{
 		parent::delete();
-		$this->queue->ack($this->envelope->getDeliveryTag());
+
+		$this->channel->basic_ack($this->message->delivery_info['delivery_tag']);
+	}
+
+	/**
+	 * Get queue name
+	 *
+	 * @return string
+	 */
+	public function getQueue()
+	{
+		return $this->queue;
 	}
 
 	/**
@@ -64,7 +79,7 @@ public function release($delay = 0)
 	{
 		$this->delete();
 
-		$body = $this->envelope->getBody();
+		$body = $this->message->body;
 		$body = json_decode($body, true);
 
 		$attempts = $this->attempts();
@@ -90,7 +105,7 @@ public function release($delay = 0)
 	 */
 	public function attempts()
 	{
-		$body = json_decode($this->envelope->getBody(), true);
+		$body = json_decode($this->message->body, true);
 
 		return isset($body['data']['attempts']) ? (int)$body['data']['attempts'] : 0;
 	}
@@ -102,7 +117,7 @@ public function attempts()
 	 */
 	public function getJobId()
 	{
-		return $this->envelope->getMessageId();
+		return $this->message->body;
 	}
 
 	/**