update fix some error

Author: inhere

src/AbstractClient.php

@@ -330,7 +330,6 @@ public function sendRequest(RequestInterface $request): ResponseInterface
      * @param string $saveAs
      *
      * @return bool
-     * @throws Exception
      */
     public function download(string $url, string $saveAs): bool
     {
@@ -393,7 +392,7 @@ public function SSLVerify(bool $enable)
      *
      * @return $this
      */
-    public function setCookie(string $key, $value)
+    public function setCookie(string $key, $value): ClientInterface
     {
         $this->cookies[$key] = $value;
         return $this;
@@ -676,7 +675,7 @@ public function getPsr7Response(): ResponseInterface
      *
      * @return $this
      */
-    protected function resetOptions()
+    protected function resetOptions(): ClientInterface
     {
         $this->options = $this->defaultOptions;
         return $this;

src/Curl/CurlClient.php

@@ -15,6 +15,7 @@
 use PhpComp\Http\Client\ClientUtil;
 use PhpComp\Http\Client\Exception\ClientException;
 use PhpComp\Http\Client\Traits\ParseRawResponseTrait;
+use function array_merge;
 use function curl_close;
 use function curl_errno;
 use function curl_error;
@@ -109,9 +110,9 @@ class CurlClient extends AbstractClient implements CurlClientInterface
     use ParseRawResponseTrait;
 
     // ssl auth type
-    const SSL_TYPE_CERT = 'cert';
+    public const SSL_TYPE_CERT = 'cert';
 
-    const SSL_TYPE_KEY = 'key';
+    public const SSL_TYPE_KEY = 'key';
 
     /**
      * Can to retry request
@@ -306,7 +307,7 @@ public function downloadImage(string $imgUrl, string $saveDir, string $rename =
      *
      * @return $this
      */
-    public function request(string $url, $data = null, string $method = 'GET', array $headers = [], array $options = [])
+    public function request(string $url, $data = null, string $method = 'GET', array $headers = [], array $options = []): ClientInterface
     {
         if ($method = strtoupper($method)) {
             $options['method'] = $method;
@@ -381,7 +382,7 @@ protected function prepareRequest(string $url, $data, array $headers, array $opt
         }
 
         // merge global options.
-        $options = \array_merge($this->options, $options);
+        $options = array_merge($this->options, $options);
         $method  = $this->formatAndCheckMethod($options['method']);
 
         switch ($method) {
@@ -426,12 +427,12 @@ protected function prepareRequest(string $url, $data, array $headers, array $opt
         $curlOptions[CURLOPT_URL] = ClientUtil::encodeURL($url);
 
         // append http headers
-        if ($headers = \array_merge($this->headers, $options['headers'], $headers)) {
+        if ($headers = array_merge($this->headers, $options['headers'], $headers)) {
             $curlOptions[CURLOPT_HTTPHEADER] = $this->formatHeaders($headers);
         }
 
         // append http cookies
-        if ($cookies = \array_merge($this->cookies, $options['cookies'])) {
+        if ($cookies = array_merge($this->cookies, $options['cookies'])) {
             $curlOptions[CURLOPT_COOKIE] = http_build_query($cookies, '', '; ');
         }
 
@@ -480,7 +481,7 @@ public function getTotalTime(): int
     /**
      * @return $this
      */
-    public function resetOptions()
+    public function resetOptions(): ClientInterface
     {
         // $this->_curlOptions = [];
 
@@ -491,7 +492,7 @@ public function resetOptions()
     /**
      * @return $this
      */
-    public function resetResponse()
+    public function resetResponse(): ClientInterface
     {
         $this->rawResponse    = '';
         $this->responseParsed = false;
@@ -535,7 +536,7 @@ public function setReferrer(string $referrer): self
      *
      * @return $this
      */
-    public function setUserAuth(string $user, string $pwd = '', int $authType = CURLAUTH_BASIC)
+    public function setUserAuth(string $user, string $pwd = '', int $authType = CURLAUTH_BASIC): ClientInterface
     {
         $this->_curlOptions[CURLOPT_HTTPAUTH] = $authType;
         $this->_curlOptions[CURLOPT_USERPWD]  = "$user:$pwd";
@@ -551,7 +552,7 @@ public function setUserAuth(string $user, string $pwd = '', int $authType = CURL
      *
      * @return $this
      */
-    public function setSSLAuth(string $pwd, string $file, string $authType = self::SSL_TYPE_CERT)
+    public function setSSLAuth(string $pwd, string $file, string $authType = self::SSL_TYPE_CERT): ClientInterface
     {
         if ($authType !== self::SSL_TYPE_CERT && $authType !== self::SSL_TYPE_KEY) {
             throw new InvalidArgumentException('The SSL auth type only allow: cert|key');

src/Curl/CurlClientInterface.php

@@ -20,8 +20,6 @@ interface CurlClientInterface
      * Set curl options
      *
      * @param array $options
-     *
-     * @return $this
      */
     public function setCurlOptions(array $options);
 

src/Curl/CurlMulti.php

@@ -102,7 +102,12 @@ class CurlMulti // extends CurlLite
      */
     private $options;
 
-    public static function create(array $options = [])
+    /**
+     * @param array $options
+     *
+     * @return CurlMulti
+     */
+    public static function create(array $options = []): CurlMulti
     {
         return new static($options);
     }
@@ -124,7 +129,7 @@ public function __construct(array $options = [])
      *
      * @return self
      */
-    public function build(array $data)
+    public function build(array $data): self
     {
         $this->mh = curl_multi_init();
 
@@ -314,7 +319,7 @@ public function createResource($url, $data = null, array $headers = [], array $o
      *
      * @return string
      */
-    protected function buildUrl(string $url, $data = null)
+    protected function buildUrl(string $url, $data = null): string
     {
         $url = trim($url);
 

src/Middleware/DemoMiddleware.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace PhpComp\Http\Client\Middleware;
+
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Class DemoMiddleware
+ *
+ * @package PhpComp\Http\Client\Middleware
+ */
+class DemoMiddleware implements MiddlewareInterface
+{
+    /**
+     * @param RequestInterface $request
+     * @param \Closure         $next
+     *
+     * @return ResponseInterface
+     */
+    public function request(RequestInterface $request, \Closure $next): ResponseInterface
+    {
+        return $next($request);
+    }
+}

src/Middleware/MiddlewareInterface.php

@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+
+namespace PhpComp\Http\Client\Middleware;
+
+use Closure;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Interface MiddlewareInterface
+ *
+ * @package PhpComp\Http\Client\Middleware
+ */
+interface MiddlewareInterface
+{
+    /**
+     * @param RequestInterface $request
+     * @param Closure         $next
+     *
+     * @return ResponseInterface
+     */
+    public function request(RequestInterface $request, Closure $next): ResponseInterface;
+}

src/Swoole/CoClient.php

@@ -53,7 +53,6 @@ public static function isAvailable(): bool
      * @param string $saveAs
      *
      * @return bool
-     * @throws Exception
      */
     public function download(string $url, string $saveAs): bool
     {