Fix error handling on stream getContents method

httpsoft · Nov 15, 2023 · 2500169 · 2500169
1 parent 6c3352c
commit 2500169
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/StreamTrait.php b/src/StreamTrait.php
@@ -8,7 +8,6 @@
 use RuntimeException;
 use Throwable;
 
-use function array_key_exists;
 use function fclose;
 use function feof;
 use function fopen;
@@ -330,8 +329,12 @@ public function getContents(): string
             throw new RuntimeException('Stream is not readable.');
         }
 
-        if (($result = stream_get_contents($this->resource)) === false) {
-            throw new RuntimeException('Error reading stream.');
+        try {
+            if (($result = stream_get_contents($this->resource)) === false) {
+                throw new RuntimeException('Stream is detached.');
+            }
+        } catch (Throwable $e) {
+            throw new RuntimeException('Unable to read stream contents: ' . $e->getMessage());
         }
 
         return $result;
@@ -358,19 +361,14 @@ public function getMetadata($key = null)
         try {
             $metadata = stream_get_meta_data($this->resource);
         } catch (Throwable $e) {
-            $this->detach();
-            throw new RuntimeException('Unable to read stream contents: ' . $e->getMessage());
+            return $key ? null : [];
         }
 
         if ($key === null) {
             return $metadata;
         }
 
-        if (array_key_exists($key, $metadata)) {
-            return $metadata[$key];
-        }
-
-        return null;
+        return $metadata[$key] ?? null;
     }
 
     /**