Use new EmptyResponse class instead of separate constructor

Author: franzliedke

src/Response/EmptyResponse.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * A class representing empty HTTP responses.
+ */
+class EmptyResponse extends Response
+{
+    /**
+     * Create an empty response with the given status code.
+     *
+     * @param int $status Status code for the response, if any.
+     * @param array $headers Headers for the response, if any.
+     */
+    public function __construct($status = 204, array $headers = [])
+    {
+        $body = new Stream('php://temp', 'r');
+        parent::__construct($body, $status, $headers);
+    }
+    
+    /**
+     * Create an empty response with the given headers.
+     *
+     * @param array $headers Headers for the response.
+     * @return EmptyResponse
+     */
+    public static function withHeaders(array $headers)
+    {
+        return new static(204, $headers);
+    }
+}

src/Response/StringResponse.php

@@ -60,18 +60,6 @@ public static function json($data, $status = 200, array $headers = [])
         return static::createResponse($json, $status, $headers, 'application/json');
     }
 
-    /**
-     * Create an empty response with the given status code.
-     *
-     * @param int $status Status code for the response, if any.
-     * @param array $headers Headers for the response, if any.
-     * @return Response
-     */
-    public static function noContent($status = 204, array $headers = [])
-    {
-        return static::createResponse('', $status, $headers, null);
-    }
-
     /**
      * This class is non-instantiable.
      */

test/Response/EmptyResponseTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Response;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Diactoros\Response\EmptyResponse;
+
+class EmptyResponseTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $response = new EmptyResponse(201);
+        $this->assertInstanceOf('Zend\Diactoros\Response', $response);
+        $this->assertEquals('', (string) $response->getBody());
+        $this->assertEquals(201, $response->getStatusCode());
+    }
+    
+    public function testHeaderConstructor()
+    {
+        $response = EmptyResponse::withHeaders(['x-empty' => ['true']]);
+        $this->assertInstanceOf('Zend\Diactoros\Response', $response);
+        $this->assertEquals('', (string) $response->getBody());
+        $this->assertEquals(204, $response->getStatusCode());
+        $this->assertEquals('true', $response->getHeaderLine('x-empty'));
+    }
+}

test/Response/StringResponseTest.php

@@ -83,14 +83,6 @@ public function testScalarValuePassedToJsonRendersValueWithinJSONArray($value)
         $this->assertSame(json_encode([$value], JSON_UNESCAPED_SLASHES), (string) $response->getBody());
     }
 
-    public function testNoContentConstructor()
-    {
-        $response = StringResponse::noContent();
-        $this->assertInstanceOf('Zend\Diactoros\Response', $response);
-        $this->assertEquals(204, $response->getStatusCode());
-        $this->assertEquals('', (string) $response->getBody());
-    }
-
     public function testContentTypeCanBeOverwritten()
     {
         $data = null;