Merge branch 'feature/88' into develop

Close #88
Fixes #84

CHANGELOG.md

@@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
+- [#88](https://github.com/zendframework/zend-diactoros/pull/88) updates the
+  `SapiEmitter` to emit a `Content-Length` header with the content length as
+  reported by the response body stream.
 - [#77](https://github.com/zendframework/zend-diactoros/pull/77) adds a new
   response type, `Zend\Diactoros\Response\TextResponse`, for returning plain
   text responses. By default, it sets the content type to `text/plain;

src/Response/SapiEmitter.php

@@ -29,6 +29,10 @@ public function emit(ResponseInterface $response, $maxBufferLevel = null)
             throw new RuntimeException('Unable to emit response; headers already sent');
         }
 
+        if (! $response->hasHeader('Content-Length')) {
+            $response = $response->withHeader('Content-Length', (string) $response->getBody()->getSize());
+        }
+
         $this->emitStatusLine($response);
         $this->emitHeaders($response);
         $this->emitBody($response, $maxBufferLevel);

test/Response/SapiEmitterTest.php

@@ -12,7 +12,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\SapiEmitter;
-use Zend\Diactoros\Stream;
 use ZendTest\Diactoros\TestAsset\HeaderStack;
 
 class SapiEmitterTest extends TestCase
@@ -45,6 +44,7 @@ public function testEmitsResponseHeaders()
         ob_end_clean();
         $this->assertContains('HTTP/1.1 200 OK', HeaderStack::stack());
         $this->assertContains('Content-Type: text/plain', HeaderStack::stack());
+        $this->assertContains('Content-Length: 8', HeaderStack::stack());
     }
 
     public function testEmitsMessageBody()

test/ServerTest.php

@@ -13,6 +13,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Server;
+use Zend\Diactoros\Stream;
 use ZendTest\Diactoros\TestAsset\HeaderStack;
 
 class ServerTest extends TestCase
@@ -229,6 +230,7 @@ public function testEmitsHeadersWithMultipleValuesMultipleTimes()
      */
     public function testHeaderOrderIsHonoredWhenEmitted($stack)
     {
+        array_pop($stack); // ignore "Content-Length" automatically set by the response emitter
         $header = array_pop($stack);
         $this->assertContains(
             'Set-Cookie: bar=baz; expires=Wed, 8 Oct 2014 10:30; path=/foo/bar; domain=example.com',
@@ -253,6 +255,16 @@ public function testListenPassesCallableArgumentToCallback()
             ->method('getHeaders')
             ->will($this->returnValue([]));
 
+        $responseBody = new Stream('php://temp');
+        $this->response
+            ->expects($this->any())
+            ->method('getBody')
+            ->willReturn($responseBody);
+        $this->response
+            ->expects($this->any())
+            ->method('withHeader')
+            ->willReturnSelf();
+
         $final = function ($req, $res, $err = null) use ($phpunit, $request, $response, &$invoked) {
             $phpunit->assertSame($request, $req);
             $phpunit->assertSame($response, $res);