Merge pull request #1373 from guzzle/flexible-history-container

More flexible history containers

src/Middleware.php

@@ -75,9 +75,14 @@ function (ResponseInterface $response) use ($request, $handler) {
      * @param array $container Container to hold the history (by reference).
      *
      * @return callable Returns a function that accepts the next handler.
+     * @throws \InvalidArgumentException if container is not an array or ArrayAccess.
      */
-    public static function history(array &$container)
+    public static function history(&$container)
     {
+        if (!is_array($container) && !$container instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException('history container must be an array or object implementing ArrayAccess');
+        }
+
         return function (callable $handler) use (&$container) {
             return function ($request, array $options) use ($handler, &$container) {
                 return $handler($request, $options)->then(

tests/MiddlewareTest.php

@@ -69,9 +69,11 @@ public function testThrowsExceptionOnHttpServerError()
         $this->assertEquals('rejected', $p->getState());
     }
 
-    public function testTracksHistory()
+    /**
+     * @dataProvider getHistoryUseCases
+     */
+    public function testTracksHistory($container)
     {
-        $container = [];
         $m = Middleware::history($container);
         $h = new MockHandler([new Response(200), new Response(201)]);
         $f = $m($h);
@@ -88,6 +90,14 @@ public function testTracksHistory()
         $this->assertEquals('baz', $container[1]['options']['headers']['foo']);
     }
 
+    public function getHistoryUseCases()
+    {
+        return [
+            [[]],                // 1. Container is an array
+            [new \ArrayObject()] // 2. Container is an ArrayObject
+        ];
+    }
+
     public function testTracksHistoryForFailures()
     {
         $container = [];