Skip to content

Commit 7f3c034

Browse files
committed
Fix mock objects for FlysystemPlugin tests
1 parent b4da7e2 commit 7f3c034

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

.github/workflows/tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
working-directory: tests/tools/flysystemv2
5656

57-
- run: ./vendor/bin/infection --min-msi=56 --min-covered-msi=83 --threads=4 --logger-github
57+
- run: ./vendor/bin/infection --min-msi=59 --min-covered-msi=84 --threads=4 --logger-github
5858

5959
coverage:
6060
name: Code Coverage

tests/Http/Plugin/FlysystemWritePluginTest.php

+12-10
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
use League\Flysystem\FilesystemWriter;
2626
use Nyholm\Psr7\Request;
2727
use Nyholm\Psr7\Response;
28-
use PHPUnit\Framework\MockObject\MockObject;
2928
use PHPUnit\Framework\TestCase;
3029
use Psr\Http\Message\RequestInterface;
3130
use Psr\Http\Message\StreamInterface;
@@ -38,11 +37,11 @@
3837
final class FlysystemWritePluginTest extends TestCase
3938
{
4039
/**
41-
* @param (FilesystemInterface|FilesystemWriter)&MockObject $filesystem
40+
* @param class-string<FilesystemInterface>|class-string<FilesystemWriter> $class
4241
*
4342
* @dataProvider flysystemProvider
4443
*/
45-
public function testHandleRequestWithFlysytemV1($filesystem): void
44+
public function testHandleRequestWithFlysytemV1(string $class): void
4645
{
4746
$path = sys_get_temp_dir();
4847
$body = $this->createMock(StreamInterface::class);
@@ -57,7 +56,8 @@ public function testHandleRequestWithFlysytemV1($filesystem): void
5756
->method('detach')
5857
->willReturn($resource);
5958

60-
$filesystem->expects(self::once())
59+
$filesystem = $this->createMock($class);
60+
$filesystem->expects(self::atLeastOnce())
6161
->method('writeStream')
6262
->with($path, $resource);
6363

@@ -89,11 +89,11 @@ public function testHandleRequestWithFlysytemV1($filesystem): void
8989
}
9090

9191
/**
92-
* @param (FilesystemInterface|FilesystemWriter)&MockObject $filesystem
92+
* @param class-string<FilesystemInterface>|class-string<FilesystemWriter> $class
9393
*
9494
* @dataProvider flysystemProvider
9595
*/
96-
public function testHandleRequestWithFlysytemV1AndSeekableStream($filesystem): void
96+
public function testHandleRequestWithFlysytemV1AndSeekableStream(string $class): void
9797
{
9898
$path = sys_get_temp_dir();
9999
$body = $this->createMock(StreamInterface::class);
@@ -115,6 +115,7 @@ public function testHandleRequestWithFlysytemV1AndSeekableStream($filesystem): v
115115
->method('isSeekable')
116116
->willReturn(true);
117117

118+
$filesystem = $this->createMock($class);
118119
$filesystem->expects(self::once())
119120
->method('writeStream')
120121
->with($path, $resource);
@@ -149,11 +150,11 @@ public function testHandleRequestWithFlysytemV1AndSeekableStream($filesystem): v
149150
}
150151

151152
/**
152-
* @param (FilesystemInterface|FilesystemWriter)&MockObject $filesystem
153+
* @param class-string<FilesystemInterface>|class-string<FilesystemWriter> $class
153154
*
154155
* @dataProvider flysystemProvider
155156
*/
156-
public function testHandleRequestWithFlysytemV1AndInvalidResource($filesystem): void
157+
public function testHandleRequestWithFlysytemV1AndInvalidResource(string $class): void
157158
{
158159
$path = sys_get_temp_dir();
159160
$body = $this->createMock(StreamInterface::class);
@@ -162,6 +163,7 @@ public function testHandleRequestWithFlysytemV1AndInvalidResource($filesystem):
162163
->method('detach')
163164
->willReturn('');
164165

166+
$filesystem = $this->createMock($class);
165167
$filesystem->expects(self::never())
166168
->method('writeStream');
167169

@@ -190,11 +192,11 @@ public function testHandleRequestWithFlysytemV1AndInvalidResource($filesystem):
190192
public function flysystemProvider(): Generator
191193
{
192194
if (interface_exists(FilesystemInterface::class)) {
193-
yield [$this->createMock(FilesystemInterface::class)];
195+
yield [FilesystemInterface::class];
194196
}
195197

196198
if (interface_exists(FilesystemWriter::class)) {
197-
yield [$this->createMock(FilesystemWriter::class)];
199+
yield [FilesystemWriter::class];
198200
}
199201
}
200202
}

0 commit comments

Comments
 (0)