fix for #842

mevdschee · mevdschee · commit 933a5d2d62eb · 2022-01-21T11:11:48.000+01:00
diff --git a/api.include.php b/api.include.php
@@ -1515,13 +1515,18 @@ public function createStream(string $content = ''): StreamInterface
 
         public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
         {
-            $resource = @\fopen($filename, $mode);
+            try {
+                $resource = @\fopen($filename, $mode);
+            } catch (\Throwable $e) {
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));
+            }
+
             if (false === $resource) {
-                if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {
-                    throw new \InvalidArgumentException('The mode ' . $mode . ' is invalid.');
+                if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true)) {
+                    throw new \InvalidArgumentException(\sprintf('The mode "%s" is invalid.', $mode));
                 }
 
-                throw new \RuntimeException('The file ' . $filename . ' cannot be opened.');
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));
             }
 
             return Stream::create($resource);
@@ -2377,7 +2382,7 @@ public function seek($offset, $whence = \SEEK_SET) /*:void*/
             }
 
             if (-1 === \fseek($this->stream, $offset, $whence)) {
-                throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
+                throw new \RuntimeException('Unable to seek to stream position "' . $offset . '" with whence ' . \var_export($whence, true));
             }
         }
 
@@ -2568,9 +2573,11 @@ public function getStream(): StreamInterface
                 return $this->stream;
             }
 
-            $resource = \fopen($this->file, 'r');
-
-            return Stream::create($resource);
+            try {
+                return Stream::create(\fopen($this->file, 'r'));
+            } catch (\Throwable $e) {
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $this->file));
+            }
         }
 
         public function moveTo($targetPath) /*:void*/
@@ -2589,8 +2596,13 @@ public function moveTo($targetPath) /*:void*/
                     $stream->rewind();
                 }
 
-                // Copy the contents of a stream into another stream until end-of-file.
-                $dest = Stream::create(\fopen($targetPath, 'w'));
+                try {
+                    // Copy the contents of a stream into another stream until end-of-file.
+                    $dest = Stream::create(\fopen($targetPath, 'w'));
+                } catch (\Throwable $e) {
+                    throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $targetPath));
+                }
+
                 while (!$stream->eof()) {
                     if (!$dest->write($stream->read(1048576))) {
                         break;
@@ -2601,7 +2613,7 @@ public function moveTo($targetPath) /*:void*/
             }
 
             if (false === $this->moved) {
-                throw new \RuntimeException(\sprintf('Uploaded file could not be moved to %s', $targetPath));
+                throw new \RuntimeException(\sprintf('Uploaded file could not be moved to "%s"', $targetPath));
             }
         }
 
@@ -2676,7 +2688,7 @@ public function __construct(string $uri = '')
         {
             if ('' !== $uri) {
                 if (false === $parts = \parse_url($uri)) {
-                    throw new \InvalidArgumentException("Unable to parse URI: $uri");
+                    throw new \InvalidArgumentException(\sprintf('Unable to parse URI: "%s"', $uri));
                 }
 
                 // Apply parse_url parts to a URI.
diff --git a/api.php b/api.php
@@ -1515,13 +1515,18 @@ public function createStream(string $content = ''): StreamInterface
 
         public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
         {
-            $resource = @\fopen($filename, $mode);
+            try {
+                $resource = @\fopen($filename, $mode);
+            } catch (\Throwable $e) {
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));
+            }
+
             if (false === $resource) {
-                if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {
-                    throw new \InvalidArgumentException('The mode ' . $mode . ' is invalid.');
+                if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true)) {
+                    throw new \InvalidArgumentException(\sprintf('The mode "%s" is invalid.', $mode));
                 }
 
-                throw new \RuntimeException('The file ' . $filename . ' cannot be opened.');
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));
             }
 
             return Stream::create($resource);
@@ -2377,7 +2382,7 @@ public function seek($offset, $whence = \SEEK_SET) /*:void*/
             }
 
             if (-1 === \fseek($this->stream, $offset, $whence)) {
-                throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
+                throw new \RuntimeException('Unable to seek to stream position "' . $offset . '" with whence ' . \var_export($whence, true));
             }
         }
 
@@ -2568,9 +2573,11 @@ public function getStream(): StreamInterface
                 return $this->stream;
             }
 
-            $resource = \fopen($this->file, 'r');
-
-            return Stream::create($resource);
+            try {
+                return Stream::create(\fopen($this->file, 'r'));
+            } catch (\Throwable $e) {
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $this->file));
+            }
         }
 
         public function moveTo($targetPath) /*:void*/
@@ -2589,8 +2596,13 @@ public function moveTo($targetPath) /*:void*/
                     $stream->rewind();
                 }
 
-                // Copy the contents of a stream into another stream until end-of-file.
-                $dest = Stream::create(\fopen($targetPath, 'w'));
+                try {
+                    // Copy the contents of a stream into another stream until end-of-file.
+                    $dest = Stream::create(\fopen($targetPath, 'w'));
+                } catch (\Throwable $e) {
+                    throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $targetPath));
+                }
+
                 while (!$stream->eof()) {
                     if (!$dest->write($stream->read(1048576))) {
                         break;
@@ -2601,7 +2613,7 @@ public function moveTo($targetPath) /*:void*/
             }
 
             if (false === $this->moved) {
-                throw new \RuntimeException(\sprintf('Uploaded file could not be moved to %s', $targetPath));
+                throw new \RuntimeException(\sprintf('Uploaded file could not be moved to "%s"', $targetPath));
             }
         }
 
