Fix error handling in Stream::getContents()

Nyholm · Nov 10, 2023 · ff5243c · ff5243c
1 parent 3cb4d16
commit ff5243c
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/Stream.php b/src/Stream.php
@@ -260,8 +260,22 @@ public function getContents(): string
             throw new \RuntimeException('Stream is detached');
         }
 
-        if (false === $contents = @\stream_get_contents($this->stream)) {
-            throw new \RuntimeException('Unable to read stream contents: ' . (\error_get_last()['message'] ?? ''));
+        $exception = null;
+
+        set_error_handler(static function ($type, $message) use (&$exception) {
+            $exception = new \RuntimeException('Unable to read from stream: ' . $message);
+        });
+
+        try {
+            $contents = stream_get_contents($this->stream);
+        } catch (\Throwable $e) {
+            $exception = new \RuntimeException('Unable to read from stream: ' . $e->getMessage(), 0, $e);
+        }
+
+        restore_error_handler();
+
+        if ($exception) {
+            throw $exception;
         }
 
         return $contents;