Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	src/FintechFab/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

Author: eupathy

README.md

@@ -15,22 +15,25 @@ After composer update is finished you need to add ServiceProvider to your `provi
 Add these lines to your `app/config/queue.php` file to `connections` array:
 
 	'rabbitmq' => [
-		'driver'          => 'rabbitmq',
+		'driver'          		=> 'rabbitmq',
 
-		'host'            => env('RABBITMQ_HOST', '127.0.0.1'),
-		'port'            => env('RABBITMQ_PORT', 5672),
+		'host'            		=> env('RABBITMQ_HOST', '127.0.0.1'),
+		'port'            		=> env('RABBITMQ_PORT', 5672),
 
-		'vhost'           => env('RABBITMQ_VHOST', '/'),
-		'login'           => env('RABBITMQ_LOGIN', 'guest'),
-		'password'        => env('RABBITMQ_PASSWORD', 'guest'),
+		'vhost'           		=> env('RABBITMQ_VHOST', '/'),
+		'login'           		=> env('RABBITMQ_LOGIN', 'guest'),
+		'password'        		=> env('RABBITMQ_PASSWORD', 'guest'),
 
-		'queue'           => env('RABBITMQ_QUEUE'), // name of the default queue,
-
-		'queue_params'    => [
-			'passive'     => env('RABBITMQ_QUEUE_PASSIVE', false),
-			'durable'     => env('RABBITMQ_QUEUE_DURABLE', true),
-			'exclusive'   => env('RABBITMQ_QUEUE_EXCLUSIVE', false),
-			'auto_delete' => env('RABBITMQ_QUEUE_AUTODELETE', false),
+		'queue'           		=> env('RABBITMQ_QUEUE'), // name of the default queue,
+		
+		'exchange_declare' 		=> env('RABBITMQ_EXCHANGE_DECLARE', true), // create the exchange if not exists
+		'queue_declare_bind' 	=> env('RABBITMQ_QUEUE_DECLARE_BIND', true), // create the queue if not exists and bind to the exchange
+
+		'queue_params'    		=> [
+			'passive'     		=> env('RABBITMQ_QUEUE_PASSIVE', false),
+			'durable'     		=> env('RABBITMQ_QUEUE_DURABLE', true),
+			'exclusive'   		=> env('RABBITMQ_QUEUE_EXCLUSIVE', false),
+			'auto_delete' 		=> env('RABBITMQ_QUEUE_AUTODELETE', false),
 		],
 
 		'exchange_params' => [

src/FintechFab/LaravelQueueRabbitMQ/LaravelQueueRabbitMQServiceProvider.php

@@ -13,6 +13,9 @@ class LaravelQueueRabbitMQServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->mergeConfigFrom(
+            __DIR__.'/../../config/rabbitmq.php', 'queue.connections.rabbitmq'
+        );
     }
 
     /**

src/FintechFab/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -15,6 +15,9 @@ class RabbitMQQueue extends Queue implements QueueContract
 	protected $connection;
 	protected $channel;
 
+	protected $declareExchange;
+	protected $declareBindQueue;
+
 	protected $defaultQueue;
 	protected $configQueue;
 	protected $configExchange;
@@ -29,6 +32,8 @@ public function __construct(AMQPConnection $amqpConnection, $config)
 		$this->defaultQueue = $config['queue'];
 		$this->configQueue = $config['queue_params'];
 		$this->configExchange = $config['exchange_params'];
+		$this->declareExchange = $config['exchange_declare'];
+		$this->declareBindQueue = $config['queue_declare_bind'];
 
 		$this->channel = $this->getChannel();
 	}
@@ -142,26 +147,30 @@ private function declareQueue($name)
 		$name = $this->getQueueName($name);
 		$exchange = $this->configExchange['name'] ?:$name;
 
-		// declare queue
-		$this->channel->queue_declare(
-			$name,
-			$this->configQueue['passive'],
-			$this->configQueue['durable'],
-			$this->configQueue['exclusive'],
-			$this->configQueue['auto_delete']
-		);
-
-		// declare exchange
-		$this->channel->exchange_declare(
-			$exchange,
-			$this->configExchange['type'],
-			$this->configExchange['passive'],
-			$this->configExchange['durable'],
-			$this->configExchange['auto_delete']
-		);
+		if ($this->declareExchange) {
+			// declare exchange
+			$this->channel->exchange_declare(
+				$exchange,
+				$this->configExchange['type'],
+				$this->configExchange['passive'],
+				$this->configExchange['durable'],
+				$this->configExchange['auto_delete']
+			);
+		}
 
-		// bind queue to the exchange
-		$this->channel->queue_bind($name, $exchange, $name);
+		if ($this->declareBindQueue) {
+			// declare queue
+			$this->channel->queue_declare(
+				$name,
+				$this->configQueue['passive'],
+				$this->configQueue['durable'],
+				$this->configQueue['exclusive'],
+				$this->configQueue['auto_delete']
+			);
+
+			// bind queue to the exchange
+			$this->channel->queue_bind($name, $exchange, $name);
+		}
 	}
 
 	/**

src/config/rabbitmq.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * default configuration for laravel-queue-rabbitmq merged with project config to base key 'queue'
+ * @see \MapleSyrupGroup\AMQPEvents\Providers\AMQPEventServiceProvider
+ */
+return [
+
+    'driver'          		=> 'rabbitmq',
+
+    'host'            		=> env('RABBITMQ_HOST', '127.0.0.1'),
+    'port'            		=> env('RABBITMQ_PORT', 5672),
+
+    'vhost'           		=> env('RABBITMQ_VHOST', '/'),
+    'login'           		=> env('RABBITMQ_LOGIN', 'guest'),
+    'password'        		=> env('RABBITMQ_PASSWORD', 'guest'),
+
+    'queue'           		=> env('RABBITMQ_QUEUE'), // name of the default queue,
+
+    'exchange_declare' 		=> env('RABBITMQ_EXCHANGE_DECLARE', true), // create the exchange if not exists
+    'queue_declare_bind' 	=> env('RABBITMQ_QUEUE_DECLARE_BIND', true), // create the queue if not exists and bind to the exchange
+
+    'queue_params'    		=> [
+        'passive'     		=> env('RABBITMQ_QUEUE_PASSIVE', false),
+        'durable'     		=> env('RABBITMQ_QUEUE_DURABLE', true),
+        'exclusive'   		=> env('RABBITMQ_QUEUE_EXCLUSIVE', false),
+        'auto_delete' 		=> env('RABBITMQ_QUEUE_AUTODELETE', false),
+    ],
+    'exchange_params' 		=> [
+        'type'        		=> env('RABBITMQ_EXCHANGE_TYPE', 'direct'), // more info at http://www.rabbitmq.com/tutorials/amqp-concepts.html
+        'passive'     		=> env('RABBITMQ_EXCHANGE_PASSIVE', false),
+        'durable'     		=> env('RABBITMQ_EXCHANGE_DURABLE', true), // the exchange will survive server restarts
+        'auto_delete' 		=> env('RABBITMQ_EXCHANGE_AUTODELETE', false),
+    ],
+
+];