Merge branch 'hotfix/40'

Close #40

CHANGELOG.md

@@ -22,7 +22,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#40](https://github.com/zendframework/zend-psr7bridge/pull/40) fixes how headers are translated from PSR-7 to zend-http. Previously, they
+  were always cast to `GenericHeader` instances; now, the bridge uses `Psr7Response::psr7HeadersToString` 
+  to pass them to `Zend\Http\Headers::fromString()`,  ensuring that the more
+  specific zend-http `HeaderInterface` instance types are created.
 
 ## 1.1.0 - 2018-09-27
 

src/Psr7Response.php

@@ -45,20 +45,10 @@ public static function toZend(ResponseInterface $psr7Response)
             return ZendResponse::fromString($response);
         }
 
-        // it's a real file stream:
         $response = new ZendResponse\Stream();
-
-        // copy the headers
-        $zendHeaders = new Headers();
-        foreach ($psr7Response->getHeaders() as $headerName => $headerValues) {
-            $zendHeaders->addHeader(new GenericHeader($headerName, implode('; ', $headerValues)));
-        }
-
-        // set the status
+        $zendHeaders = Headers::fromString(self::psr7HeadersToString($psr7Response));
         $response->setStatusCode($psr7Response->getStatusCode());
-        // set the headers
         $response->setHeaders($zendHeaders);
-        // set the stream
         $response->setStream(fopen($uri, 'rb'));
 
         return $response;

test/Psr7ResponseTest.php

@@ -8,10 +8,12 @@
 namespace ZendTest\Psr7Bridge;
 
 use Error;
+use Iterator;
 use PHPUnit\Framework\TestCase as TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Stream;
+use Zend\Http\Header\SetCookie;
 use Zend\Http\Response as ZendResponse;
 use Zend\Psr7Bridge\Psr7Response;
 
@@ -144,4 +146,18 @@ public function testPrivateConstruct()
         $this->expectExceptionMessage(sprintf('Call to private %s::__construct', Psr7Response::class));
         new Psr7Response();
     }
+
+    public function testConvertedHeadersAreInstanceOfTheirAppropriateClasses()
+    {
+        $psr7Response = (new Response(tmpfile()))->withAddedHeader('Set-Cookie', 'foo=bar;domain=.zendframework.com');
+        $zendResponse = Psr7Response::toZend($psr7Response);
+
+        $cookies = $zendResponse->getHeaders()->get('Set-Cookie');
+        $this->assertInstanceOf(Iterator::class, $cookies);
+        $this->assertCount(1, $cookies);
+        /** @var SetCookie $cookie */
+        $cookie = $cookies[0];
+        $this->assertInstanceOf(SetCookie::class, $cookie);
+        $this->assertSame('.zendframework.com', $cookie->getDomain());
+    }
 }