Метод Stream::toString() удален в пользу __toString() магии

README.md

@@ -38,7 +38,7 @@ $stream = (new StreamFactory)->createStreamFromFile('http://php.net/', 'rb');
 $stream = (new StreamFactory)->createStreamFromResource(fopen(...));
 
 // converts the stream to string without a magic
-$stream->toString();
+(string) $stream;
 
 // closes the stream
 $stream->close();

src/Stream.php

@@ -18,6 +18,8 @@
 
 /**
  * Stream
+ *
+ * @link https://www.php-fig.org/psr/psr-7/
  */
 class Stream implements StreamInterface
 {
@@ -431,11 +433,11 @@ public function getSize() : ?int
 	/**
 	 * Converts the stream to string
 	 *
-	 * This method SHOULD NOT throw an exception.
-	 *
 	 * @return string
+	 *
+	 * @link http://php.net/manual/en/language.oop5.magic.php#object.tostring
 	 */
-	public function toString() : string
+	public function __toString()
 	{
 		try
 		{
@@ -456,14 +458,4 @@ public function toString() : string
 
 		return '';
 	}
-
-	/**
-	 * Converts the object to string
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return $this->toString();
-	}
 }

src/StreamFactory.php

@@ -19,14 +19,14 @@
 
 /**
  * StreamFactory
+ *
+ * @link https://www.php-fig.org/psr/psr-17/
  */
 class StreamFactory implements StreamFactoryInterface
 {
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * @link http://php.net/manual/en/wrappers.php.php#wrappers.php.memory
 	 */
 	public function createStream(string $content = '') : StreamInterface
 	{
@@ -42,9 +42,6 @@ public function createStream(string $content = '') : StreamInterface
 	 * Creates a stream from the request body
 	 *
 	 * @return StreamInterface
-	 *
-	 * @link http://php.net/manual/en/wrappers.php.php#wrappers.php.memory
-	 * @link http://php.net/manual/en/wrappers.php.php#wrappers.php.input
 	 */
 	public function createStreamFromRequestBody() : StreamInterface
 	{
@@ -64,9 +61,7 @@ public function createStreamFromRequestBody() : StreamInterface
 	 */
 	public function createStreamFromFile(string $filename, string $mode = 'r') : StreamInterface
 	{
-		// If the open fails, an error of level E_WARNING is generated.
-		// You may use @ to suppress this warning.
-		// http://php.net/manual/en/function.fopen.php
+		// See http://php.net/manual/en/function.fopen.php
 		$resource = @ \fopen($filename, $mode);
 
 		if (false === $resource)

tests/StreamFactoryTest.php

@@ -33,7 +33,7 @@ public function testCreateStream()
 
 		$this->assertEquals(0, $stream->tell());
 
-		$this->assertEquals($content, $stream->toString());
+		$this->assertEquals($content, (string) $stream);
 
 		$stream->close();
 	}

tests/StreamTest.php

@@ -285,20 +285,6 @@ public function testToString()
 		$handle = \fopen('php://memory', 'r+b');
 		$stream = new Stream($handle);
 
-		\fwrite($handle, $string);
-		$this->assertEquals($string, $stream->toString());
-
-		\fclose($handle);
-	}
-
-	public function testMagicToString()
-	{
-		$string = 'Hello, world!';
-		$length = \strlen($string);
-
-		$handle = \fopen('php://memory', 'r+b');
-		$stream = new Stream($handle);
-
 		\fwrite($handle, $string);
 		$this->assertEquals($string, (string) $stream);
 
@@ -457,14 +443,14 @@ public function testToStringUnresourceable()
 		$stream = new Stream($handle);
 
 		$stream->close();
-		$this->assertEquals('', $stream->toString());
+		$this->assertEquals('', (string) $stream);
 	}
 
 	public function testToStringUnreadable()
 	{
 		$stream = new Stream(\STDOUT);
 
-		$this->assertEquals('', $stream->toString());
+		$this->assertEquals('', (string) $stream);
 	}
 
 	public function testExceptions()