Merge branch 'hotfix/39' into develop

Forward port #39

Author: weierophinney

src/Parameters.php

@@ -70,7 +70,7 @@ public function toArray()
      */
     public function toString()
     {
-        return http_build_query($this);
+        return http_build_query($this->toArray());
     }
 
     /**

test/FastPriorityQueueTest.php

@@ -9,13 +9,24 @@
 
 namespace ZendTest\Stdlib;
 
+use Zend\Stdlib\Exception\InvalidArgumentException;
 use Zend\Stdlib\FastPriorityQueue;
 
 /**
  * @group      Zend_Stdlib
  */
 class FastPriorityQueueTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var FastPriorityQueue
+     */
+    protected $queue;
+
+    /**
+     * @var string[]
+     */
+    protected $expected;
+
     public function setUp()
     {
         $this->queue = new FastPriorityQueue();
@@ -42,7 +53,7 @@ protected function getDataPriorityQueue()
         ];
     }
 
-    protected function insertDataQueue($queue)
+    protected function insertDataQueue(FastPriorityQueue $queue)
     {
         foreach ($this->getDataPriorityQueue() as $value => $priority) {
             $queue->insert($value, $priority);
@@ -117,17 +128,7 @@ public function testCanRetrieveQueueAsArray()
 
     public function testIteratorFunctions()
     {
-        $this->queue->rewind();
-
-        $i = 0;
-        while ($this->queue->valid()) {
-            $key   = $this->queue->key();
-            $value = $this->queue->current();
-            $this->assertEquals($this->expected[$i], $value);
-            $this->queue->next();
-            ++$i;
-        }
-        $this->assertFalse($this->queue->valid());
+        $this->assertEquals($this->expected, iterator_to_array($this->queue));
     }
 
     public function testRewindOperation()
@@ -154,11 +155,9 @@ public function testSetExtractFlag()
         $this->assertEquals($expected, $this->queue->extract());
     }
 
-    /**
-     * @expectedException Zend\Stdlib\Exception\InvalidArgumentException
-     */
     public function testSetInvalidExtractFlag()
     {
+        $this->setExpectedException(InvalidArgumentException::class, 'The extract flag specified is not valid');
         $this->queue->setExtractFlags('foo');
     }
 
@@ -232,11 +231,7 @@ public function testRewindShouldNotRaiseErrorWhenQueueIsEmpty()
         $queue = new FastPriorityQueue();
         $this->assertTrue($queue->isEmpty());
 
-        set_error_handler(function ($errno, $errstr) {
-            $this->fail(sprintf('Error was raised by rewind() operation: %s', $errstr));
-        }, E_WARNING);
         $queue->rewind();
-        restore_error_handler();
     }
 
     public function testRemoveShouldFindItemEvenIfMultipleItemsAreInQueue()

test/PriorityListTest.php

@@ -101,11 +101,7 @@ public function testLIFOOnly()
         $this->list->insert('foobar', new \stdClass());
         $this->list->insert('barbaz', new \stdClass());
 
-        $orders = [];
-
-        foreach ($this->list as $key => $value) {
-            $orders[] = $key;
-        }
+        $orders = array_keys(iterator_to_array($this->list));
 
         $this->assertEquals(['barbaz', 'foobar', 'baz', 'bar', 'foo'], $orders);
     }
@@ -116,11 +112,7 @@ public function testPriorityOnly()
         $this->list->insert('bar', new \stdClass(), 0);
         $this->list->insert('baz', new \stdClass(), 2);
 
-        $order = [];
-
-        foreach ($this->list as $key => $value) {
-            $orders[] = $key;
-        }
+        $orders = array_keys(iterator_to_array($this->list));
 
         $this->assertEquals(['baz', 'foo', 'bar'], $orders);
     }
@@ -131,11 +123,7 @@ public function testLIFOWithPriority()
         $this->list->insert('bar', new \stdClass(), 0);
         $this->list->insert('baz', new \stdClass(), 1);
 
-        $orders = [];
-
-        foreach ($this->list as $key => $value) {
-            $orders[] = $key;
-        }
+        $orders = array_keys(iterator_to_array($this->list));
 
         $this->assertEquals(['baz', 'bar', 'foo'], $orders);
     }
@@ -147,11 +135,7 @@ public function testFIFOWithPriority()
         $this->list->insert('bar', new \stdClass(), 0);
         $this->list->insert('baz', new \stdClass(), 1);
 
-        $orders = [];
-
-        foreach ($this->list as $key => $value) {
-            $orders[] = $key;
-        }
+        $orders = array_keys(iterator_to_array($this->list));
 
         $this->assertEquals(['baz', 'foo', 'bar'], $orders);
     }
@@ -165,11 +149,7 @@ public function testFIFOOnly()
         $this->list->insert('foobar', new \stdClass());
         $this->list->insert('barbaz', new \stdClass());
 
-        $orders = [];
-
-        foreach ($this->list as $key => $value) {
-            $orders[] = $key;
-        }
+        $orders = array_keys(iterator_to_array($this->list));
 
         $this->assertEquals(['foo', 'bar', 'baz', 'foobar', 'barbaz'], $orders);
     }
