Merge branch 'master' into toolstation

Author: nicksnellockts

LICENSE

@@ -6,7 +6,7 @@ RabbitMQ Queue driver for Laravel
 
 Require this package in your composer.json and run composer update (IMPORTANT! DO NOT USE "dev-master"):
 
-	"vladimir-yuldashev/laravel-queue-rabbitmq": "5.1"
+	"vladimir-yuldashev/laravel-queue-rabbitmq": "5.2"
 
 After composer update is finished you need to add ServiceProvider to your `providers` array in `app.php`:
 
@@ -69,5 +69,5 @@ Unit tests will be provided soon.
 You can contribute to this package by discovering bugs and opening issues. Enjoy!
 
 ####Supported versions of Laravel
-4.0, 4.1, 4.2, 5.0, 5.1
+4.0, 4.1, 4.2, 5.0, 5.1, 5.2
 The version is being matched by the release tag of this library.

README.md

@@ -13,12 +13,12 @@
     "php": ">=5.5.9",
     "illuminate/support": "5.2.*",
     "illuminate/queue": "5.2.*",
-    "videlalvaro/php-amqplib": "2.5.*"
+    "php-amqplib/php-amqplib": "2.6.*"
   },
   "autoload": {
     "psr-0": {
       "VladimirYuldashev\\LaravelQueueRabbitMQ": "src/"
     }
   },
-  "minimum-stability": "dev"
+  "minimum-stability": "stable"
 }

composer.json

@@ -3,7 +3,7 @@
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors;
 
 use Illuminate\Queue\Connectors\ConnectorInterface;
-use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface
@@ -19,7 +19,8 @@ class RabbitMQConnector implements ConnectorInterface
 	public function connect(array $config)
 	{
 		// create connection with AMQP
-		$connection = new AMQPConnection($config['host'], $config['port'], $config['login'], $config['password'], $config['vhost']);
+		$connection = new AMQPStreamConnection($config['host'], $config['port'], $config['login'], $config['password'],
+				$config['vhost']);
 
 		return new RabbitMQQueue(
 			$connection,

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

@@ -6,7 +6,7 @@
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Queue;
 use PhpAmqpLib\Channel\AMQPChannel;
-use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PhpAmqpLib\Message\AMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
@@ -24,11 +24,11 @@ class RabbitMQQueue extends Queue implements QueueContract
 	protected $configQueue;
 	protected $configExchange;
 
-	/**
-	 * @param AMQPConnection $amqpConnection
-	 * @param array          $config
-	 */
-	public function __construct(AMQPConnection $amqpConnection, $config)
+    /**
+     * @param AMQPStreamConnection $amqpConnection
+     * @param array $config
+     */
+    public function __construct(AMQPStreamConnection $amqpConnection, $config)
 	{
 		$this->connection = $amqpConnection;
 		$this->defaultQueue = $config['queue'];