From de7dcbb26b6c01ada3ee7af08205c5ff34717dfd Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 10 Nov 2023 11:00:41 +0100 Subject: [PATCH] Fix error handling in Stream::getContents() --- src/Stream.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Stream.php b/src/Stream.php index d3bd78d..1211c9c 100644 --- a/src/Stream.php +++ b/src/Stream.php @@ -260,11 +260,23 @@ 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 (string $type, string $message, string $file, int $line) use (&$exception): bool { + throw $exception = new \RuntimeException('Unable to read stream contents: ' . $message); + }); - return $contents; + try { + return \stream_get_contents($this->stream); + } catch (\Throwable $e) { + if ($e === $exception) { + throw $e; + } + + throw new \RuntimeException('Unable to read stream contents: ' . $e->getMessage(), 0, $e); + } finally { + \restore_error_handler(); + } } /**