Skip to content
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

Jump to bottom

Lock file maintenance #49

Merged
merged 3 commits into from
Aug 7, 2023
Merged

Lock file maintenance #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d92313
Lock file maintenance
renovate[bot] Aug 5, 2023
8a7475c
Removed references to methods deprecated in PHPUnit 9.3
Ocramius Aug 7, 2023
c51a436
Moving suppressions for unused return values to individual methods
Ocramius Aug 7, 2023
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
14 changes: 7 additions & 7 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions test/Emitter/SapiStreamEmitterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ static function (int $bufferLength) use (&$peakBufferLength): void {
$stream
->expects($this->atLeastOnce())
->method('rewind')
->will($this->returnCallback([$streamHelper, 'handleRewind']));
$stream->method('seek')->will($this->returnCallback([$streamHelper, 'handleSeek']));
->willReturnCallback([$streamHelper, 'handleRewind']);
$stream->method('seek')->willReturnCallback([$streamHelper, 'handleSeek']);
}

if (! $seekable) {
Expand All @@ -243,8 +243,8 @@ static function (int $bufferLength) use (&$peakBufferLength): void {

if ($readable) {
$stream->expects($this->never())->method('__toString');
$stream->method('eof')->will($this->returnCallback([$streamHelper, 'handleEof']));
$stream->method('read')->will($this->returnCallback([$streamHelper, 'handleRead']));
$stream->method('eof')->willReturnCallback([$streamHelper, 'handleEof']);
$stream->method('read')->willReturnCallback([$streamHelper, 'handleRead']);
}

if (! $readable) {
Expand All @@ -254,10 +254,10 @@ static function (int $bufferLength) use (&$peakBufferLength): void {
$seekable
? $stream
->method('getContents')
->will($this->returnCallback([$streamHelper, 'handleGetContents']))
->willReturnCallback([$streamHelper, 'handleGetContents'])
: $stream->expects($this->never())->method('getContents');

$stream->method('__toString')->will($this->returnCallback([$streamHelper, 'handleToString']));
$stream->method('__toString')->willReturnCallback([$streamHelper, 'handleToString']);
}

$response = (new Response())
Expand Down Expand Up @@ -380,15 +380,15 @@ public function testEmitRangeStreamResponse(
$stream->method('isSeekable')->willReturn($seekable);
$stream->method('isReadable')->willReturn($readable);
$stream->method('getSize')->willReturn($size);
$stream->method('tell')->will($this->returnCallback([$streamHelper, 'handleTell']));
$stream->method('tell')->willReturnCallback([$streamHelper, 'handleTell']);

$stream->expects($this->never())->method('rewind');

if ($seekable) {
$stream
->expects($this->atLeastOnce())
->method('seek')
->will($this->returnCallback([$streamHelper, 'handleSeek']));
->willReturnCallback([$streamHelper, 'handleSeek']);
} else {
$stream->expects($this->never())->method('seek');
}
Expand All @@ -400,19 +400,19 @@ public function testEmitRangeStreamResponse(
->expects($this->atLeastOnce())
->method('read')
->with($this->isType('int'))
->will($this->returnCallback([$streamHelper, 'handleRead']));
->willReturnCallback([$streamHelper, 'handleRead']);
$stream
->expects($this->atLeastOnce())
->method('eof')
->will($this->returnCallback([$streamHelper, 'handleEof']));
->willReturnCallback([$streamHelper, 'handleEof']);
$stream->expects($this->never())->method('getContents');
} else {
$stream->expects($this->never())->method('read');
$stream->expects($this->never())->method('eof');
$stream
->expects($this->atLeastOnce())
->method('getContents')
->will($this->returnCallback([$streamHelper, 'handleGetContents']));
->willReturnCallback([$streamHelper, 'handleGetContents']);
}

$response = (new Response())
Expand Down Expand Up @@ -539,24 +539,24 @@ public function testEmitMemoryUsage(
$stream = $this->createMock(StreamInterface::class);
$stream->method('isSeekable')->willReturn($seekable);
$stream->method('isReadable')->willReturn($readable);
$stream->method('eof')->will($this->returnCallback([$streamHelper, 'handleEof']));
$stream->method('eof')->willReturnCallback([$streamHelper, 'handleEof']);

if ($seekable) {
$stream
->method('seek')
->will($this->returnCallback([$streamHelper, 'handleSeek']));
->willReturnCallback([$streamHelper, 'handleSeek']);
}

if ($readable) {
$stream
->method('read')
->will($this->returnCallback([$streamHelper, 'handleRead']));
->willReturnCallback([$streamHelper, 'handleRead']);
}

if (! $readable) {
$stream
->method('getContents')
->will($this->returnCallback([$streamHelper, 'handleGetContents']));
->willReturnCallback([$streamHelper, 'handleGetContents']);
}

$response = (new Response())
Expand Down
10 changes: 9 additions & 1 deletion test/TestAsset/MockStreamHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
use const SEEK_SET;

/**
* @psalm-suppress PossiblyUnusedMethod,PossiblyUnusedParam,PossiblyUnusedReturnValue
* @psalm-suppress PossiblyUnusedMethod
* @psalm-suppress PossiblyUnusedParam
*/
class MockStreamHelper
{
Expand All @@ -35,22 +36,26 @@ public function __construct(
$this->trackPeakBufferLength = $trackPeakBufferLength;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleToString(): string
{
$this->position = $this->size;
return is_callable($this->contents) ? ($this->contents)(0) : $this->contents;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleTell(): int
{
return $this->position;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleEof(): bool
{
return $this->position >= $this->size;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleSeek(int $offset, ?int $whence = SEEK_SET): bool
{
if ($offset >= $this->size) {
Expand All @@ -61,12 +66,14 @@ public function handleSeek(int $offset, ?int $whence = SEEK_SET): bool
return true;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleRewind(): bool
{
$this->position = 0;
return true;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleRead(int $length): string
{
if ($this->trackPeakBufferLength) {
Expand All @@ -82,6 +89,7 @@ public function handleRead(int $length): string
return $data;
}

/** @psalm-suppress PossiblyUnusedReturnValue */
public function handleGetContents(): string
{
$remainingContents = is_callable($this->contents)
Expand Down