Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ jobs:
test-php74:
docker:
- image: circleci/php:7.4-cli

working_directory: ~/project
steps:
- checkout
Expand All @@ -17,7 +16,30 @@ jobs:
test-php80:
docker:
- image: circleci/php:8.0-cli
working_directory: ~/project
steps:
- checkout
- run:
name: Run tests - Highest
command: |
composer update -n --prefer-dist
php vendor/bin/phpunit

test-php81:
docker:
- image: cimg/php:8.1
working_directory: ~/project
steps:
- checkout
- run:
name: Run tests - Highest
command: |
composer update -n --prefer-dist
php vendor/bin/phpunit

test-php82:
docker:
- image: cimg/php:8.2
working_directory: ~/project
steps:
- checkout
Expand All @@ -32,4 +54,6 @@ workflows:
test:
jobs:
- test-php74
- test-php80
- test-php80
- test-php81
- test-php82
1 change: 1 addition & 0 deletions .phpunit.result.cache
Original file line number Diff line number Diff line change
@@ -0,0 +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}}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": "^7.4|^8.0",
"react/event-loop": "^1.1",
"react/promise": "^2.7",
"react/promise": "^3",
"clue/block-react": "^1.3"
},
"require-dev": {
Expand Down
24 changes: 12 additions & 12 deletions tests/EventLoopUtilsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function testSimpleUsage()
new Promise(function ($resolver) use ($loop, &$value) {
$loop->futureTick(function () use ($resolver, $loop, &$value) {
$resolver(await(
resolve()->then(function () use (&$value) {
resolve(null)->then(function () use (&$value) {
$value = true;
}),
$loop
Expand All @@ -59,15 +59,15 @@ public function testSimpleUsage2sameTick()
new Promise(function ($resolver) use ($loop, &$value1, &$value2) {
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
$resolver(await(
resolve()->then(function () use (&$value1) {
resolve(null)->then(function () use (&$value1) {
$value1 = true;
}),
$loop
));
});
$loop->futureTick(function () use ($resolver, $loop, &$value2) {
$resolver(await(
resolve()->then(function () use (&$value2) {
resolve(null)->then(function () use (&$value2) {
$value2 = true;
}),
$loop
Expand All @@ -90,16 +90,16 @@ public function testSimpleUsage2differentTicks()

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

new Promise(function ($resolver) use ($loop, &$value1) {
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
await(resolve(), $loop);
await(resolve(null), $loop);
$value1 = true;
});
});

$resolver();
$resolver(null);
});
});

Expand All @@ -119,16 +119,16 @@ public function testSimpleUsage2differentTicksWithIterations2()

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

new Promise(function ($resolver) use ($loop, &$value1) {
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
await(resolve(), $loop);
await(resolve(null), $loop);
$value1 = true;
});
});

$resolver();
$resolver(null);
});
});

Expand All @@ -153,17 +153,17 @@ public function testForceStop()

new Promise(function ($resolver) use ($loop, &$value1, &$forceStop) {
$loop->futureTick(function () use ($resolver, $loop, &$value1, &$forceStop) {
await(resolve(), $loop);
await(resolve(null), $loop);
$forceStop = true;

new Promise(function ($resolver) use ($loop, &$value1) {
$loop->futureTick(function () use ($resolver, $loop, &$value1) {
await(resolve(), $loop);
await(resolve(null), $loop);
$value1 = true;
});
});

$resolver();
$resolver(null);
});
});

Expand Down