Adds the \Stringable interface to classes that have __toString() method (#5920)

Co-authored-by: 李铭昕 <[email protected]>

Author: huangdijia

src/Base/Request.php

@@ -17,9 +17,10 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
+use Stringable;
 use Swow\Psr7\Message\RequestPlusInterface;
 
-class Request implements RequestInterface, RequestPlusInterface
+class Request implements RequestInterface, RequestPlusInterface, Stringable
 {
     use MessageTrait;
 

src/Base/Response.php

@@ -13,9 +13,10 @@
 
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
+use Stringable;
 use Swow\Psr7\Message\ResponsePlusInterface;
 
-class Response implements ResponseInterface, ResponsePlusInterface
+class Response implements ResponseInterface, ResponsePlusInterface, Stringable
 {
     use MessageTrait;
 

src/Server/ResponsePlusProxy.php

@@ -13,15 +13,16 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
+use Stringable;
 use Swow\Psr7\Message\ResponsePlusInterface;
 
-class ResponsePlusProxy implements ResponsePlusInterface
+class ResponsePlusProxy implements ResponsePlusInterface, Stringable
 {
     public function __construct(protected ResponseInterface $response)
     {
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->toString();
     }

src/Upload/UploadedFile.php

@@ -17,8 +17,9 @@
 use Psr\Http\Message\UploadedFileInterface;
 use RuntimeException;
 use SplFileInfo;
+use Stringable;
 
-class UploadedFile extends SplFileInfo implements UploadedFileInterface
+class UploadedFile extends SplFileInfo implements UploadedFileInterface, Stringable
 {
     /**
      * @var int[]

src/Uri/Uri.php

@@ -16,7 +16,7 @@
 use Stringable;
 use Swow\Psr7\Message\UriPlusInterface;
 
-class Uri implements UriInterface, Stringable, UriPlusInterface
+class Uri implements UriInterface, UriPlusInterface, Stringable
 {
     /**
      * Absolute http and https URIs require a host per RFC 7230 Section 2.7

tests/SwooleStreamTest.php

@@ -18,6 +18,7 @@
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
+use Stringable;
 use Swoole\Http\Response as SwooleResponse;
 
 /**
@@ -182,4 +183,11 @@ public function testGetContents()
 
         $this->assertSame($random, $stream->getContents());
     }
+
+    public function testInstanceOfStringable()
+    {
+        $random = microtime();
+        $stream = new SwooleStream($random);
+        $this->assertInstanceOf(Stringable::class, $stream);
+    }
 }