Add require dependency httpsoft/http-message

Author: devanych

README.md

@@ -22,53 +22,7 @@ This package requires PHP version 7.4 or later.
 composer require httpsoft/http-response
 ```
 
-## Usage Response
-
-```php
-use HttpSoft\Response\Response;
-use HttpSoft\Response\ResponseFactory;
-
-$response = ResponseFactory::create();
-// equivalently to:
-$response = new Response();
-// default values
-$response->getStatusCode(); // 200
-$response->getReasonPhrase(); // 'OK'
-$response->getBody()->getContents(); // ''
-$response->getBody()->getMetadata('uri') // 'php://temp'
-$response->getHeaders(); // []
-$response->getProtocolVersion(); // '1.1'
-
-// Create with the passed parameters
-$response = new Response(404, ['Content-Language' => 'en'], 'php://memory', '2');
-$response->getStatusCode(); // 404
-$response->getReasonPhrase(); // 'Not Found'
-$response->getBody()->getContents(); // ''
-$response->getBody()->getMetadata('uri') // 'php://memory'
-$response->getHeaders(); // ['Content-Language' => ['en']]
-$response->getProtocolVersion(); // '2'
-
-// Write to the response body:
-$response->getBody()->write('Content');
-$response->getBody()->getContents(); // 'Content'
-
-// With `Content-Type` header:
-$newResponse = $response->withHeader('Content-Type', 'text/plain');
-$newResponse->getHeaderLine('content-type'); // 'text/plain'
-$newResponse->getHeaders(); // ['Content-Language' => ['ru'], 'Content-Type' => ['text/plain']]
-
-// With status code:
-$newResponse = $response->withStatus(Response::STATUS_INTERNAL_SERVER_ERROR);
-$newResponse->getStatusCode(); // 500
-$newResponse->getReasonPhrase(); // 'Internal Server Error'
-
-// With status code and reason phrase:
-$newResponse = $response->withStatus(599, 'Custom Phrase');
-$newResponse->getStatusCode(); // 599
-$newResponse->getReasonPhrase(); // 'Custom Phrase'
-```
-
-## Create custom responses
+## Usage
 
 ```php
 // Create `Psr\Http\Message\ResponseInterface` instance from HTML: 

composer.json

@@ -20,7 +20,7 @@
     },
     "require": {
         "php": "^7.4|^8.0",
-        "httpsoft/http-stream": "^1.1"
+        "httpsoft/http-message": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3",

psalm.xml

@@ -16,11 +16,8 @@
     <issueHandlers>
         <DocblockTypeContradiction errorLevel="info" />
         <MixedAssignment errorLevel="info" />
-        <MixedArgumentTypeCoercion errorLevel="info" />
-        <MixedPropertyTypeCoercion errorLevel="info" />
         <PropertyNotSetInConstructor errorLevel="info" />
         <RedundantCondition errorLevel="info" />
-        <RedundantConditionGivenDocblockType errorLevel="info" />
         <TypeDoesNotContainType errorLevel="info" />
     </issueHandlers>
 </psalm>

src/ContentTrait.php

@@ -4,12 +4,12 @@
 
 namespace HttpSoft\Response;
 
-use HttpSoft\Stream\StreamFactory;
+use HttpSoft\Message\Stream;
 use Psr\Http\Message\ResponseInterface;
 
 final class EmptyResponse implements ResponseInterface, ResponseStatusCodeInterface
 {
-    use ResponseTrait;
+    use ResponseExtensionTrait;
 
     /**
      * @param int $code
@@ -23,6 +23,6 @@ public function __construct(
         string $protocol = '1.1',
         string $reasonPhrase = ''
     ) {
-        $this->init($code, $reasonPhrase, $headers, StreamFactory::create('php://temp', 'r'), $protocol);
+        $this->init($code, $reasonPhrase, $headers, new Stream('php://temp', 'r'), $protocol);
     }
 }

src/EmptyResponse.php

@@ -4,12 +4,11 @@
 
 namespace HttpSoft\Response;
 
-use HttpSoft\Stream\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
 
 final class HtmlResponse implements ResponseInterface, ResponseStatusCodeInterface
 {
-    use ResponseTrait;
+    use ResponseExtensionTrait;
 
     /**
      * @param string $html
@@ -25,7 +24,7 @@ public function __construct(
         string $protocol = '1.1',
         string $reasonPhrase = ''
     ) {
-        $this->init($code, $reasonPhrase, $headers, StreamFactory::createFromContent($html), $protocol);
+        $this->init($code, $reasonPhrase, $headers, $this->createBody($html), $protocol);
         $this->setContentTypeHeaderIfNotExists('text/html; charset=UTF-8');
     }
 }

src/HtmlResponse.php

@@ -4,7 +4,6 @@
 
 namespace HttpSoft\Response;
 
-use HttpSoft\Stream\StreamFactory;
 use InvalidArgumentException;
 use JsonException;
 use Psr\Http\Message\ResponseInterface;
@@ -25,7 +24,7 @@
 
 final class JsonResponse implements ResponseInterface, ResponseStatusCodeInterface
 {
-    use ResponseTrait;
+    use ResponseExtensionTrait;
 
     /**
      * Default options for `json_encode()`.
@@ -55,7 +54,7 @@ public function __construct(
         int $encodingOptions = self::DEFAULT_OPTIONS
     ) {
         $json = $this->encode($data, $encodingOptions);
-        $this->init($code, $reasonPhrase, $headers, StreamFactory::createFromContent($json), $protocol);
+        $this->init($code, $reasonPhrase, $headers, $this->createBody($json), $protocol);
         $this->setContentTypeHeaderIfNotExists('application/json; charset=UTF-8');
     }
 
@@ -66,7 +65,7 @@ public function __construct(
      */
     public function withJsonData($data, int $encodingOptions = self::DEFAULT_OPTIONS): self
     {
-        return $this->withBody(StreamFactory::createFromContent($this->encode($data, $encodingOptions)));
+        return $this->withBody($this->createBody($this->encode($data, $encodingOptions)));
     }
 
     /**

src/JsonResponse.php

@@ -8,7 +8,7 @@
 
 final class RedirectResponse implements ResponseInterface, ResponseStatusCodeInterface
 {
-    use ResponseTrait;
+    use ResponseExtensionTrait;
 
     /**
      * @param string $uri

src/RedirectResponse.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace HttpSoft\Response;
+
+use HttpSoft\Message\ResponseTrait;
+use HttpSoft\Message\Stream;
+
+/**
+ * Trait extends the standard functionality defined in `Psr\Http\Message\ResponseInterface`.
+ *
+ * @see https://github.com/php-fig/http-message/tree/master/src/ResponseInterface.php
+ */
+trait ResponseExtensionTrait
+{
+    use ResponseTrait;
+
+    /**
+     * Sets the provided Content-Type, if none is already present.
+     *
+     * @param string $contentType
+     */
+    private function setContentTypeHeaderIfNotExists(string $contentType): void
+    {
+        if (!$this->hasHeader('content-type')) {
+            $this->headerNames['content-type'] = 'Content-Type';
+            $this->headers[$this->headerNames['content-type']] = [$contentType];
+        }
+    }
+
+    /**
+     * Create the message body.
+     *
+     * @param string $content
+     * @return Stream
+     */
+    private function createBody(string $content = ''): Stream
+    {
+        $stream = new Stream();
+        $stream->write($content);
+        $stream->rewind();
+        return $stream;
+    }
+}