Exception, container

Author: sirn-se

composer.json

@@ -25,12 +25,13 @@
     "require": {
         "php": "^8.1",
         "phrity/util-errorhandler": "^1.1",
+        "phrity/util-interpolator": "^1.1",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.1 | ^2.0"
+        "psr/http-message": "^1.1 || ^2.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^2.0",
-        "phpunit/phpunit": "^10.0 | ^11.0  | ^12.0",
+        "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
         "phrity/net-uri": "^2.0",
         "robiningelbrecht/phpunit-coverage-tools": "^1.9",
         "squizlabs/php_codesniffer": "^3.5"

src/StreamException.php

@@ -2,6 +2,7 @@
 
 namespace Phrity\Net;
 
+use Phrity\Util\Interpolator\InterpolatorTrait;
 use RuntimeException;
 use Throwable;
 
@@ -10,6 +11,8 @@
  */
 class StreamException extends RuntimeException
 {
+    use InterpolatorTrait;
+
     // Stream errors
     public const STREAM_DETACHED = 1000;
     public const NOT_READABLE = 1010;
@@ -73,9 +76,7 @@ class StreamException extends RuntimeException
     public function __construct(int $code, array $data = [], Throwable|null $previous = null)
     {
         $message = self::$messages[$code];
-        foreach ($data as $key => $content) {
-            $message = str_replace('{' . $key . '}', $content, $message);
-        }
+        $message = $this->interpolate($message, $data);
         if ($previous) {
             $message .= " ({$previous->getMessage()})";
         }

tests/mock/StreamContainer.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Tests for Net\SocketServer class.
+ * @package Phrity > Net > Stream
+ */
+
+namespace Phrity\Net\Test;
+
+use Phrity\Net\{
+    Stream,
+    StreamContainerInterface,
+    StreamFactory,
+};
+
+class StreamContainer implements StreamContainerInterface
+{
+    public function getStream(): Stream
+    {
+        $factory = new StreamFactory();
+        return $factory->createStream('This is a temporary test stream');
+    }
+}

tests/suites/StreamCollectionTest.php

@@ -17,6 +17,7 @@
     StreamCollection,
     StreamException
 };
+use Phrity\Net\Test\StreamContainer;
 use Phrity\Net\Uri;
 use TypeError;
 
@@ -71,6 +72,24 @@ public function testCollection(): void
         $this->assertCount(1, $collection);
     }
 
+    public function testContainer(): void
+    {
+        $container = new StreamContainer();
+        $collection = new StreamCollection();
+        $this->assertEquals('@container', $collection->attach($container, '@container'));
+
+        $this->assertCount(1, $collection);
+        foreach ($collection as $key => $item) {
+            $this->assertSame($container, $item);
+        }
+        foreach ($collection->getReadable() as $key => $item) {
+            $this->assertSame($container, $item);
+        }
+        foreach ($collection->getWritable() as $key => $item) {
+            $this->assertSame($container, $item);
+        }
+    }
+
     public function testInvalidTimeout(): void
     {
         $collection = new StreamCollection();