Improved custom responses performance

Author: divineniiquaye

src/Response/HtmlResponse.php

@@ -18,28 +18,22 @@
 namespace Biurad\Http\Response;
 
 use Biurad\Http\Response;
-use Biurad\Http\Traits\InjectContentTypeTrait;
-use Biurad\Http\Exception;
 use Psr\Http\Message\StreamInterface;
 
 /**
  * HTML response with Content-Type header to text/html.
  */
 class HtmlResponse extends Response
 {
-    use InjectContentTypeTrait;
-
     /**
      * Produces an HTML response with a Content-Type of text/html and a default status of 200.
      *
      * @param StreamInterface|string $html    HTML or stream for the message body
      * @param int                    $status  integer status code for the response; 200 by default
      * @param array                  $headers array of headers to use at initialization
-     *
-     * @throws Exception\InvalidArgumentException if $html is neither a string or stream
      */
     public function __construct($html, int $status = 200, array $headers = [])
     {
-        parent::__construct($status, $this->injectContentType('text/html; charset=utf-8', $headers), $html);
+        parent::__construct($status, ['content-type' => ['text/html; charset=utf-8']] + $headers, $html);
     }
 }

src/Response/JsonResponse.php

@@ -19,7 +19,6 @@
 
 use Biurad\Http\Response;
 use Biurad\Http\Exception;
-use Biurad\Http\Traits\InjectContentTypeTrait;
 use Symfony\Component\HttpFoundation\JsonResponse as HttpFoundationJsonResponse;
 use Symfony\Component\HttpFoundation\Response as HttpFoundationResponse;
 
@@ -28,8 +27,6 @@
  */
 class JsonResponse extends Response
 {
-    use InjectContentTypeTrait;
-
     /**
      * Create a JSON response with the given data.
      *

src/Response/TextResponse.php

@@ -18,28 +18,22 @@
 namespace Biurad\Http\Response;
 
 use Biurad\Http\Response;
-use Biurad\Http\Traits\InjectContentTypeTrait;
-use Biurad\Http\Exception;
 use Psr\Http\Message\StreamInterface;
 
 /**
  * Plain text response with Content-Type header to text/plain.
  */
 class TextResponse extends Response
 {
-    use InjectContentTypeTrait;
-
     /**
      * Produces a text response with a Content-Type of text/plain and a default status of 200.
      *
      * @param StreamInterface|string $text    string or stream for the message body
      * @param int                    $status  integer status code for the response; 200 by default
      * @param array                  $headers array of headers to use at initialization
-     *
-     * @throws Exception\InvalidArgumentException if $text is neither a string or stream
      */
     public function __construct($text, int $status = 200, array $headers = [])
     {
-        parent::__construct($status, $this->injectContentType('text/plain; charset=utf-8', $headers), $text);
+        parent::__construct($status, ['content-type' => ['text/plain; charset=utf-8']] + $headers, $text);
     }
 }

src/Response/XmlResponse.php

@@ -18,28 +18,22 @@
 namespace Biurad\Http\Response;
 
 use Biurad\Http\Response;
-use Biurad\Http\Traits\InjectContentTypeTrait;
-use Biurad\Http\Exception;
 use Psr\Http\Message\StreamInterface;
 
 /**
  * XML response with Content-Type header to application/xml.
  */
 class XmlResponse extends Response
 {
-    use InjectContentTypeTrait;
-
     /**
      * Produces an XML response with a Content-Type of application/xml and a default status of 200.
      *
      * @param StreamInterface|string $xml     string or stream for the message body
      * @param int                    $status  integer status code for the response; 200 by default
      * @param array                  $headers array of headers to use at initialization
-     *
-     * @throws Exception\InvalidArgumentException if $text is neither a string or stream
      */
     public function __construct($xml, int $status = 200, array $headers = [])
     {
-        parent::__construct($status, $this->injectContentType('application/xml; charset=utf-8', $headers), $xml);
+        parent::__construct($status, ['content-type' => ['application/xml; charset=utf-8']] + $headers, $xml);
     }
 }