Skip to content

Commit 7053e3c

Browse files
authored
Merge pull request #251 from ondrejmirtes/update-phpstan
Update PHPStan
2 parents 5cd1458 + 91cad0e commit 7053e3c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"php": ">=7.1.0"
2929
},
3030
"require-dev": {
31-
"phpstan/phpstan": "1.10.20 || 1.4.10",
31+
"phpstan/phpstan": "1.10.34 || 1.4.10",
3232
"phpunit/phpunit": "^9.5 || ^7.5"
3333
},
3434
"autoload": {

tests/types/reject.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
use function React\Promise\reject;
66
use function React\Promise\resolve;
77

8-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException()));
9-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->then(null, null));
10-
// assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->then(function (): int {
8+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException()));
9+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->then(null, null));
10+
// assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->then(function (): int {
1111
// return 42;
1212
// }));
1313
assertType('React\Promise\PromiseInterface<int>', reject(new RuntimeException())->then(null, function (): int {
@@ -32,11 +32,11 @@
3232
return resolve(42);
3333
}));
3434

35-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->finally(function (): void { }));
36-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->finally(function (): never {
35+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->finally(function (): void { }));
36+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->finally(function (): never {
3737
throw new \UnexpectedValueException();
3838
}));
39-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->finally(function (): PromiseInterface {
39+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->finally(function (): PromiseInterface {
4040
return reject(new \UnexpectedValueException());
4141
}));
4242

@@ -50,10 +50,10 @@
5050
return resolve(42);
5151
}));
5252

53-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->always(function (): void { }));
54-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->always(function (): never {
53+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->always(function (): void { }));
54+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->always(function (): never {
5555
throw new \UnexpectedValueException();
5656
}));
57-
assertType('React\Promise\PromiseInterface<*NEVER*>', reject(new RuntimeException())->always(function (): PromiseInterface {
57+
assertType('React\Promise\PromiseInterface<never>', reject(new RuntimeException())->always(function (): PromiseInterface {
5858
return reject(new \UnexpectedValueException());
5959
}));

tests/types/resolve.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function stringOrIntPromise(): PromiseInterface {
3434
assertType('React\Promise\PromiseInterface<int>', resolve(true)->then(function (bool $value): PromiseInterface {
3535
return resolve(42);
3636
}));
37-
assertType('React\Promise\PromiseInterface<*NEVER*>', resolve(true)->then(function (bool $value): never {
37+
assertType('React\Promise\PromiseInterface<never>', resolve(true)->then(function (bool $value): never {
3838
throw new \RuntimeException();
3939
}));
4040
assertType('React\Promise\PromiseInterface<bool|int>', resolve(true)->then(null, function (\Throwable $e): int {
@@ -61,10 +61,10 @@ function stringOrIntPromise(): PromiseInterface {
6161
}));
6262

6363
assertType('React\Promise\PromiseInterface<bool>', resolve(true)->finally(function (): void { }));
64-
// assertType('React\Promise\PromiseInterface<*NEVER*>', resolve(true)->finally(function (): never {
64+
// assertType('React\Promise\PromiseInterface<never>', resolve(true)->finally(function (): never {
6565
// throw new \RuntimeException();
6666
// }));
67-
// assertType('React\Promise\PromiseInterface<*NEVER*>', resolve(true)->finally(function (): PromiseInterface {
67+
// assertType('React\Promise\PromiseInterface<never>', resolve(true)->finally(function (): PromiseInterface {
6868
// return reject(new \RuntimeException());
6969
// }));
7070

@@ -79,9 +79,9 @@ function stringOrIntPromise(): PromiseInterface {
7979
}));
8080

8181
assertType('React\Promise\PromiseInterface<bool>', resolve(true)->always(function (): void { }));
82-
// assertType('React\Promise\PromiseInterface<*NEVER*>', resolve(true)->always(function (): never {
82+
// assertType('React\Promise\PromiseInterface<never>', resolve(true)->always(function (): never {
8383
// throw new \RuntimeException();
8484
// }));
85-
// assertType('React\Promise\PromiseInterface<*NEVER*>', resolve(true)->always(function (): PromiseInterface {
85+
// assertType('React\Promise\PromiseInterface<never>', resolve(true)->always(function (): PromiseInterface {
8686
// return reject(new \RuntimeException());
8787
// }));

0 commit comments

Comments
 (0)