Fix error handling on stream reading (#27)

httpsoft · Nov 15, 2023 · 3a85d2b · 3a85d2b
1 parent 6d86446
commit 3a85d2b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # HTTP Message Change Log
 
+## 1.1.1 - Under development
+
+### Fixed
+
+- [#27](https://github.com/httpsoft/http-message/pull/27) Fix error handling on stream reading 
+
 ## 1.1.1 - 2023.05.06
 
 ### Fixed

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -2,6 +2,8 @@
 <psalm
     errorLevel="1"
     findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/src/StreamTrait.php b/src/StreamTrait.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use RuntimeException;
+use Throwable;
 
 use function array_key_exists;
 use function fclose;
@@ -354,7 +355,12 @@ public function getMetadata($key = null)
             return $key ? null : [];
         }
 
-        $metadata = stream_get_meta_data($this->resource);
+        try {
+            $metadata = stream_get_meta_data($this->resource);
+        } catch (Throwable $e) {
+            $this->detach();
+            throw new RuntimeException('Unable to read stream contents: ' . $e->getMessage());
+        }
 
         if ($key === null) {
             return $metadata;

diff --git a/src/Uri.php b/src/Uri.php
@@ -506,6 +506,8 @@ private function normalizeFragment(string $fragment): string
      * @param string $string
      * @param string $pattern
      * @return string
+     *
+     * @psalm-param non-empty-string $pattern
      */
     private function encode(string $string, string $pattern): string
     {