Skip to content

Catch exceptions; return false #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elazar merged 2 commits into from
May 10, 2025
Merged

Catch exceptions; return false #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c829181
Catch exceptions; return `false`
BrianHenryIE May 2, 2025
3083987
Update `stream_open()` to return `false` when unable to read
BrianHenryIE May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions src/StreamWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,37 @@ public function stream_open(
$this->log('info', __METHOD__, func_get_args());
$this->path = $path;
$this->mode = $mode;

// Attempt to open for reading if mode is read or read/write
if (strpbrk($mode, 'r+') !== false) {
try {
$this->openRead();
} catch (\Throwable $e) {
$this->log('error', __METHOD__, ['exception' => $e]);
return false;
}
}

return true;
}

public function stream_read(int $count): string
/**
* @param int $count
*
* @return false|string
*/
public function stream_read(int $count)
{
$this->log('info', __METHOD__, func_get_args());
$this->openRead();
return stream_get_contents($this->read, $count);
try {
$this->openRead();
return stream_get_contents($this->read, $count);
} catch (Throwable $e) {
$this->log('error', __METHOD__, func_get_args() + [
'exception' => $e,
]);
return false;
}
}

public function stream_seek(int $offset, int $whence = SEEK_SET): bool
Expand Down Expand Up @@ -297,8 +320,15 @@ public function stream_set_option(int $option, int $arg1, ?int $arg2 = null): bo
public function stream_stat()
{
$this->log('info', __METHOD__);
$this->openRead();
return fstat($this->read);
try {
$this->openRead();
return fstat($this->read);
} catch (Throwable $e) {
$this->log('error', __METHOD__, func_get_args() + [
'exception' => $e,
]);
return false;
}
}

public function stream_tell(): int
Expand Down
10 changes: 10 additions & 0 deletions tests/StreamWrapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ function dumpLogs()
});

it('can acquire multiple shared locks', function () {
touch('fly://foo');

$stream1 = fopen('fly://foo', 'r');
$result = flock($stream1, LOCK_SH);
expect($result)->toBeTrue();
Expand Down Expand Up @@ -148,6 +150,8 @@ function dumpLogs()
});

it('cannot acquire an exclusive lock with existing locks', function () {
touch('fly://foo');

$stream1 = fopen('fly://foo', 'r');
$result = flock($stream1, LOCK_SH);
expect($result)->toBeTrue();
Expand Down Expand Up @@ -277,3 +281,9 @@ function dumpLogs()

expect($actual)->toBe($expected);
});

it('fails attempting to read a missing file', function () {
$actual = @file_get_contents("fly://doesnotexist.txt");

expect($actual)->toBe(false);
});