Merge pull request #15 from graze/array-adapter-out-of-bounds

ArrayAdapter throws OutOfBoundsException when empty
graze · Aug 21, 2015 · 150f49d · 150f49d
2 parents fd4bf84 + 42e8b07
commit 150f49d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/src/Adapter/ArrayAdapter.php b/src/Adapter/ArrayAdapter.php
@@ -24,7 +24,7 @@ final class ArrayAdapter implements AdapterInterface
     /**
      * @param MessageInterface[]
      */
-    protected $queue;
+    protected $queue = [];
 
     /**
      * @param MessageInterface[] $messages
@@ -49,9 +49,15 @@ public function acknowledge(array $messages)
      */
     public function dequeue(MessageFactoryInterface $factory, $limit)
     {
-        $total = null === $limit ? count($this->queue) : $limit;
+        /**
+         * If {@see $limit} is null then {@see LimitIterator} should be passed -1 as the count
+         * to avoid throwing OutOfBoundsException.
+         *
+         * @link https://github.com/php/php-src/blob/php-5.6.12/ext/spl/internal/limititerator.inc#L60-L62
+         */
+        $count = (null === $limit) ? -1 : $limit;
 
-        return new LimitIterator(new ArrayIterator($this->queue), 0, $total);
+        return new LimitIterator(new ArrayIterator($this->queue), 0, $count);
     }
 
     /**

diff --git a/tests/integration/ArrayIntegrationTest.php b/tests/integration/ArrayIntegrationTest.php
@@ -54,6 +54,30 @@ public function testReceiveWithPolling()
         assertThat($msgs, is(identicalTo($this->messages)));
     }
 
+    public function testReceiveWithNoMessages()
+    {
+        $client = new Client(new ArrayAdapter());
+
+        $msgs = [];
+        $client->receive(function ($msg) use (&$msgs) {
+            $msgs[] = $msg;
+        }, null);
+
+        assertThat($msgs, is(emptyArray()));
+    }
+
+    public function testReceiveWithLimitAndNoMessages()
+    {
+        $client = new Client(new ArrayAdapter());
+
+        $msgs = [];
+        $client->receive(function ($msg) use (&$msgs) {
+            $msgs[] = $msg;
+        }, 10);
+
+        assertThat($msgs, is(emptyArray()));
+    }
+
     public function testSend()
     {
         $this->client->send([$this->client->create('foo')]);

diff --git a/tests/unit/Adapter/ArrayAdapterTest.php b/tests/unit/Adapter/ArrayAdapterTest.php
@@ -75,6 +75,24 @@ public function testDequeueWithPollingLimit()
         assertThat(iterator_to_array($iterator), is(identicalTo($this->messages)));
     }
 
+    public function testDequeueWithNoMessages()
+    {
+        $adapter = new ArrayAdapter();
+
+        $iterator = $adapter->dequeue($this->factory, null);
+
+        assertThat(iterator_to_array($iterator), is(emptyArray()));
+    }
+
+    public function testDequeueWithLimitAndNoMessages()
+    {
+        $adapter = new ArrayAdapter();
+
+        $iterator = $adapter->dequeue($this->factory, 10);
+
+        assertThat(iterator_to_array($iterator), is(emptyArray()));
+    }
+
     public function testEnqueue()
     {
         $messageA = m::mock('Graze\Queue\Message\MessageInterface');