Merge branch 'dev'

Yurunsoft · Feb 8, 2021 · 89d4813 · 89d4813
2 parents fb79d7c + 8d2f02b
commit 89d4813
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 * text=auto
 
+/.github export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /tests export-ignore

diff --git a/src/YurunHttp/ConnectionPool.php b/src/YurunHttp/ConnectionPool.php
@@ -1,6 +1,7 @@
 <?php
 namespace Yurun\Util\YurunHttp;
 
+use Psr\Http\Message\UriInterface;
 use Yurun\Util\YurunHttp\Http\Psr7\Uri;
 use Yurun\Util\YurunHttp\Pool\Config\PoolConfig;
 use Yurun\Util\YurunHttp\Handler\Contract\IConnectionManager;
@@ -126,12 +127,12 @@ public static function getConfig($url)
     /**
      * 获取键
      *
-     * @param string|Uri $url
+     * @param string|UriInterface $url
      * @return void
      */
     public static function getKey($url)
     {
-        if($url instanceof Uri)
+        if($url instanceof UriInterface)
         {
             return $url->getScheme() . '://' . Uri::getDomain($url);
         }

diff --git a/src/YurunHttp/Http/Psr7/Request.php b/src/YurunHttp/Http/Psr7/Request.php
@@ -28,7 +28,7 @@ class Request extends AbstractMessage implements RequestInterface
 
     /**
      * 构造方法
-     * @param string|\Yurun\Util\YurunHttp\Http\Psr7\Uri $url
+     * @param string|UriInterface $url
      * @param array $headers
      * @param string $body
      * @param string $method
@@ -37,7 +37,7 @@ class Request extends AbstractMessage implements RequestInterface
     public function __construct($uri = null, array $headers = [], $body = '', $method = RequestMethod::GET, $version = '1.1')
     {
         parent::__construct($body);
-        if(! $uri instanceof Uri)
+        if(! $uri instanceof UriInterface)
         {
             $this->uri = new Uri($uri);
         }

diff --git a/src/YurunHttp/Stream/FileStream.php b/src/YurunHttp/Stream/FileStream.php
@@ -1,14 +1,15 @@
 <?php
 namespace Yurun\Util\YurunHttp\Stream;
 
+use Psr\Http\Message\UriInterface;
 use Psr\Http\Message\StreamInterface;
 use Yurun\Util\YurunHttp\Http\Psr7\Uri;
 
 class FileStream implements StreamInterface
 {
     /**
      * 文件Uri
-     * @var \Yurun\Util\YurunHttp\Http\Psr7\Uri
+     * @var UriInterface
      */
     protected $uri;
 
@@ -30,7 +31,7 @@ public function __construct($uri, $mode = StreamMode::READ_WRITE)
         {
             $this->uri = $uri = new Uri($uri);
         }
-        else if($uri instanceof Uri)
+        else if($uri instanceof UriInterface)
         {
             $this->uri = $uri;
         }