Remove interface dependencies from psr7-plus

swow · Jun 15, 2023 · 2f680b6 · 2f680b6
1 parent 4461b7a
commit 2f680b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Message/MessagePlusInterface.php b/src/Message/MessagePlusInterface.php
@@ -15,9 +15,8 @@
 
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\StreamInterface;
-use Swow\Object\StringableInterface;
 
-interface MessagePlusInterface extends MessageInterface, StringableInterface
+interface MessagePlusInterface extends MessageInterface
 {
     public const DEFAULT_PROTOCOL_VERSION = '1.1';
 

diff --git a/src/Message/StreamPlusInterface.php b/src/Message/StreamPlusInterface.php
@@ -14,11 +14,10 @@
 namespace Swow\Psr7\Message;
 
 use Psr\Http\Message\StreamInterface;
-use Swow\Object\StringableInterface;
 
 use const SEEK_SET;
 
-interface StreamPlusInterface extends StreamInterface, StringableInterface
+interface StreamPlusInterface extends StreamInterface
 {
     public function getSize(): ?int;
 
@@ -53,4 +52,6 @@ public function getMetadata(mixed $key = null): mixed;
     public function detach(): mixed;
 
     public function close(): void;
+
+    public function toString(): string;
 }
diff --git a/src/Message/UploadedFilePlusInterface.php b/src/Message/UploadedFilePlusInterface.php
@@ -30,4 +30,7 @@ public function getError(): int;
     public function getClientFilename(): ?string;
 
     public function getClientMediaType(): ?string;
+
+    /** @return array{'name': string|null, 'type': string|null, 'tmp_file': string|null, 'error': int, 'size': int|false} */
+    public function toArray(): array;
 }