Merge pull request #20 from trideout/5.3

5.3 support

Author: trideout

.travis.yml

@@ -1,9 +1,7 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
-  - hhvm
 
 sudo: false
 

composer.json

@@ -15,12 +15,12 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "illuminate/container": "5.2.*",
-        "illuminate/contracts": "5.2.*",
-        "illuminate/encryption": "5.2.*",
-        "illuminate/http": "5.2.*",
-        "illuminate/queue": "5.2.*",
-        "illuminate/support": "5.2.*",
+        "illuminate/container": "5.3.*",
+        "illuminate/contracts": "5.3.*",
+        "illuminate/encryption": "5.3.*",
+        "illuminate/http": "5.3.*",
+        "illuminate/queue": "5.3.*",
+        "illuminate/support": "5.3.*",
         "iron-io/iron_mq": "~4.0",
         "jeremeamia/superclosure": "~2.0"
     },

src/Connectors/IronConnector.php

@@ -44,7 +44,7 @@ public function __construct(EncrypterContract $crypt, Request $request)
      * @param array $config
      * @param array $config
      *
-     * @return \Illuminate\Contracts\Queue\Queue
+     * @return IronQueue
      */
     public function connect(array $config)
     {

src/IronQueue.php

@@ -3,6 +3,7 @@
 namespace Collective\IronQueue;
 
 use Collective\IronQueue\Jobs\IronJob;
+use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -281,4 +282,42 @@ public function setRequest(Request $request)
     {
         $this->request = $request;
     }
+
+    /**
+     * Get the size of the queue.
+     *
+     * @param null $queue
+     *
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        return (int)$this->iron->getQueue($queue)->size;
+    }
+
+    /**
+     * Get the encrypter implementation.
+     *
+     * @return  \Illuminate\Contracts\Encryption\Encrypter
+     *
+     * @throws \Exception
+     */
+    protected function getEncrypter()
+    {
+        if (is_null($this->encrypter)) {
+            throw new \Exception('No encrypter has been set on the Queue.');
+        }
+        return $this->encrypter;
+    }
+
+    /**
+     * Set the encrypter implementation.
+     *
+     * @param  \Illuminate\Contracts\Encryption\Encrypter $encrypter
+     * @return void
+     */
+    public function setEncrypter(Encrypter $encrypter)
+    {
+        $this->encrypter = $encrypter;
+    }
 }

src/Jobs/IronJob.php

@@ -59,7 +59,10 @@ public function __construct(Container $container,
      */
     public function fire()
     {
-        $this->resolveAndFire(json_decode($this->getRawBody(), true));
+        $payload = $this->payload();
+        list($class, $method) = $this->parseJob($payload['job']);
+        $this->instance = $this->resolve($class);
+        $this->instance->{$method}($this, $payload['data']);
     }
 
     /**

tests/IronQueueTest.php

@@ -30,21 +30,6 @@ public function testPushProperlyPushesJobOntoIronWithoutEncryption()
         $queue->push('foo', [1, 2, 3]);
     }
 
-    public function testPushProperlyPushesJobOntoIronWithClosures()
-    {
-        $queue = new Collective\IronQueue\IronQueue($iron = m::mock('IronMQ\IronMQ'), m::mock('Illuminate\Http\Request'), 'default', true);
-        $crypt = m::mock('Illuminate\Contracts\Encryption\Encrypter');
-        $queue->setEncrypter($crypt);
-        $name = 'Foo';
-        $closure = (new Serializer())->serialize($innerClosure = function () use ($name) { return $name; });
-        $crypt->shouldReceive('encrypt')->once()->with($closure)->andReturn('serial_closure');
-        $crypt->shouldReceive('encrypt')->once()->with(json_encode([
-            'job' => 'IlluminateQueueClosure', 'data' => ['closure' => 'serial_closure'], 'attempts' => 1, 'queue' => 'default',
-        ]))->andReturn('encrypted');
-        $iron->shouldReceive('postMessage')->once()->with('default', 'encrypted', [])->andReturn((object) ['id' => 1]);
-        $queue->push($innerClosure);
-    }
-
     public function testDelayedPushProperlyPushesJobOntoIron()
     {
         $queue = new Collective\IronQueue\IronQueue($iron = m::mock('IronMQ\IronMQ'), m::mock('Illuminate\Http\Request'), 'default', true);
@@ -60,7 +45,7 @@ public function testDelayedPushProperlyPushesJobOntoIron()
     public function testDelayedPushProperlyPushesJobOntoIronWithTimestamp()
     {
         $now = Carbon\Carbon::now();
-        $queue = $this->getMock('Collective\IronQueue\IronQueue', ['getTime'], [$iron = m::mock('IronMQ\IronMQ'), m::mock('Illuminate\Http\Request'), 'default', true]);
+        $queue = $this->getMockBuilder('Collective\IronQueue\IronQueue')->setMethods(['getTime'])->setConstructorArgs([$iron = m::mock('IronMQ\IronMQ'), m::mock('Illuminate\Http\Request'), 'default', true])->getMock();
         $crypt = m::mock('Illuminate\Contracts\Encryption\Encrypter');
         $queue->setEncrypter($crypt);
         $queue->expects($this->once())->method('getTime')->will($this->returnValue($now->getTimestamp()));
@@ -124,7 +109,7 @@ public function testDeleteJobWithExpiredReservationIdThrowsAnException()
 
     public function testPushedJobsCanBeMarshaled()
     {
-        $queue = $this->getMock('Collective\IronQueue\IronQueue', ['createPushedIronJob'], [$iron = m::mock('IronMQ\IronMQ'), $request = m::mock('Illuminate\Http\Request'), 'default', true]);
+        $queue = $this->getMockBuilder('Collective\IronQueue\IronQueue')->setMethods(['createPushedIronJob'])->setConstructorArgs([$iron = m::mock('IronMQ\IronMQ'), $request = m::mock('Illuminate\Http\Request'), 'default', true])->getMock();
         $crypt = m::mock('Illuminate\Contracts\Encryption\Encrypter');
         $queue->setEncrypter($crypt);
         $request->shouldReceive('header')->once()->with('iron-message-id')->andReturn('message-id');