@@ -180,11 +160,7 @@ public function testPriorityWithNegativesAndNull()
         $this->list->insert('bar', new \stdClass(), 1);
         $this->list->insert('baz', new \stdClass(), -1);
 
-        $orders = [];
-
-        foreach ($this->list as $key => $value) {
-            $orders[] = $key;
-        }
+        $orders = array_keys(iterator_to_array($this->list));
 
         $this->assertEquals(['bar', 'foo', 'baz'], $orders);
     }

test/PriorityQueueTest.php

@@ -37,14 +37,8 @@ public function testSerializationAndDeserializationShouldMaintainState()
         $count = count($this->queue);
         $this->assertSame($count, count($unserialized), 'Expected count ' . $count . '; received ' . count($unserialized));
 
-        $expected = [];
-        foreach ($this->queue as $item) {
-            $expected[] = $item;
-        }
-        $test = [];
-        foreach ($unserialized as $item) {
-            $test[] = $item;
-        }
+        $expected = iterator_to_array($this->queue);
+        $test = iterator_to_array($unserialized);
         $this->assertSame($expected, $test, 'Expected: ' . var_export($expected, 1) . "\nReceived:" . var_export($test, 1));
     }
 
@@ -101,10 +95,7 @@ public function testCanRemoveItemFromQueue()
     {
         $this->queue->remove('baz');
         $expected = ['bar', 'foo', 'bat'];
-        $test = [];
-        foreach ($this->queue as $item) {
-            $test[] = $item;
-        }
+        $test = array_values(iterator_to_array($this->queue));
         $this->assertEquals($expected, $test);
     }
 

test/SplPriorityQueueTest.php

@@ -16,6 +16,11 @@
  */
 class SplPriorityQueueTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var SplPriorityQueue
+     */
+    protected $queue;
+
     public function setUp()
     {
         $this->queue = new SplPriorityQueue();
@@ -34,10 +39,7 @@ public function testMaintainsInsertOrderForDataOfEqualPriority()
         $queue->insert('bat', 1000);
 
         $expected = ['foo', 'bar', 'baz', 'bat'];
-        $test     = [];
-        foreach ($queue as $datum) {
-            $test[] = $datum;
-        }
+        $test = array_values(iterator_to_array($queue));
         $this->assertEquals($expected, $test);
     }
 
@@ -48,14 +50,8 @@ public function testSerializationAndDeserializationShouldMaintainState()
         $count = count($this->queue);
         $this->assertSame($count, count($unserialized), 'Expected count ' . $count . '; received ' . count($unserialized));
 
-        $expected = [];
-        foreach ($this->queue as $item) {
-            $expected[] = $item;
-        }
-        $test = [];
-        foreach ($unserialized as $item) {
-            $test[] = $item;
-        }
+        $expected = iterator_to_array($this->queue);
+        $test = iterator_to_array($unserialized);
         $this->assertSame($expected, $test, 'Expected: ' . var_export($expected, 1) . "\nReceived:" . var_export($test, 1));
     }
 

test/SplQueueTest.php

@@ -16,6 +16,11 @@
  */
 class SplQueueTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var SplQueue
+     */
+    protected $queue;
+
     public function setUp()
     {
         $this->queue = new SplQueue();
@@ -31,14 +36,8 @@ public function testSerializationAndDeserializationShouldMaintainState()
         $count = count($this->queue);
         $this->assertSame($count, count($unserialized));
 
-        $expected = [];
-        foreach ($this->queue as $item) {
-            $expected[] = $item;
-        }
-        $test = [];
-        foreach ($unserialized as $item) {
-            $test[] = $item;
-        }
+        $expected = iterator_to_array($this->queue);
+        $test = iterator_to_array($unserialized);
         $this->assertSame($expected, $test);
     }
 

test/SplStackTest.php

@@ -16,6 +16,11 @@
  */
 class SplStackTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var SplStack
+     */
+    protected $stack;
+
     public function setUp()
     {
         $this->stack = new SplStack();
@@ -32,14 +37,8 @@ public function testSerializationAndDeserializationShouldMaintainState()
         $count = count($this->stack);
         $this->assertSame($count, count($unserialized));
 
-        $expected = [];
-        foreach ($this->stack as $item) {
-            $expected[] = $item;
-        }
-        $test = [];
-        foreach ($unserialized as $item) {
-            $test[] = $item;
-        }
+        $expected = iterator_to_array($this->stack);
+        $test = iterator_to_array($unserialized);
         $this->assertSame($expected, $test);
     }
 

test/StringUtilsTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Stdlib;
 
+use Exception;
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Stdlib\ErrorHandler;
 use Zend\Stdlib\StringUtils;

test/StringWrapper/CommonStringWrapperTest.php

@@ -10,9 +10,13 @@
 namespace ZendTest\Stdlib\StringWrapper;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Stdlib\StringWrapper\StringWrapperInterface;
 
 abstract class CommonStringWrapperTest extends TestCase
 {
+    /**
+     * @return StringWrapperInterface
+     */
     abstract protected function getWrapper($encoding = null, $convertEncoding = null);
 
     public function strlenProvider()