Marqitos · Marqitos · Jan 12, 2026 · Jan 12, 2026 · Jan 12, 2026
diff --git a/src/MessageTrait.php b/src/MessageTrait.php
@@ -19,6 +19,7 @@
 namespace Rodas\Diactoros;
 
 use InvalidArgumentException;
+use Override;
 use Rodas\Psr\Http\Message\MessageInterface;
 use Rodas\Psr\Http\Message\StreamInterface;
 
@@ -71,7 +72,6 @@ trait MessageTrait {
         set => $this->body = $value;
     }
 
-
     /**
      * Return an instance with the specified HTTP protocol version.
      *
@@ -85,8 +85,7 @@ trait MessageTrait {
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion(string $version): MessageInterface
-    {
+    public function withProtocolVersion(string $version): MessageInterface {
         $this->validateProtocolVersion($version);
         $new           = clone $this;
         $new->protocolVersion = $version;
@@ -152,17 +151,16 @@ public function getHeaderLine(string $name): string {
     public function withHeader(string $name, $value): MessageInterface {
         $this->assertHeader($name);
 
-        $normalized = strtolower($name);
-
-        $new = clone $this;
+        $normalized                    = strtolower($name);
+        $new                           = clone $this;
+        $newHeaders                    = $new->headers;
         if ($new->hasHeader($name)) {
-            unset($new->headers[$new->headerNames[$normalized]]);
+            unset($newHeaders[$new->headerNames[$normalized]]);
         }
 
-        $value = $this->filterHeaderValue($value);
-
         $new->headerNames[$normalized] = $name;
-        $new->headers[$name]           = $value;
+        $newHeaders[$name]             = $this->filterHeaderValue($value);
+        $new->headers                  = $newHeaders;
 
         return $new;
     }
@@ -193,9 +191,11 @@ public function withAddedHeader(string $name, $value): MessageInterface {
 
         $header = $this->headerNames[strtolower($name)];
 
-        $new                   = clone $this;
-        $value                 = $this->filterHeaderValue($value);
-        $new->headers[$header] = array_merge($this->headers[$header], $value);
+        $new                    = clone $this;
+        $value                  = $this->filterHeaderValue($value);
+        $newHeaders             = $new->headers;
+        $newHeaders[$header]    = array_merge($this->headers[$header], $value);
+        $new->headers           = $newHeaders;
         return $new;
     }
 
@@ -220,7 +220,9 @@ public function withoutHeader(string $name): MessageInterface {
         $original   = $this->headerNames[$normalized];
 
         $new = clone $this;
-        unset($new->headers[$original], $new->headerNames[$normalized]);
+        $newHeaders = $new->headers;
+        unset($newHeaders[$original], $new->headerNames[$normalized]);
+        $new->headers = $newHeaders;
         return $new;
     }
 

diff --git a/src/RelativeStream.php b/src/RelativeStream.php
@@ -42,7 +42,7 @@ public function __construct(private readonly StreamInterface $decoratedStream, ?
      */
     #[Override]
     public function __toString(): string {
-        if ($this->isSeekable()) {
+        if ($this->isSeekable) {
             $this->seek(0);
         }
         return $this->getContents();
@@ -69,7 +69,7 @@ public function detach() {
      */
     public ?int $size {
         get {
-            $size = $this->decoratedStream->getSize();
+            $size = $this->decoratedStream->size;
             if ($size === null) {
                 return null;
             }

diff --git a/src/Request.php b/src/Request.php
@@ -19,9 +19,8 @@
 namespace Rodas\Diactoros;
 
 use InvalidArgumentException;
-use Override;
 use Rodas\Psr\Http\Message\RequestInterface;
-use Rodas\Psr\Http\Message\StatusCode;
+use Rodas\Psr\Http\Message\RequestMethod;
 use Rodas\Psr\Http\Message\StreamInterface;
 use Rodas\Psr\Http\Message\UriInterface;
 
@@ -44,7 +43,7 @@ class Request implements RequestInterface {
      * @param array<non-empty-string, string|string[]> $headers Headers for the message, if any.
      * @throws InvalidArgumentException For any invalid value.
      */
-    public function __construct($uri = null, ?string $method = null, $body = 'php://temp', array $headers = []) {
+    public function __construct(UriInterface|string|null $uri = null, RequestMethod|string|null $method = null, $body = 'php://temp', array $headers = []) {
         $this->initialize($uri, $method, $body, $headers);
     }
 
@@ -55,13 +54,16 @@ public function __construct($uri = null, ?string $method = null, $body = 'php://
      */
     public protected(set) array $headers = [] {
         get {
-            $headers = $this->headers;
             if (! $this->hasHeader('host') &&
                 $this->uri->host) {
+
+                $headers = $this->headers;
                 $headers['Host'] = [$this->getHostFromUri()];
+                $this->headerNames['host'] = 'Host';
+                $this->headers = $headers;
             }
 
-            return $headers;
+            return $this->headers;
         }
         set => $this->headers = $value;
     }

diff --git a/src/Request/ArraySerializer.php b/src/Request/ArraySerializer.php
@@ -48,12 +48,12 @@ final class ArraySerializer {
      */
     public static function toArray(RequestInterface $request): array {
         return [
-            'method'           => $request->getMethod(),
-            'request_target'   => $request->getRequestTarget(),
-            'uri'              => (string) $request->getUri(),
-            'protocol_version' => $request->getProtocolVersion(),
-            'headers'          => $request->getHeaders(),
-            'body'             => (string) $request->getBody(),
+            'method'           => $request->method,
+            'request_target'   => $request->requestTarget,
+            'uri'              => (string) $request->uri,
+            'protocol_version' => $request->protocolVersion,
+            'headers'          => $request->headers,
+            'body'             => (string) $request->body,
         ];
     }
 

diff --git a/src/Request/Serializer.php b/src/Request/Serializer.php
@@ -79,9 +79,9 @@ public static function fromStream(StreamInterface $stream): Request {
      * Serialize a request message to a string.
      */
     public static function toString(RequestInterface $request): string {
-        $httpMethod = $request->getMethod();
-        $headers    = self::serializeHeaders($request->getHeaders());
-        $body       = (string) $request->getBody();
+        $httpMethod = $request->method;
+        $headers    = self::serializeHeaders($request->headers);
+        $body       = (string) $request->body;
         $format     = '%s %s HTTP/%s%s%s';
 
         if (! empty($headers)) {
@@ -94,8 +94,8 @@ public static function toString(RequestInterface $request): string {
         return sprintf(
             $format,
             $httpMethod,
-            $request->getRequestTarget(),
-            $request->getProtocolVersion(),
+            $request->requestTarget,
+            $request->protocolVersion,
             $headers,
             $body
         );

diff --git a/src/RequestFactory.php b/src/RequestFactory.php
@@ -20,14 +20,14 @@
 
 use Override;
 use Rodas\Psr\Http\Message\RequestFactoryInterface;
-use Rodas\Psr\Http\Message\RequestInterface;
+use Rodas\Psr\Http\Message\UriInterface;
 
 class RequestFactory implements RequestFactoryInterface {
     /**
      * {@inheritDoc}
      */
     #[Override]
-    public function createRequest(string $method, $uri): RequestInterface {
+    public function createRequest(string $method, string|UriInterface $uri): Request {
         return new Request($uri, $method);
     }
 }
diff --git a/src/RequestTrait.php b/src/RequestTrait.php
@@ -100,11 +100,6 @@ trait RequestTrait {
         set => $this->requestTarget = $value;
     }
 
-    public private(set) StreamInterface $stream {
-        get => $this->stream;
-        set => $this->stream = $value;
-    }
-
     /**
      * Gets the URI instance.
      *
@@ -131,7 +126,7 @@ trait RequestTrait {
      * @throws InvalidArgumentException For any invalid value.
      */
     private function initialize(
-        $uri = null,
+        UriInterface|string|null $uri = null,
         RequestMethod|string|null $method = null,
         $body = 'php://memory',
         array $headers = []
@@ -140,16 +135,20 @@ private function initialize(
             $this->setMethod($method);
         }
 
-        $this->uri    = $this->createUri($uri);
-        $this->stream = $this->getStream($body, 'wb+');
+        $this->uri  = $this->createUri($uri);
+        $this->body = $this->getStream($body, 'wb+');
 
         $this->setHeaders($headers);
 
         // per PSR-7: attempt to set the Host header from a provided URI if no
         // Host header is provided
-        if (! $this->hasHeader('Host') && $this->uri->host) {
-            $this->headerNames['host'] = 'Host';
-            $this->headers['Host']     = [$this->getHostFromUri()];
+        if (! $this->hasHeader('Host') &&
+            $this->uri->host) {
+
+            $this->headerNames['host']  = 'Host';
+            $headers                    = $this->headers;
+            $headers['Host']            = [$this->getHostFromUri()];
+            $this->headers              = $headers;
         }
     }
 
@@ -167,7 +166,7 @@ private function initialize(
      *
      * @throws InvalidArgumentException
      */
-    private function createUri(null|string|UriInterface $uri): UriInterface {
+    private function createUri(UriInterface|string|null $uri): UriInterface {
         if ($uri instanceof UriInterface) {
             return $uri;
         }
@@ -279,14 +278,15 @@ public function withUri(UriInterface $uri, bool $preserveHost = false): RequestI
         // Remove an existing host header if present, regardless of current
         // de-normalization of the header name.
         // @see https://github.com/zendframework/zend-diactoros/issues/91
-        foreach (array_keys($new->headers) as $header) {
+        $newHeaders = $new->headers;
+        foreach (array_keys($newHeaders) as $header) {
             if (strtolower($header) === 'host') {
-                unset($new->headers[$header]);
+                unset($newHeaders[$header]);
             }
         }
 
-        $new->headers['Host'] = [$host];
-
+        $newHeaders['Host'] = [$host];
+        $new->headers = $newHeaders;
         return $new;
     }
 
@@ -314,7 +314,9 @@ private function setMethod(RequestMethod|string $method): void {
      */
     private function getHostFromUri(): string {
         $host  = $this->uri->host;
-        $host .= $this->uri->port !== null ? ':' . $this->uri->port : '';
+        $host .= $this->uri->port !== null
+            ? ':' . $this->uri->port
+            : '';
         return $host;
     }
 }
diff --git a/src/Response.php b/src/Response.php
@@ -156,7 +156,7 @@ class Response implements ResponseInterface {
         set => $this->reasonPhrase = $value;
     }
 
-    public private(set) int $status {
+    public private(set) int $status = 200 {
         get => $this->status;
         set(int $value) {
             if ($value < static::MIN_STATUS_CODE_VALUE ||
@@ -170,6 +170,7 @@ class Response implements ResponseInterface {
             } else {
                 $statusCode = StatusCode::tryFrom($value);
                 if ($this->statusCode !== $statusCode) {
+
                     $this->statusCode = $statusCode;
                 }
             }
@@ -180,16 +181,15 @@ class Response implements ResponseInterface {
     /**
      * {@inheritdoc}
      */
-    public private(set) ?StatusCode $statusCode {
+    public private(set) ?StatusCode $statusCode = StatusCode::OK {
         get => $this->statusCode;
         set(?StatusCode $value)  {
-            if ($value === null) {
-                throw new InvalidArgumentException('Status code cannot be null');
-            }
-            $this->statusCode = $value;
-            $code       = $statusCode->value;
-            if ($this->status !== $code) {
-                $this->status = $code;
+            $this->statusCode   = $value;
+            if ($value !== null) {
+                $code               = $value->value;
+                if ($this->status !== $code) {
+                    $this->status = $code;
+                }
             }
         }
     }
@@ -202,7 +202,7 @@ class Response implements ResponseInterface {
      */
     public function __construct($body = 'php://memory', int $status = 200, array $headers = []) {
         $this->setStatusCode($status);
-        $this->stream = $this->getStream($body, 'wb+');
+        $this->body = $this->getStream($body, 'wb+');
         $this->setHeaders($headers);
     }
 

diff --git a/src/Response/ArraySerializer.php b/src/Response/ArraySerializer.php
@@ -47,11 +47,11 @@ final class ArraySerializer {
      */
     public static function toArray(ResponseInterface $response): array {
         return [
-            'status_code'      => $response->getStatusCode(),
-            'reason_phrase'    => $response->getReasonPhrase(),
-            'protocol_version' => $response->getProtocolVersion(),
-            'headers'          => $response->getHeaders(),
-            'body'             => (string) $response->getBody(),
+            'status_code'      => $response->status,
+            'reason_phrase'    => $response->reasonPhrase,
+            'protocol_version' => $response->protocolVersion,
+            'headers'          => $response->headers,
+            'body'             => (string) $response->body,
         ];
     }
 

diff --git a/src/Response/Serializer.php b/src/Response/Serializer.php
@@ -67,9 +67,9 @@ public static function fromStream(StreamInterface $stream): Response {
      * Create a string representation of a response.
      */
     public static function toString(ResponseInterface $response): string {
-        $reasonPhrase = $response->getReasonPhrase();
-        $headers      = self::serializeHeaders($response->getHeaders());
-        $body         = (string) $response->getBody();
+        $reasonPhrase = $response->reasonPhrase;
+        $headers      = self::serializeHeaders($response->headers);
+        $body         = (string) $response->body;
         $format       = 'HTTP/%s %d%s%s%s';
 
         if (! empty($headers)) {
@@ -80,8 +80,8 @@ public static function toString(ResponseInterface $response): string {
 
         return sprintf(
             $format,
-            $response->getProtocolVersion(),
-            $response->getStatusCode(),
+            $response->protocolVersion,
+            $response->status,
             $reasonPhrase ? ' ' . $reasonPhrase : '',
             $headers,
             $body