Merge branch 'hotfix/4925' into develop

Forward port zendframework/zendframework#4925

src/Client.php

@@ -205,6 +205,10 @@ public function setAdapter($adapter)
      */
     public function getAdapter()
     {
+        if (! $this->adapter) {
+            $this->setAdapter($this->config['adapter']);
+        }
+
         return $this->adapter;
     }
 
@@ -812,10 +816,7 @@ public function send(Request $request = null)
         $this->redirectCounter = 0;
         $response = null;
 
-        // Make sure the adapter is loaded
-        if ($this->adapter == null) {
-            $this->setAdapter($this->config['adapter']);
-        }
+        $adapter = $this->getAdapter();
 
         // Send the first request. If redirected, continue.
         do {
@@ -868,7 +869,7 @@ public function send(Request $request = null)
             }
 
             // check that adapter supports streaming before using it
-            if (is_resource($body) && !($this->adapter instanceof Client\Adapter\StreamInterface)) {
+            if (is_resource($body) && !($adapter instanceof Client\Adapter\StreamInterface)) {
                 throw new Client\Exception\RuntimeException('Adapter does not support streaming');
             }
 
@@ -896,7 +897,7 @@ public function send(Request $request = null)
                     rewind($stream);
                 }
                 // cleanup the adapter
-                $this->adapter->setOutputStream(null);
+                $adapter->setOutputStream(null);
                 $response = Response\Stream::fromStream($response, $stream);
                 $response->setStreamName($this->streamName);
                 if (!is_string($this->config['outputstream'])) {

test/ClientTest.php

@@ -339,4 +339,14 @@ public function testIfClientDoesNotForwardAuthenticationToForeignHost()
         // because example.org is not a subdomain unter sub.example.org
         $this->assertTrue(strpos($client->getLastRawRequest(), $encoded) === false);
     }
+
+    public function testAdapterAlwaysReachableIfSpecified()
+    {
+        $testAdapter = new Test();
+        $client = new Client('http://www.example.org/', array(
+            'adapter' => $testAdapter,
+        ));
+
+        $this->assertSame($testAdapter, $client->getAdapter());
+    }
 }