Refactoring

Author: coisa

src/JsonResponse.php

@@ -24,9 +24,9 @@
  * This class MUST be used when returning JSON payloads over HTTP responses.
  * It automatically sets the 'Content-Type' header to 'application/json' with the specified charset.
  *
- * @method JsonStreamInterface getBody() Retrieves the response body as a JSON stream.
+ * @method PayloadStreamInterface getBody() Retrieves the response body as a JSON stream.
  */
-final class JsonResponse extends Response implements JsonResponseInterface
+final class JsonResponse extends Response implements PayloadResponseInterface
 {
     /**
      * Constructs a new JsonResponse instance with an optional payload and charset.

src/JsonStream.php

@@ -29,7 +29,7 @@
  *
  * @package FastForward\Http\Message
  */
-final class JsonStream extends Stream implements JsonStreamInterface
+final class JsonStream extends Stream implements PayloadStreamInterface
 {
     /**
      * JSON encoding flags to be applied by default.

src/JsonResponseInterface.php src/PayloadResponseInterface.phpsrc/JsonResponseInterface.php renamed to src/PayloadResponseInterface.php

@@ -18,11 +18,11 @@
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * Interface JsonResponseInterface.
+ * Interface PayloadResponseInterface.
  *
- * Defines the contract for JSON-specific HTTP response implementations.
- * Implementations of this interface MUST provide access to a JSON payload and comply with PSR-7 ResponseInterface.
+ * Defines the contract for payload-specific HTTP response implementations.
+ * Implementations of this interface MUST provide access to a payload and comply with PSR-7 ResponseInterface.
  *
- * This interface SHALL be used to identify responses intended to transmit JSON-encoded payloads with proper headers.
+ * This interface SHALL be used to identify responses intended to transmit payloads with proper headers.
  */
-interface JsonResponseInterface extends ResponseInterface, PayloadAwareInterface, PayloadImmutableInterface {}
+interface PayloadResponseInterface extends PayloadAwareInterface, PayloadImmutableInterface, ResponseInterface {}

src/JsonStreamInterface.php src/PayloadStreamInterface.phpsrc/JsonStreamInterface.php renamed to src/PayloadStreamInterface.php

@@ -18,11 +18,11 @@
 use Psr\Http\Message\StreamInterface;
 
 /**
- * Interface JsonStreamInterface.
+ * Interface PayloadStreamInterface.
  *
- * Extends the PSR-7 StreamInterface to provide additional functionality for JSON payload handling.
- * Implementations of this interface MUST support both standard stream operations and structured JSON payload manipulation.
+ * Extends the PSR-7 StreamInterface to provide additional functionality for payload handling.
+ * Implementations of this interface MUST support both standard stream operations and structured payload manipulation.
  *
  * @package FastForward\Http\Message
  */
-interface JsonStreamInterface extends StreamInterface, PayloadAwareInterface, PayloadImmutableInterface {}
+interface PayloadStreamInterface extends PayloadAwareInterface, PayloadImmutableInterface, StreamInterface {}

tests/JsonResponseTest.php

@@ -16,9 +16,9 @@
 namespace FastForward\Http\Message\Tests;
 
 use FastForward\Http\Message\JsonResponse;
-use FastForward\Http\Message\JsonResponseInterface;
 use FastForward\Http\Message\JsonStream;
-use FastForward\Http\Message\JsonStreamInterface;
+use FastForward\Http\Message\PayloadResponseInterface;
+use FastForward\Http\Message\PayloadStreamInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
@@ -32,7 +32,7 @@ final class JsonResponseTest extends TestCase
 {
     public function testClassImplementsJsonResponseInterface(): void
     {
-        self::assertInstanceOf(JsonResponseInterface::class, new JsonResponse());
+        self::assertInstanceOf(PayloadResponseInterface::class, new JsonResponse());
     }
 
     public function testConstructorWillInitializeWithPayload(): void
@@ -42,7 +42,7 @@ public function testConstructorWillInitializeWithPayload(): void
         $response = new JsonResponse($payload);
 
         self::assertSame(['success' => true], $response->getPayload());
-        self::assertInstanceOf(JsonStreamInterface::class, $response->getBody());
+        self::assertInstanceOf(PayloadStreamInterface::class, $response->getBody());
         self::assertSame('application/json; charset=utf-8', $response->getHeaderLine('Content-Type'));
     }