Change exception message and tests to more accurately reflect error c…

…onditions Signed-off-by: George Steel <[email protected]>
laminas · Sep 5, 2024 · a30d4a6 · a30d4a6
1 parent 6a917e6
commit a30d4a6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Stream.php b/src/Stream.php
@@ -329,7 +329,10 @@ private function setStream($stream, string $mode = 'r'): void
 
             if (! is_resource($resource)) {
                 throw new Exception\RuntimeException(
-                    sprintf('Invalid stream reference provided: %s', (string) $error?->getMessage()),
+                    sprintf(
+                        'Empty on non-existent stream identifier or file path provided: %s',
+                        (string) $error?->getMessage(),
+                    ),
                     0,
                     $error
                 );

diff --git a/test/StreamTest.php b/test/StreamTest.php
@@ -9,6 +9,7 @@
 use InvalidArgumentException;
 use Laminas\Diactoros\Exception\InvalidArgumentException as DiactorosInvalidArgumentException;
 use Laminas\Diactoros\Stream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use RuntimeException;
@@ -515,12 +516,22 @@ public function testAttachWithNonStringNonResourceRaisesException(mixed $resourc
         $this->stream->attach($resource);
     }
 
-    public function testAttachWithInvalidStringResourceRaisesException(): void
+    public static function invalidStringResources(): array
+    {
+        return [
+            'Empty String'             => [''],
+            'File path does not exist' => ['/tmp/not-a-valid-file-path'],
+            'Invalid stream'           => ['php://mammary'],
+        ];
+    }
+
+    #[DataProvider('invalidStringResources')]
+    public function testAttachWithInvalidStringResourceRaisesException(string $stream): void
     {
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Invalid stream');
+        $this->expectExceptionMessage('Empty on non-existent stream identifier or file path provided');
 
-        $this->stream->attach('foo-bar-baz');
+        $this->stream->attach($stream);
     }
 
     public function testAttachWithResourceAttachesResource(): void