Merge branch 'hotfix/5068' into develop

Forward port zendframework/zendframework#5068

src/Client.php

@@ -905,7 +905,7 @@ public function send(Request $request = null)
                     $response->setCleanup(true);
                 }
             } else {
-                $response = Response::fromString($response);
+                $response = $this->getResponse()->fromString($response);
             }
 
             // Get the cookies from response (if any)

test/ClientTest.php

@@ -349,4 +349,48 @@ public function testAdapterAlwaysReachableIfSpecified()
 
         $this->assertSame($testAdapter, $client->getAdapter());
     }
+
+    /**
+     * Custom response object is set but still invalid code coming back
+     * @expectedException Zend\Http\Exception\InvalidArgumentException
+     */
+    public function testUsageOfCustomResponseInvalidCode()
+    {
+        require_once(dirname(realpath(__FILE__)) . DIRECTORY_SEPARATOR .'_files' . DIRECTORY_SEPARATOR . 'CustomResponse.php');
+        $testAdapter = new Test();
+        $testAdapter->setResponse(
+            "HTTP/1.1 496 CustomResponse\r\n\r\n"
+            . "Whatever content"
+        );
+
+        $client = new Client('http://www.example.org/', array(
+            'adapter' => $testAdapter,
+        ));
+        $client->setResponse(new CustomResponse());
+        $response = $client->send();
+    }
+
+    /**
+     * Custom response object is set with defined status code 497.
+     * Should not throw an exception.
+     */
+    public function testUsageOfCustomResponseCustomCode()
+    {
+        require_once(dirname(realpath(__FILE__)) . DIRECTORY_SEPARATOR .'_files' . DIRECTORY_SEPARATOR . 'CustomResponse.php');
+        $testAdapter = new Test();
+        $testAdapter->setResponse(
+            "HTTP/1.1 497 CustomResponse\r\n\r\n"
+            . "Whatever content"
+        );
+
+        $client = new Client('http://www.example.org/', array(
+            'adapter' => $testAdapter,
+        ));
+        $client->setResponse(new CustomResponse());
+        $response = $client->send();
+
+        $this->assertInstanceOf('ZendTest\Http\CustomResponse', $response);
+        $this->assertEquals(497, $response->getStatusCode());
+        $this->assertEquals('Whatever content', $response->getContent());
+    }
 }

test/_files/CustomResponse.php

@@ -0,0 +1,7 @@
+<?php
+namespace ZendTest\Http;
+
+class CustomResponse extends \Zend\Http\Response
+{
+    const STATUS_CODE_497 = 497;
+}