Merge branch 'hotfix/199' into develop

Forward port #199

Author: michalbundyra

CHANGELOG.md

@@ -58,6 +58,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#198](https://github.com/zendframework/zend-http/pull/198) fixes various issues with `Proxy` adapter.
 
+- [#199](https://github.com/zendframework/zend-http/pull/199) fixes saving resource to the file when streaming while client supports compression. Before, incorrectly, compressed resource was saved into the file.
+
 ## 2.10.0 - 2019-02-19
 
 ### Added

src/Client.php

@@ -1184,7 +1184,7 @@ protected function prepareHeaders($body, $uri)
         // Set the Accept-encoding header if not set - depending on whether
         // zlib is available or not.
         if (! $this->getRequest()->getHeaders()->has('Accept-Encoding')) {
-            if (function_exists('gzinflate')) {
+            if (empty($this->config['outputstream']) && function_exists('gzinflate')) {
                 $headers['Accept-Encoding'] = 'gzip, deflate';
             } else {
                 $headers['Accept-Encoding'] = 'identity';

test/ClientTest.php

@@ -12,6 +12,9 @@
 use ReflectionMethod;
 use Zend\Http\Client;
 use Zend\Http\Client\Adapter\AdapterInterface;
+use Zend\Http\Client\Adapter\Curl;
+use Zend\Http\Client\Adapter\Proxy;
+use Zend\Http\Client\Adapter\Socket;
 use Zend\Http\Client\Adapter\Test;
 use Zend\Http\Client\Exception as ClientException;
 use Zend\Http\Cookies;
@@ -607,4 +610,31 @@ public function testSetCookieAcceptOnlyArray()
         $this->expectExceptionMessage('Invalid cookies passed as parameter, it must be an array');
         $client->setCookies(new SetCookie('name', 'value'));
     }
+
+    /**
+     * @return AdapterInterface[]
+     */
+    public function adapterWithStreamSupport()
+    {
+        yield 'curl' => [new Curl()];
+        yield 'proxy' => [new Proxy()];
+        yield 'socket' => [new Socket()];
+    }
+
+    /**
+     * @dataProvider adapterWithStreamSupport
+     */
+    public function testStreamCompression(AdapterInterface $adapter)
+    {
+        $tmpFile = tempnam(sys_get_temp_dir(), 'stream');
+
+        $client = new Client('https://www.gnu.org/licenses/gpl-3.0.txt');
+        $client->setAdapter($adapter);
+        $client->setStream($tmpFile);
+        $client->send();
+
+        $response = $client->getResponse();
+
+        self::assertSame($response->getBody(), file_get_contents($tmpFile));
+    }
 }