some logic modify

.gitignore

@@ -7,4 +7,5 @@ composer.lock
 *.log
 *.pid
 *.patch
+*.cache
 .DS_Store

composer.json

@@ -13,7 +13,7 @@
     }
   ],
   "require": {
-    "php": ">7.0.0",
+    "php": ">7.1.0",
     "psr/http-message": "^1.0"
   },
   "autoload": {

src/Component/Collection.php

@@ -37,15 +37,15 @@ public function __construct(array $items = [])
     /**
      * @param array $values
      */
-    public function sets(array $values)
+    public function sets(array $values): void
     {
         $this->replace($values);
     }
 
     /**
      * @param array $items
      */
-    public function replace(array $items)
+    public function replace(array $items): void
     {
         foreach ($items as $key => $value) {
             $this->set($key, $value);
@@ -122,7 +122,7 @@ public function remove($key)
     /**
      * clear all data
      */
-    public function clear()
+    public function clear(): void
     {
         foreach ($this as $key) {
             unset($this[$key]);

src/Cookies.php

@@ -42,7 +42,7 @@ class Cookies extends Collection
      * Set default cookie properties
      * @param array $settings
      */
-    public function setDefaults(array $settings)
+    public function setDefaults(array $settings): void
     {
         $this->defaults = \array_replace($this->defaults, $settings);
     }

src/Headers.php

@@ -19,9 +19,9 @@ class Headers extends Collection
     /**
      * the connection header line data end char
      */
-    const EOL = "\r\n";
+    public const EOL = "\r\n";
 
-    const HEADER_END = "\r\n\r\n";
+    public const HEADER_END = "\r\n\r\n";
 
     /**
      * Special HTTP headers that do not have the "HTTP_" prefix
@@ -93,7 +93,7 @@ public function get(string $key, $default = null)
      * @param null $default
      * @return null|string
      */
-    public function getLine($name, $default = null)
+    public function getLine($name, $default = null): ?string
     {
         if ($val = $this->get($name)) {
             return \implode(',', $val);
@@ -161,7 +161,7 @@ public function getAcceptLanguages(): array
 
         if ($value = $this->getLine('Accept-Language')) {
             if (\strpos($value, ';')) {
-                list($value,) = \explode(';', $value, 2);
+                [$value,] = \explode(';', $value, 2);
             }
 
             $value = \str_replace(' ', '', $value);
@@ -182,7 +182,7 @@ public function getAcceptEncodes(): array
 
         if ($value = $this->getLine('Accept-Encoding')) {
             if (\strpos($value, ';')) {
-                list($value,) = \explode(';', $value, 2);
+                [$value,] = \explode(';', $value, 2);
             }
 
             $value = \str_replace(' ', '', $value);

src/HttpFactory.php

@@ -158,7 +158,7 @@ public static function createStream(string $content = ''): StreamInterface
      * @return StreamInterface
      * @throws \InvalidArgumentException
      */
-    public static function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
+    public static function createStreamFromFile(string $filename, string $mode = 'rb'): StreamInterface
     {
         // $stream = fopen('php://temp', $mode);
         $stream = \fopen($filename, $mode);

src/HttpUtil.php

@@ -16,15 +16,15 @@
  */
 class HttpUtil
 {
-    const FAV_ICON = '/favicon.ico';
+    public const FAV_ICON = '/favicon.ico';
 
     /**
      * Send the response the client
      * @param ResponseInterface $response
      * @param array $options
      * @throws \RuntimeException
      */
-    public static function respond(ResponseInterface $response, array $options = [])
+    public static function respond(ResponseInterface $response, array $options = []): void
     {
         $options = \array_merge([
             'chunkSize' => 4096,

src/Message.php

@@ -25,7 +25,7 @@ class Message implements MessageInterface
     /**
      * the connection header line data end char
      */
-    const EOL = "\r\n";
+    public const EOL = "\r\n";
 
     /**
      * BaseMessage constructor.

src/Request.php

@@ -27,7 +27,7 @@ class Request implements RequestInterface
 {
     use RequestTrait, RequestHeadersTrait;
 
-    const FAV_ICON = '/favicon.ico';
+    public const FAV_ICON = '/favicon.ico';
 
     /**
      * Request constructor.

src/Response.php

@@ -31,7 +31,7 @@ class Response implements ResponseInterface
     /**
      * the connection header line data end char
      */
-    const EOL = "\r\n";
+    public const EOL = "\r\n";
 
     /**
      * eg: 404

src/Response/JsonResponse.php

@@ -35,7 +35,7 @@ class JsonResponse extends Response
      *
      * @const int
      */
-    const DEFAULT_JSON_FLAGS = 79;
+    public const DEFAULT_JSON_FLAGS = 79;
 
     /**
      * @var mixed
@@ -177,7 +177,7 @@ private function jsonEncode($data, int $encodingOptions): string
     /**
      * @param $data
      */
-    private function setPayload($data)
+    private function setPayload($data): void
     {
         if (\is_object($data)) {
             $data = clone $data;

src/ServerRequest.php

@@ -29,7 +29,7 @@ class ServerRequest implements ServerRequestInterface
     /**
      * the connection header line data end char
      */
-    const EOL = "\r\n";
+    public const EOL = "\r\n";
 
     /**
      * @var array
@@ -75,14 +75,14 @@ public static function makeByParseRawData(string $rawData)
 
         // e.g: `GET / HTTP/1.1`
         $first = array_shift($list);
-        list($method, $uri, $protoStr) = array_map('trim', explode(' ', trim($first)));
-        list($protocol, $protocolVersion) = explode('/', $protoStr);
+        [$method, $uri, $protoStr] = array_map('trim', explode(' ', trim($first)));
+        [$protocol, $protocolVersion] = explode('/', $protoStr);
 
         // other header info
         $headers = [];
         foreach ($list as $item) {
             if ($item) {
-                list($name, $value) = explode(': ', trim($item));
+                [$name, $value] = explode(': ', trim($item));
                 $headers[$name] = trim($value);
             }
         }
@@ -96,7 +96,7 @@ public static function makeByParseRawData(string $rawData)
         $port = 80;
         $host = '';
         if ($val = $headers['Host'] ?? '') {
-            list($host, $port) = strpos($val, ':') ? explode(':', $val) : [$val, 80];
+            [$host, $port] = strpos($val, ':') ? explode(':', $val) : [$val, 80];
         }
 
         $path = $uri;
@@ -180,7 +180,7 @@ public function __toString()
     /**
      * registerDataParsers
      */
-    protected function registerDataParsers()
+    protected function registerDataParsers(): void
     {
         $this->registerMediaTypeParser('application/json', function ($input) {
             $result = \json_decode($input, true);
@@ -245,7 +245,7 @@ public function toString(): string
      * @param $mediaType
      * @param callable $callable
      */
-    public function registerMediaTypeParser($mediaType, callable $callable)
+    public function registerMediaTypeParser($mediaType, callable $callable): void
     {
         if ($callable instanceof \Closure) {
             $callable = $callable->bindTo($this);
@@ -281,7 +281,7 @@ public function getQueryParams(): array
      * @see getQueryParam()
      * @see getQueryParams()
      */
-    public function setQueryParams($values)
+    public function setQueryParams($values): void
     {
         $this->_queryParams = $values;
     }
@@ -363,7 +363,7 @@ public function getRawBody(): string
      * Sets the raw HTTP request body, this method is mainly used by test scripts to simulate raw HTTP requests.
      * @param string $rawBody the request body
      */
-    public function setRawBody($rawBody)
+    public function setRawBody($rawBody): void
     {
         $this->_rawBody = $rawBody;
     }
@@ -454,7 +454,7 @@ public function withParsedBody($data)
     /**
      * @param array $data
      */
-    public function setParsedBody($data)
+    public function setParsedBody($data): void
     {
         $this->bodyParsed = $data;
     }
@@ -743,7 +743,7 @@ public function getServerParam(string $key, $default = null)
     /**
      * @param array $serverParams
      */
-    public function setServerParams(array $serverParams)
+    public function setServerParams(array $serverParams): void
     {
         $this->serverParams = $serverParams;
     }

src/Stream.php

@@ -25,7 +25,7 @@ class Stream implements StreamInterface
      *
      * This is octal as per header stat.h
      */
-    const FSTAT_MODE_S_IFIFO = 0010000;
+    public const FSTAT_MODE_S_IFIFO = 0010000;
 
     /**
      * Resource modes
@@ -144,7 +144,7 @@ protected function isAttached(): bool
      *
      * @throws InvalidArgumentException If argument is not a valid PHP resource.
      */
-    protected function attach($newStream)
+    protected function attach($newStream): void
     {
         if (\is_resource($newStream) === false) {
             throw new InvalidArgumentException(__METHOD__ . ' argument must be a valid PHP resource');

src/Traits/MessageTrait.php

@@ -66,8 +66,7 @@ public function initialize(
         string $protocolVersion = '1.1',
         $headers = null,
         $body = 'php://memory'
-    )
-    {
+    ): void {
         $this->protocol = $protocol ?: 'http';
         $this->protocolVersion = $protocolVersion ?: '1.1';
 
@@ -99,7 +98,7 @@ public function getProtocol(): string
     /**
      * @param string $protocol
      */
-    public function setProtocol(string $protocol)
+    public function setProtocol(string $protocol): void
     {
         $this->protocol = $protocol;
     }
@@ -119,7 +118,7 @@ public function getProtocolVersion(): string
     /**
      * @param string $protocolVersion
      */
-    public function setProtocolVersion(string $protocolVersion)
+    public function setProtocolVersion(string $protocolVersion): void
     {
         $this->protocolVersion = $protocolVersion;
     }
@@ -265,7 +264,7 @@ public function setHeaders(array $headers): self
      * @return StreamInterface
      * @throws \InvalidArgumentException
      */
-    protected function createBodyStream($body, string $mode = 'r'): StreamInterface
+    protected function createBodyStream($body, string $mode = 'rb'): StreamInterface
     {
         if ($body instanceof StreamInterface) {
             return $body;

src/Traits/RequestHeadersTrait.php

@@ -115,11 +115,7 @@ public function getContentCharset(): string
     {
         $mediaTypeParams = $this->getMediaTypeParams();
 
-        if (isset($mediaTypeParams['charset'])) {
-            return $mediaTypeParams['charset'];
-        }
-
-        return '';
+        return $mediaTypeParams['charset'] ?? '';
     }
 
     /**

src/Traits/RequestTrait.php

@@ -61,7 +61,7 @@ trait RequestTrait
      * @param string|null $method
      * @throws \InvalidArgumentException
      */
-    protected function initializeRequest($uri = null, $method = null)
+    protected function initializeRequest($uri = null, $method = null): void
     {
         try {
             $this->originalMethod = $this->filterMethod($method);
@@ -148,7 +148,7 @@ public function getMethod(): string
     /**
      * @param string $method
      */
-    public function setMethod(string $method)
+    public function setMethod(string $method): void
     {
         $this->method = $method;
     }
@@ -244,7 +244,7 @@ public function withMethod($method): self
      * @return null|string
      * @throws \InvalidArgumentException on invalid HTTP method.
      */
-    protected function filterMethod($method)
+    protected function filterMethod($method): ?string
     {
         if ($method === null) {
             return $method;
@@ -329,7 +329,7 @@ public function getUri(): Uri
     /**
      * @param Uri $uri
      */
-    public function setUri(Uri $uri)
+    public function setUri(Uri $uri): void
     {
         $this->uri = $uri;
     }

src/UploadedFile.php

@@ -72,7 +72,7 @@ class UploadedFile implements UploadedFileInterface
      * Create a normalized tree of UploadedFile instances from the Environment.
      * @return array|null A normalized tree of UploadedFile instances or null if none are provided.
      */
-    public static function createFromFILES()
+    public static function createFromFILES(): ?array
     {
         if (null !== $_FILES) {
             return static::parseUploadedFiles($_FILES);

src/Uri.php

@@ -350,7 +350,7 @@ protected function hasStandardPort(): bool
      * @return null|int
      * @throws \InvalidArgumentException If the port is invalid.
      */
-    protected function filterPort($port)
+    protected function filterPort($port): ?int
     {
         if (null === $port || (\is_int($port) && ($port >= 1 && $port <= 65535))) {
             return $port;

test/BodyTest.php

@@ -6,19 +6,19 @@
  * Time: 上午12:04
  */
 
-namespace PhpComp\Http\Message\Test;
+namespace PhpComp\Http\MessageTest;
 
 use PhpComp\Http\Message\Body;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
 /**
  * Class BodyTest
- * @package PhpComp\Http\Message\Test
+ * @package PhpComp\Http\MessageTest
  */
 class BodyTest extends TestCase
 {
-    public function testBody()
+    public function testBody(): void
     {
         $body = new Body();