Upgrade the minimum php version to 8.0 for http-message.

Author: limingxinleo

src/Base/MessageTrait.php

@@ -23,22 +23,13 @@ trait MessageTrait
     /**
      * @var array lowercase headers
      */
-    protected $headerNames;
+    protected array $headerNames = [];
 
-    /**
-     * @var array
-     */
-    protected $headers = [];
+    protected array $headers = [];
 
-    /**
-     * @var string
-     */
-    protected $protocol = '1.1';
+    protected string $protocol = '1.1';
 
-    /**
-     * @var null|StreamInterface
-     */
-    protected $stream;
+    protected ?StreamInterface $stream = null;
 
     /**
      * Retrieves the HTTP protocol version as a string.
@@ -190,10 +181,7 @@ public function withHeader($name, $value)
         return $new;
     }
 
-    /**
-     * @return static
-     */
-    public function withHeaders(array $headers)
+    public function withHeaders(array $headers): static
     {
         $new = clone $this;
         foreach ($headers as $name => $value) {
@@ -314,7 +302,7 @@ public function withBody(StreamInterface $body)
      * @throws \RuntimeException
      * @return array|string wanted part or all parts as array($firstName => firstPart, partname => value)
      */
-    public function getHeaderField($name, $wantedPart = '0', $firstName = '0')
+    public function getHeaderField(string $name, string $wantedPart = '0', string $firstName = '0')
     {
         return Decode::splitHeaderField($this->getHeaderLine($name), $wantedPart, $firstName);
     }
@@ -338,10 +326,7 @@ public function isMultipart(): bool
         }
     }
 
-    /**
-     * @return static
-     */
-    private function setHeaders(array $headers)
+    private function setHeaders(array $headers): static
     {
         $this->headerNames = $this->headers = [];
         foreach ($headers as $header => $value) {
@@ -374,7 +359,7 @@ private function setHeaders(array $headers)
      * @return string[] Trimmed header values
      * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
      */
-    private function trimHeaderValues(array $values)
+    private function trimHeaderValues(array $values): array
     {
         return array_map(function ($value) {
             return trim((string) $value, " \t");

src/Base/Request.php

@@ -21,27 +21,13 @@ class Request implements RequestInterface
 {
     use MessageTrait;
 
-    /**
-     * @var array
-     */
-    protected $server = [];
+    protected array $server = [];
 
-    /**
-     * @var UriInterface
-     */
-    protected $uri;
+    protected UriInterface $uri;
 
-    /**
-     * Http Method.
-     *
-     * @var string
-     */
-    protected $method;
+    protected string $method;
 
-    /**
-     * @var string
-     */
-    protected $requestTarget;
+    protected ?string $requestTarget = null;
 
     /**
      * @param string $method HTTP method
@@ -52,9 +38,9 @@ class Request implements RequestInterface
      */
     public function __construct(
         string $method,
-        $uri,
+        string|UriInterface $uri,
         array $headers = [],
-        $body = null,
+        mixed $body = null,
         string $version = '1.1'
     ) {
         if (! $uri instanceof UriInterface) {
@@ -185,7 +171,7 @@ public function getUri(): UriInterface
      * default if the URI contains a host component. If the URI does not
      * contain a host component, any pre-existing Host header MUST be carried
      * over to the returned request.
-     * You can opt-in to preserving the original state of the Host header by
+     * You can opt in to preserving the original state of the Host header by
      * setting `$preserveHost` to `true`. When `$preserveHost` is set to
      * `true`, this method interacts with the Host header in the following ways:
      * - If the Host header is missing or empty, and the new URI contains
@@ -226,7 +212,7 @@ public function withUri(UriInterface $uri, $preserveHost = false): self
      *
      * @see http://tools.ietf.org/html/rfc7230#section-5.4
      */
-    private function updateHostFromUri()
+    private function updateHostFromUri(): void
     {
         $host = $this->uri->getHost();
 

src/Base/Response.php

@@ -17,23 +17,17 @@ class Response implements ResponseInterface
 {
     use MessageTrait;
 
-    /**
-     * @var string
-     */
-    protected $reasonPhrase = '';
+    protected string $reasonPhrase = '';
 
-    /**
-     * @var int
-     */
-    protected $statusCode = 200;
+    protected int $statusCode = 200;
+
+    protected string $charset = 'utf-8';
 
     /**
-     * @var string
+     * Map of standard HTTP status code/reason phrases.
+     * @var array<int, string>
      */
-    protected $charset = 'utf-8';
-
-    /** @var array Map of standard HTTP status code/reason phrases */
-    private static $phrases
+    private static array $phrases
         = [
             100 => 'Continue',
             101 => 'Switching Protocols',
@@ -95,10 +89,7 @@ class Response implements ResponseInterface
             511 => 'Network Authentication Required',
         ];
 
-    /**
-     * @var array
-     */
-    private $attributes = [];
+    private array $attributes = [];
 
     public function __toString()
     {
@@ -115,7 +106,7 @@ public function __toString()
      *
      * @return array attributes derived from the request
      */
-    public function getAttributes()
+    public function getAttributes(): array
     {
         return $this->attributes;
     }
@@ -332,7 +323,7 @@ public function isRedirect(string $location = null): bool
             303,
             307,
             308,
-        ]) && ($location === null ?: $location == $this->getHeaderLine('Location'));
+        ]) && ($location === null || $location == $this->getHeaderLine('Location'));
     }
 
     /**