Merge pull request #11 from maksimru/master

@maksimru	- properly encoded delayed option arguments (avoid AMQPProtocolChanne…  …			da17b7f
 @maksimru	- skip bad payload jobs			2f06374
 @maksimru	- size blank method			f14da84
 @maksimru	- compatibility fix
@maksimru	- laravel 5.3 update			a89d56b
 @maksimru	- support of heartbeat and timeouts			88bda43

Author: FractalizeR

composer.json

@@ -5,12 +5,12 @@
   "license": "GPL-2.0",
   "require": {
     "php": ">=5.4.0",
-    "videlalvaro/php-amqplib": "2.4.*"
+    "php-amqplib/php-amqplib": "2.6.*"
   },
   "require-dev": {
-    "laravel/framework": ">=4.0.0",
+    "laravel/framework": ">=5.3.0",
     "squizlabs/php_codesniffer": "1.*",
-    "orchestra/testbench": "3.0.4",
+    "orchestra/testbench": "3.3.*",
     "phpunit/phpunit": "4.3.*"
   },
   "autoload": {

src/Connectors/AmqpConnector.php

@@ -4,7 +4,7 @@
 
 use Forumhouse\LaravelAmqp\Queue\AMQPQueue;
 use Illuminate\Queue\Connectors\ConnectorInterface;
-use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
 
 /**
  * Class AmqpConnector
@@ -22,12 +22,21 @@ class AmqpConnector implements ConnectorInterface
      */
     public function connect(array $config)
     {
-        $connection = new AMQPConnection(
+        $connection = new AMQPStreamConnection(
             $config['host'],
             $config['port'],
             $config['user'],
             $config['password'],
-            isset($config['vhost']) ? $config['vhost'] : '/'
+            isset($config['vhost']) ? $config['vhost'] : '/',
+            false,
+            'AMQPLAIN',
+            null,
+            'en_US',
+            isset($config['connection_timeout']) ? $config['connection_timeout'] : 3,
+            isset($config['read_write_timeout']) ? $config['read_write_timeout'] : 3,
+            null,
+            isset($config['keepalive']) ? $config['keepalive'] : false,
+            isset($config['heartbeat']) ? $config['heartbeat'] : 0
         );
 
         if (!isset($config['exchange_type'])) {

src/Jobs/AMQPJob.php

@@ -42,17 +42,7 @@ public function __construct($container, $queue, $channel, $amqpMessage)
         $this->amqpMessage = $amqpMessage;
         $this->channel = $channel;
     }
-
-    /**
-     * Fire the job.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        $this->resolveAndFire(json_decode($this->amqpMessage->body, true));
-    }
-
+    
     /**
      * Get the raw body string for the job.
      *
@@ -63,27 +53,6 @@ public function getRawBody()
         return $this->amqpMessage->body;
     }
 
-    /**
-     * Delete the job from the queue.
-     *
-     * @return void
-     */
-    public function delete()
-    {
-        parent::delete();
-        $this->channel->basic_ack($this->amqpMessage->delivery_info['delivery_tag']);
-    }
-
-    /**
-     * Get queue name
-     *
-     * @return string
-     */
-    public function getQueue()
-    {
-        return $this->queue;
-    }
-
     /**
      * Release the job back into the queue.
      *
@@ -115,6 +84,17 @@ public function release($delay = 0)
         }
     }
 
+    /**
+     * Delete the job from the queue.
+     *
+     * @return void
+     */
+    public function delete()
+    {
+        parent::delete();
+        $this->channel->basic_ack($this->amqpMessage->delivery_info['delivery_tag']);
+    }
+
     /**
      * Get the number of times the job has been attempted.
      *
@@ -127,6 +107,16 @@ public function attempts()
         return isset($body['data']['attempts']) ? $body['data']['attempts'] : 0;
     }
 
+    /**
+     * Get queue name
+     *
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
     /**
      * Get the job identifier.
      *