Skip to content

Commit 1cc88d7

Browse files
committed
Merge branch 'master' into 3.0-merge
# Conflicts: # .github/workflows/test.yml # phpstan.neon # src/http-message/tests/SwooleStreamTest.php # src/http-server/src/ResponseEmitter.php # src/socketio-server/src/SocketIO.php # src/utils/src/Contracts/Arrayable.php
2 parents 57ac6eb + eddcfe8 commit 1cc88d7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/SwooleStreamTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testSwooleFileStream()
2929
{
3030
$swooleResponse = Mockery::mock(SwooleResponse::class);
3131
$file = __FILE__;
32-
$swooleResponse->shouldReceive('sendfile')->with($file)->once()->andReturn(null);
32+
$swooleResponse->shouldReceive('sendfile')->with($file)->once()->andReturn(true);
3333
$swooleResponse->shouldReceive('status')->with(200, '')->once()->andReturn(200);
3434

3535
$response = new Response();
@@ -43,9 +43,9 @@ public function testSwooleStream()
4343
{
4444
$swooleResponse = Mockery::mock(SwooleResponse::class);
4545
$content = '{"id":1}';
46-
$swooleResponse->shouldReceive('end')->with($content)->once()->andReturn(null);
46+
$swooleResponse->shouldReceive('end')->with($content)->once()->andReturn(true);
4747
$swooleResponse->shouldReceive('status')->with(200, '')->once()->andReturn(200);
48-
$swooleResponse->shouldReceive('header')->with('TOKEN', ['xxx'])->once()->andReturn(null);
48+
$swooleResponse->shouldReceive('header')->with('TOKEN', ['xxx'])->once()->andReturn(true);
4949

5050
$response = new Response();
5151
$response = $response->withBody(new SwooleStream($content))->withHeader('TOKEN', 'xxx');

0 commit comments

Comments
 (0)