diff --git a/.circleci/config.yml b/.circleci/config.yml index 389a3dc..70a23e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,6 @@ jobs: test-php74: docker: - image: circleci/php:7.4-cli - working_directory: ~/project steps: - checkout @@ -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 @@ -32,4 +54,6 @@ workflows: test: jobs: - test-php74 - - test-php80 \ No newline at end of file + - test-php80 + - test-php81 + - test-php82 \ No newline at end of file diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 0000000..6731695 --- /dev/null +++ b/.phpunit.result.cache @@ -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}} \ No newline at end of file diff --git a/composer.json b/composer.json index 3e14f80..6371490 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/tests/EventLoopUtilsTest.php b/tests/EventLoopUtilsTest.php index 9af6ba9..c37cc22 100644 --- a/tests/EventLoopUtilsTest.php +++ b/tests/EventLoopUtilsTest.php @@ -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 @@ -59,7 +59,7 @@ 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 @@ -67,7 +67,7 @@ public function testSimpleUsage2sameTick() }); $loop->futureTick(function () use ($resolver, $loop, &$value2) { $resolver(await( - resolve()->then(function () use (&$value2) { + resolve(null)->then(function () use (&$value2) { $value2 = true; }), $loop @@ -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); }); }); @@ -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); }); }); @@ -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); }); });