Skip to content

Commit 64d9d98

Browse files
authored
To promise v3 (#5)
Added PHP 8.1 and 8.2
1 parent 5fd8220 commit 64d9d98

File tree

4 files changed

+40
-15
lines changed

4 files changed

+40
-15
lines changed

.circleci/config.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ jobs:
44
test-php74:
55
docker:
66
- image: circleci/php:7.4-cli
7-
87
working_directory: ~/project
98
steps:
109
- checkout
@@ -17,7 +16,30 @@ jobs:
1716
test-php80:
1817
docker:
1918
- image: circleci/php:8.0-cli
19+
working_directory: ~/project
20+
steps:
21+
- checkout
22+
- run:
23+
name: Run tests - Highest
24+
command: |
25+
composer update -n --prefer-dist
26+
php vendor/bin/phpunit
27+
28+
test-php81:
29+
docker:
30+
- image: cimg/php:8.1
31+
working_directory: ~/project
32+
steps:
33+
- checkout
34+
- run:
35+
name: Run tests - Highest
36+
command: |
37+
composer update -n --prefer-dist
38+
php vendor/bin/phpunit
2039
40+
test-php82:
41+
docker:
42+
- image: cimg/php:8.2
2143
working_directory: ~/project
2244
steps:
2345
- checkout
@@ -32,4 +54,6 @@ workflows:
3254
test:
3355
jobs:
3456
- test-php74
35-
- test-php80
57+
- test-php80
58+
- test-php81
59+
- test-php82

.phpunit.result.cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":1,"defects":{"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage":4,"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage2sameTick":4,"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage2differentTicks":4},"times":{"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage":0.002,"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage2sameTick":0,"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage2differentTicks":0,"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testSimpleUsage2differentTicksWithIterations2":0,"Drift\\EventLoop\\Tests\\EventLoopUtilsTest::testForceStop":0}}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"require": {
1313
"php": "^7.4|^8.0",
1414
"react/event-loop": "^1.1",
15-
"react/promise": "^2.7",
15+
"react/promise": "^3",
1616
"clue/block-react": "^1.3"
1717
},
1818
"require-dev": {

tests/EventLoopUtilsTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testSimpleUsage()
3535
new Promise(function ($resolver) use ($loop, &$value) {
3636
$loop->futureTick(function () use ($resolver, $loop, &$value) {
3737
$resolver(await(
38-
resolve()->then(function () use (&$value) {
38+
resolve(null)->then(function () use (&$value) {
3939
$value = true;
4040
}),
4141
$loop
@@ -59,15 +59,15 @@ public function testSimpleUsage2sameTick()
5959
new Promise(function ($resolver) use ($loop, &$value1, &$value2) {
6060
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
6161
$resolver(await(
62-
resolve()->then(function () use (&$value1) {
62+
resolve(null)->then(function () use (&$value1) {
6363
$value1 = true;
6464
}),
6565
$loop
6666
));
6767
});
6868
$loop->futureTick(function () use ($resolver, $loop, &$value2) {
6969
$resolver(await(
70-
resolve()->then(function () use (&$value2) {
70+
resolve(null)->then(function () use (&$value2) {
7171
$value2 = true;
7272
}),
7373
$loop
@@ -90,16 +90,16 @@ public function testSimpleUsage2differentTicks()
9090

9191
new Promise(function ($resolver) use ($loop, &$value1) {
9292
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
93-
await(resolve(), $loop);
93+
await(resolve(null), $loop);
9494

9595
new Promise(function ($resolver) use ($loop, &$value1) {
9696
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
97-
await(resolve(), $loop);
97+
await(resolve(null), $loop);
9898
$value1 = true;
9999
});
100100
});
101101

102-
$resolver();
102+
$resolver(null);
103103
});
104104
});
105105

@@ -119,16 +119,16 @@ public function testSimpleUsage2differentTicksWithIterations2()
119119

120120
new Promise(function ($resolver) use ($loop, &$value1) {
121121
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
122-
await(resolve(), $loop);
122+
await(resolve(null), $loop);
123123

124124
new Promise(function ($resolver) use ($loop, &$value1) {
125125
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
126-
await(resolve(), $loop);
126+
await(resolve(null), $loop);
127127
$value1 = true;
128128
});
129129
});
130130

131-
$resolver();
131+
$resolver(null);
132132
});
133133
});
134134

@@ -153,17 +153,17 @@ public function testForceStop()
153153

154154
new Promise(function ($resolver) use ($loop, &$value1, &$forceStop) {
155155
$loop->futureTick(function () use ($resolver, $loop, &$value1, &$forceStop) {
156-
await(resolve(), $loop);
156+
await(resolve(null), $loop);
157157
$forceStop = true;
158158

159159
new Promise(function ($resolver) use ($loop, &$value1) {
160160
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
161-
await(resolve(), $loop);
161+
await(resolve(null), $loop);
162162
$value1 = true;
163163
});
164164
});
165165

166-
$resolver();
166+
$resolver(null);
167167
});
168168
});
169169

0 commit comments

Comments
 (0)