@@ -2676,7 +2688,7 @@ public function __construct(string $uri = '')
         {
             if ('' !== $uri) {
                 if (false === $parts = \parse_url($uri)) {
-                    throw new \InvalidArgumentException("Unable to parse URI: $uri");
+                    throw new \InvalidArgumentException(\sprintf('Unable to parse URI: "%s"', $uri));
                 }
 
                 // Apply parse_url parts to a URI.

Original file line number	Diff line number	Diff line change
`@@ -1515,13 +1515,18 @@ public function createStream(string $content = ''): StreamInterface`
`1515`	`1515`
`1516`	`1516`	`public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface`
`1517`	`1517`	`{`
`1518`		`- $resource = @\fopen($filename, $mode);`
	`1518`	`+ try {`
	`1519`	`+ $resource = @\fopen($filename, $mode);`
	`1520`	`+ } catch (\Throwable $e) {`
	`1521`	`+ throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));`
	`1522`	`+ }`
	`1523`	`+`
`1519`	`1524`	`if (false === $resource) {`
`1520`		`- if ('' === $mode \|\| false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {`
`1521`		`- throw new \InvalidArgumentException('The mode ' . $mode . ' is invalid.');`
	`1525`	`+ if ('' === $mode \|\| false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true)) {`
	`1526`	`+ throw new \InvalidArgumentException(\sprintf('The mode "%s" is invalid.', $mode));`
`1522`	`1527`	`}`
`1523`	`1528`
`1524`		`- throw new \RuntimeException('The file ' . $filename . ' cannot be opened.');`
	`1529`	`+ throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));`
`1525`	`1530`	`}`
`1526`	`1531`
`1527`	`1532`	`return Stream::create($resource);`
`@@ -2377,7 +2382,7 @@ public function seek($offset, $whence = \SEEK_SET) /:void/`
`2377`	`2382`	`}`
`2378`	`2383`
`2379`	`2384`	`if (-1 === \fseek($this->stream, $offset, $whence)) {`
`2380`		`- throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));`
	`2385`	`+ throw new \RuntimeException('Unable to seek to stream position "' . $offset . '" with whence ' . \var_export($whence, true));`
`2381`	`2386`	`}`
`2382`	`2387`	`}`
`2383`	`2388`
`@@ -2568,9 +2573,11 @@ public function getStream(): StreamInterface`
`2568`	`2573`	`return $this->stream;`
`2569`	`2574`	`}`
`2570`	`2575`
`2571`		`- $resource = \fopen($this->file, 'r');`
`2572`		`-`
`2573`		`- return Stream::create($resource);`
	`2576`	`+ try {`
	`2577`	`+ return Stream::create(\fopen($this->file, 'r'));`
	`2578`	`+ } catch (\Throwable $e) {`
	`2579`	`+ throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $this->file));`
	`2580`	`+ }`
`2574`	`2581`	`}`
`2575`	`2582`
`2576`	`2583`	`public function moveTo($targetPath) /:void/`
`@@ -2589,8 +2596,13 @@ public function moveTo($targetPath) /:void/`
`2589`	`2596`	`$stream->rewind();`
`2590`	`2597`	`}`
`2591`	`2598`
`2592`		`- // Copy the contents of a stream into another stream until end-of-file.`
`2593`		`- $dest = Stream::create(\fopen($targetPath, 'w'));`
	`2599`	`+ try {`
	`2600`	`+ // Copy the contents of a stream into another stream until end-of-file.`
	`2601`	`+ $dest = Stream::create(\fopen($targetPath, 'w'));`
	`2602`	`+ } catch (\Throwable $e) {`
	`2603`	`+ throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $targetPath));`
	`2604`	`+ }`
	`2605`	`+`
`2594`	`2606`	`while (!$stream->eof()) {`
`2595`	`2607`	`if (!$dest->write($stream->read(1048576))) {`
`2596`	`2608`	`break;`
`@@ -2601,7 +2613,7 @@ public function moveTo($targetPath) /:void/`
`2601`	`2613`	`}`
`2602`	`2614`
`2603`	`2615`	`if (false === $this->moved) {`
`2604`		`- throw new \RuntimeException(\sprintf('Uploaded file could not be moved to %s', $targetPath));`
	`2616`	`+ throw new \RuntimeException(\sprintf('Uploaded file could not be moved to "%s"', $targetPath));`
`2605`	`2617`	`}`
`2606`	`2618`	`}`
`2607`	`2619`
`@@ -2676,7 +2688,7 @@ public function __construct(string $uri = '')`
`2676`	`2688`	`{`
`2677`	`2689`	`if ('' !== $uri) {`
`2678`	`2690`	`if (false === $parts = \parse_url($uri)) {`
`2679`		`- throw new \InvalidArgumentException("Unable to parse URI: $uri");`
	`2691`	`+ throw new \InvalidArgumentException(\sprintf('Unable to parse URI: "%s"', $uri));`
`2680`	`2692`	`}`
`2681`	`2693`
`2682`	`2694`	`// Apply parse_url parts to a URI.`