Skip to content

Commit 22902c7

Browse files
dominikzoggdominikzogg
committed
dev dependencies update
1 parent fa4ae45 commit 22902c7

8 files changed

+62
-61
lines changed

‎.php_cs ‎.php-cs-fixer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/** @var array $config */
1313
$config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
1414

15-
return PhpCsFixer\Config::create()
15+
return (new PhpCsFixer\Config)
1616
->setIndent($config['indent'])
1717
->setLineEnding($config['lineEnding'])
1818
->setRules($config['rules'])

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
"blackfire/php-sdk": "^1.23",
3030
"chubbyphp/chubbyphp-dev-helper": "dev-master",
3131
"chubbyphp/chubbyphp-mock": "^1.6",
32-
"infection/infection": "^0.20.2",
32+
"infection/infection": "^0.25.2",
3333
"php-coveralls/php-coveralls": "^2.4.3",
3434
"phploc/phploc": "^7.0.2",
3535
"phpstan/extension-installer": "^1.1",
36-
"phpstan/phpstan": "^0.12.64",
37-
"phpunit/phpunit": "^9.5",
36+
"phpstan/phpstan": "^0.12.99",
37+
"phpunit/phpunit": "^9.5.10",
3838
"swoole/ide-helper": "^4.5.8"
3939
},
4040
"autoload": {

‎phpunit.xml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
backupGlobals="false"
34
backupStaticAttributes="false"
45
colors="true"
56
convertErrorsToExceptions="true"
@@ -8,7 +9,12 @@
89
executionOrder="random"
910
processIsolation="false"
1011
stopOnFailure="false"
11-
>
12+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
13+
<coverage>
14+
<include>
15+
<directory>./src</directory>
16+
</include>
17+
</coverage>
1218
<testsuites>
1319
<testsuite name="Integration">
1420
<directory>./tests/Integration</directory>
@@ -17,9 +23,4 @@
1723
<directory>./tests/Unit</directory>
1824
</testsuite>
1925
</testsuites>
20-
<filter>
21-
<whitelist>
22-
<directory>./src</directory>
23-
</whitelist>
24-
</filter>
2526
</phpunit>

‎tests/Unit/Adapter/BlackfireOnRequestAdapterTest.php

+18-18
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ final class BlackfireOnRequestAdapterTest extends TestCase
3030

3131
public function testInvokeWithoutHeaderWithoutConfigAndWithoutLogger(): void
3232
{
33-
/** @var SwooleRequest|MockObject $swooleRequest */
33+
/** @var MockObject|SwooleRequest $swooleRequest */
3434
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
3535

36-
/** @var SwooleResponse|MockObject $swooleResponse */
36+
/** @var MockObject|SwooleResponse $swooleResponse */
3737
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
3838

39-
/** @var OnRequestInterface|MockObject $onRequest */
39+
/** @var MockObject|OnRequestInterface $onRequest */
4040
$onRequest = $this->getMockByCalls(OnRequestInterface::class, [
4141
Call::create('__invoke')->with($swooleRequest, $swooleResponse),
4242
]);
@@ -50,19 +50,19 @@ public function testInvokeWithoutHeaderWithoutConfigAndWithoutLogger(): void
5050

5151
public function testInvokeWithoutConfigAndWithoutLogger(): void
5252
{
53-
/** @var SwooleRequest|MockObject $swooleRequest */
53+
/** @var MockObject|SwooleRequest $swooleRequest */
5454
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
5555
$swooleRequest->header['x-blackfire-query'] = 'swoole';
5656

57-
/** @var SwooleResponse|MockObject $swooleResponse */
57+
/** @var MockObject|SwooleResponse $swooleResponse */
5858
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
5959

60-
/** @var OnRequestInterface|MockObject $onRequest */
60+
/** @var MockObject|OnRequestInterface $onRequest */
6161
$onRequest = $this->getMockByCalls(OnRequestInterface::class, [
6262
Call::create('__invoke')->with($swooleRequest, $swooleResponse),
6363
]);
6464

65-
/** @var Probe|MockObject $probe */
65+
/** @var MockObject|Probe $probe */
6666
$probe = $this->getMockByCalls(Probe::class);
6767

6868
/** @var Client|MockObject $client */
@@ -77,22 +77,22 @@ public function testInvokeWithoutConfigAndWithoutLogger(): void
7777

7878
public function testInvokeWithConfigAndWithLogger(): void
7979
{
80-
/** @var SwooleRequest|MockObject $swooleRequest */
80+
/** @var MockObject|SwooleRequest $swooleRequest */
8181
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
8282
$swooleRequest->header['x-blackfire-query'] = 'swoole';
8383

84-
/** @var SwooleResponse|MockObject $swooleResponse */
84+
/** @var MockObject|SwooleResponse $swooleResponse */
8585
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
8686

87-
/** @var OnRequestInterface|MockObject $onRequest */
87+
/** @var MockObject|OnRequestInterface $onRequest */
8888
$onRequest = $this->getMockByCalls(OnRequestInterface::class, [
8989
Call::create('__invoke')->with($swooleRequest, $swooleResponse),
9090
]);
9191

9292
/** @var Configuration|MockObject $config */
9393
$config = $this->getMockByCalls(Configuration::class);
9494

95-
/** @var Probe|MockObject $probe */
95+
/** @var MockObject|Probe $probe */
9696
$probe = $this->getMockByCalls(Probe::class);
9797

9898
/** @var Client|MockObject $client */
@@ -110,14 +110,14 @@ public function testInvokeWithConfigAndWithLogger(): void
110110

111111
public function testInvokeWithExceptionOnCreateProbe(): void
112112
{
113-
/** @var SwooleRequest|MockObject $swooleRequest */
113+
/** @var MockObject|SwooleRequest $swooleRequest */
114114
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
115115
$swooleRequest->header['x-blackfire-query'] = 'swoole';
116116

117-
/** @var SwooleResponse|MockObject $swooleResponse */
117+
/** @var MockObject|SwooleResponse $swooleResponse */
118118
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
119119

120-
/** @var OnRequestInterface|MockObject $onRequest */
120+
/** @var MockObject|OnRequestInterface $onRequest */
121121
$onRequest = $this->getMockByCalls(OnRequestInterface::class, [
122122
Call::create('__invoke')->with($swooleRequest, $swooleResponse),
123123
]);
@@ -143,22 +143,22 @@ public function testInvokeWithExceptionOnCreateProbe(): void
143143

144144
public function testInvokeWithExceptionOnProbeEnd(): void
145145
{
146-
/** @var SwooleRequest|MockObject $swooleRequest */
146+
/** @var MockObject|SwooleRequest $swooleRequest */
147147
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
148148
$swooleRequest->header['x-blackfire-query'] = 'swoole';
149149

150-
/** @var SwooleResponse|MockObject $swooleResponse */
150+
/** @var MockObject|SwooleResponse $swooleResponse */
151151
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
152152

153-
/** @var OnRequestInterface|MockObject $onRequest */
153+
/** @var MockObject|OnRequestInterface $onRequest */
154154
$onRequest = $this->getMockByCalls(OnRequestInterface::class, [
155155
Call::create('__invoke')->with($swooleRequest, $swooleResponse),
156156
]);
157157

158158
/** @var Configuration|MockObject $config */
159159
$config = $this->getMockByCalls(Configuration::class);
160160

161-
/** @var Probe|MockObject $probe */
161+
/** @var MockObject|Probe $probe */
162162
$probe = $this->getMockByCalls(Probe::class);
163163

164164
$exception = new LogicException('Something went wrong');

‎tests/Unit/Adapter/NewRelicOnRequestAdapterTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ final class TestNewRelicStartTransaction
99
/**
1010
* @var array<int, array>
1111
*/
12-
private static $calls = [];
12+
private static array $calls = [];
1313

1414
public static function add(string $appname, ?string $license = null): void
1515
{
@@ -40,7 +40,7 @@ final class TestNewRelicEndTransaction
4040
/**
4141
* @var array<int, array>
4242
*/
43-
private static $calls = [];
43+
private static array $calls = [];
4444

4545
public static function add(bool $ignore): void
4646
{
@@ -94,13 +94,13 @@ public function testInvoke(): void
9494
TestNewRelicStartTransaction::reset();
9595
TestNewRelicEndTransaction::reset();
9696

97-
/** @var SwooleRequest|MockObject $swooleRequest */
97+
/** @var MockObject|SwooleRequest $swooleRequest */
9898
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
9999

100-
/** @var SwooleResponse|MockObject $swooleResponse */
100+
/** @var MockObject|SwooleResponse $swooleResponse */
101101
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
102102

103-
/** @var OnRequestInterface|MockObject $onRequest */
103+
/** @var MockObject|OnRequestInterface $onRequest */
104104
$onRequest = $this->getMockByCalls(OnRequestInterface::class, [
105105
Call::create('__invoke')->with($swooleRequest, $swooleResponse),
106106
]);

‎tests/Unit/OnRequestTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@ final class OnRequestTest extends TestCase
2828

2929
public function testInvoke(): void
3030
{
31-
/** @var SwooleRequest|MockObject $swooleRequest */
31+
/** @var MockObject|SwooleRequest $swooleRequest */
3232
$swooleRequest = $this->getMockByCalls(SwooleRequest::class);
3333

34-
/** @var SwooleResponse|MockObject $swooleResponse */
34+
/** @var MockObject|SwooleResponse $swooleResponse */
3535
$swooleResponse = $this->getMockByCalls(SwooleResponse::class);
3636

37-
/** @var ServerRequestInterface|MockObject $request */
37+
/** @var MockObject|ServerRequestInterface $request */
3838
$request = $this->getMockByCalls(ServerRequestInterface::class);
3939

40-
/** @var ResponseInterface|MockObject $response */
40+
/** @var MockObject|ResponseInterface $response */
4141
$response = $this->getMockByCalls(ResponseInterface::class);
4242

43-
/** @var PsrRequestFactoryInterface|MockObject $psrRequestFactory */
43+
/** @var MockObject|PsrRequestFactoryInterface $psrRequestFactory */
4444
$psrRequestFactory = $this->getMockByCalls(PsrRequestFactoryInterface::class, [
4545
Call::create('create')->with($swooleRequest)->willReturn($request),
4646
]);
4747

48-
/** @var SwooleResponseEmitterInterface|MockObject $swooleResponseEmitter */
48+
/** @var MockObject|SwooleResponseEmitterInterface $swooleResponseEmitter */
4949
$swooleResponseEmitter = $this->getMockByCalls(SwooleResponseEmitterInterface::class, [
5050
Call::create('emit')->with($response, $swooleResponse),
5151
]);
5252

53-
/** @var RequestHandlerInterface|MockObject $swooleRequestHandler */
53+
/** @var MockObject|RequestHandlerInterface $swooleRequestHandler */
5454
$swooleRequestHandler = $this->getMockByCalls(RequestHandlerInterface::class, [
5555
Call::create('handle')->with($request)->willReturn($response),
5656
]);

‎tests/Unit/PsrRequestFactoryTest.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class PsrRequestFactoryTest extends TestCase
2929

3030
public function testInvoke(): void
3131
{
32-
/** @var SwooleRequest|MockObject $swooleRequest */
32+
/** @var MockObject|SwooleRequest $swooleRequest */
3333
$swooleRequest = $this->getMockByCalls(SwooleRequest::class, [
3434
Call::create('rawContent')->with()->willReturn('This is the body.'),
3535
]);
@@ -84,23 +84,23 @@ public function testInvoke(): void
8484
],
8585
];
8686

87-
/** @var StreamInterface|MockObject $requestBody */
87+
/** @var MockObject|StreamInterface $requestBody */
8888
$requestBody = $this->getMockByCalls(StreamInterface::class, [
8989
Call::create('write')->with('This is the body.'),
9090
]);
9191

92-
/** @var StreamInterface|MockObject $uploadedFileStream1 */
92+
/** @var MockObject|StreamInterface $uploadedFileStream1 */
9393
$uploadedFileStream1 = $this->getMockByCalls(StreamInterface::class);
9494

95-
/** @var StreamInterface|MockObject $uploadedFileStream2 */
95+
/** @var MockObject|StreamInterface $uploadedFileStream2 */
9696
$uploadedFileStream2 = $this->getMockByCalls(StreamInterface::class);
9797

98-
/** @var StreamInterface|MockObject $uploadedFileStream3 */
98+
/** @var MockObject|StreamInterface $uploadedFileStream3 */
9999
$uploadedFileStream3 = $this->getMockByCalls(StreamInterface::class);
100100

101101
$uploadedFileException = new \RuntimeException('test');
102102

103-
/** @var StreamFactoryInterface|MockObject $streamFactory */
103+
/** @var MockObject|StreamFactoryInterface $streamFactory */
104104
$streamFactory = $this->getMockByCalls(StreamFactoryInterface::class, [
105105
Call::create('createStreamFromFile')->with('/tmp/php9875842a', 'r')->willReturn($uploadedFileStream1),
106106
Call::create('createStreamFromFile')->with('/tmp/php8d5f55ce', 'r')->willReturn($uploadedFileStream2),
@@ -110,16 +110,16 @@ public function testInvoke(): void
110110
Call::create('createStream')->with('')->willReturn($uploadedFileStream3),
111111
]);
112112

113-
/** @var UploadedFileInterface|MockObject $uploadedFile1 */
113+
/** @var MockObject|UploadedFileInterface $uploadedFile1 */
114114
$uploadedFile1 = $this->getMockByCalls(UploadedFileInterface::class);
115115

116-
/** @var UploadedFileInterface|MockObject $uploadedFile2 */
116+
/** @var MockObject|UploadedFileInterface $uploadedFile2 */
117117
$uploadedFile2 = $this->getMockByCalls(UploadedFileInterface::class);
118118

119-
/** @var UploadedFileInterface|MockObject $uploadedFile3 */
119+
/** @var MockObject|UploadedFileInterface $uploadedFile3 */
120120
$uploadedFile3 = $this->getMockByCalls(UploadedFileInterface::class);
121121

122-
/** @var UploadedFileFactoryInterface|MockObject $uploadedFileFactory */
122+
/** @var MockObject|UploadedFileFactoryInterface $uploadedFileFactory */
123123
$uploadedFileFactory = $this->getMockByCalls(UploadedFileFactoryInterface::class, [
124124
Call::create('createUploadedFile')
125125
->with($uploadedFileStream1, 1048576, 0, 'CV.pdf', 'application/pdf')
@@ -132,7 +132,7 @@ public function testInvoke(): void
132132
->willReturn($uploadedFile3),
133133
]);
134134

135-
/** @var ServerRequestInterface|MockObject $request */
135+
/** @var MockObject|ServerRequestInterface $request */
136136
$request = $this->getMockByCalls(ServerRequestInterface::class, [
137137
Call::create('withHeader')->with('Content-Type', 'multipart/form-data')->willReturnSelf(),
138138
Call::create('withCookieParams')->with($swooleRequest->cookie)->willReturnSelf(),
@@ -157,7 +157,7 @@ static function (array $uploadedFiles) use ($uploadedFile1, $uploadedFile2, $upl
157157
Call::create('getBody')->with()->willReturn($requestBody),
158158
]);
159159

160-
/** @var ServerRequestFactoryInterface|MockObject $serverRequestFactory */
160+
/** @var MockObject|ServerRequestFactoryInterface $serverRequestFactory */
161161
$serverRequestFactory = $this->getMockByCalls(ServerRequestFactoryInterface::class, [
162162
Call::create('createServerRequest')
163163
->with('POST', '/application', ['REQUEST_METHOD' => 'POST', 'REQUEST_URI' => '/application'])

‎tests/Unit/SwooleResponseEmitterTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ final class SwooleResponseEmitterTest extends TestCase
2424

2525
public function testInvoke(): void
2626
{
27-
/** @var ResponseInterface|MockObject $responseWithoutCookies */
27+
/** @var MockObject|ResponseInterface $responseWithoutCookies */
2828
$responseWithoutCookies = $this->getMockByCalls(ResponseInterface::class, [
2929
Call::create('getHeaders')->with()->willReturn(['Content-Type' => ['application/json']]),
3030
]);
3131

32-
/** @var StreamInterface|MockObject $responseBody */
32+
/** @var MockObject|StreamInterface $responseBody */
3333
$responseBody = $this->getMockByCalls(StreamInterface::class, [
3434
Call::create('isSeekable')->with()->willReturn(true),
3535
Call::create('rewind')->with(),
@@ -38,7 +38,7 @@ public function testInvoke(): void
3838
Call::create('eof')->willReturn(true),
3939
]);
4040

41-
/** @var ResponseInterface|MockObject $response */
41+
/** @var MockObject|ResponseInterface $response */
4242
$response = $this->getMockByCalls(ResponseInterface::class, [
4343
Call::create('getStatusCode')->with()->willReturn(200),
4444
Call::create('getReasonPhrase')->with()->willReturn('OK'),
@@ -49,7 +49,7 @@ public function testInvoke(): void
4949
Call::create('getBody')->with()->willReturn($responseBody),
5050
]);
5151

52-
/** @var SwooleResponse|MockObject $swooleResponse */
52+
/** @var MockObject|SwooleResponse $swooleResponse */
5353
$swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
5454
Call::create('status')->with(200, 'OK'),
5555
Call::create('header')->with('Content-Type', 'application/json', null),
@@ -75,12 +75,12 @@ public function testInvoke(): void
7575

7676
public function testInvokeWithEmptyBody(): void
7777
{
78-
/** @var ResponseInterface|MockObject $responseWithoutCookies */
78+
/** @var MockObject|ResponseInterface $responseWithoutCookies */
7979
$responseWithoutCookies = $this->getMockByCalls(ResponseInterface::class, [
8080
Call::create('getHeaders')->with()->willReturn(['Content-Type' => ['application/json']]),
8181
]);
8282

83-
/** @var StreamInterface|MockObject $responseBody */
83+
/** @var MockObject|StreamInterface $responseBody */
8484
$responseBody = $this->getMockByCalls(StreamInterface::class, [
8585
Call::create('isSeekable')->with()->willReturn(true),
8686
Call::create('rewind')->with(),
@@ -89,7 +89,7 @@ public function testInvokeWithEmptyBody(): void
8989
Call::create('eof')->willReturn(true),
9090
]);
9191

92-
/** @var ResponseInterface|MockObject $response */
92+
/** @var MockObject|ResponseInterface $response */
9393
$response = $this->getMockByCalls(ResponseInterface::class, [
9494
Call::create('getStatusCode')->with()->willReturn(200),
9595
Call::create('getReasonPhrase')->with()->willReturn('OK'),
@@ -100,7 +100,7 @@ public function testInvokeWithEmptyBody(): void
100100
Call::create('getBody')->with()->willReturn($responseBody),
101101
]);
102102

103-
/** @var SwooleResponse|MockObject $swooleResponse */
103+
/** @var MockObject|SwooleResponse $swooleResponse */
104104
$swooleResponse = $this->getMockByCalls(SwooleResponse::class, [
105105
Call::create('status')->with(200, 'OK'),
106106
Call::create('header')->with('Content-Type', 'application/json', null),

0 commit comments

Comments
 (0)