Skip to content

Commit c6f717e

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #4 from clue-labs/default-loop
2 parents 4412a60 + df15de2 commit c6f717e

File tree

5 files changed

+35
-46
lines changed

5 files changed

+35
-46
lines changed

‎README.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,22 @@ composer](http://getcomposer.org).
4545
<?php
4646

4747
use React\Async\Util as Async;
48-
49-
$loop = React\EventLoop\Factory::create();
48+
use React\EventLoop\Loop;
5049

5150
Async::parallel(
5251
array(
53-
function ($callback, $errback) use ($loop) {
54-
$loop->addTimer(1, function () use ($callback) {
52+
function ($callback, $errback) {
53+
Loop::addTimer(1, function () use ($callback) {
5554
$callback('Slept for a whole second');
5655
});
5756
},
58-
function ($callback, $errback) use ($loop) {
59-
$loop->addTimer(1, function () use ($callback) {
57+
function ($callback, $errback) {
58+
Loop::addTimer(1, function () use ($callback) {
6059
$callback('Slept for another whole second');
6160
});
6261
},
63-
function ($callback, $errback) use ($loop) {
64-
$loop->addTimer(1, function () use ($callback) {
62+
function ($callback, $errback) {
63+
Loop::addTimer(1, function () use ($callback) {
6564
$callback('Slept for yet another whole second');
6665
});
6766
},
@@ -75,8 +74,6 @@ Async::parallel(
7574
throw $e;
7675
}
7776
);
78-
79-
$loop->run();
8077
```
8178

8279
### Waterfall
@@ -85,16 +82,15 @@ $loop->run();
8582
<?php
8683

8784
use React\Async\Util as Async;
85+
use React\EventLoop\Loop;
8886

89-
$loop = React\EventLoop\Factory::create();
90-
91-
$addOne = function ($prev, $callback = null) use ($loop) {
87+
$addOne = function ($prev, $callback = null) {
9288
if (!$callback) {
9389
$callback = $prev;
9490
$prev = 0;
9591
}
9692

97-
$loop->addTimer(1, function () use ($prev, $callback) {
93+
Loop::addTimer(1, function () use ($prev, $callback) {
9894
$callback($prev + 1);
9995
});
10096
};
@@ -108,8 +104,6 @@ Async::waterfall(array(
108104
$callback();
109105
},
110106
));
111-
112-
$loop->run();
113107
```
114108

115109
## Todo

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
},
3131
"require-dev": {
3232
"phpunit/phpunit": "^5.7 || ^4.8.35",
33-
"react/event-loop": "0.2.*"
33+
"react/event-loop": "^1.2"
3434
},
3535
"suggest": {
36-
"react/event-loop": "You need some kind of event loop for this to make sense."
36+
"react/event-loop": "You need an event loop for this to make sense."
3737
},
3838
"autoload": {
3939
"psr-4": { "React\\Async\\": "src/" }

‎tests/UtilParallelTest.php

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace React\Tests\Async;
44

55
use React\Async\Util;
6+
use React\EventLoop\Loop;
67

78
class UtilParallelTest extends TestCase
89
{
@@ -18,16 +19,14 @@ public function testParallelWithoutTasks()
1819

1920
public function testParallelWithTasks()
2021
{
21-
$loop = new \React\EventLoop\StreamSelectLoop();
22-
2322
$tasks = array(
24-
function ($callback, $errback) use ($loop) {
25-
$loop->addTimer(0.1, function () use ($callback) {
23+
function ($callback, $errback) {
24+
Loop::addTimer(0.1, function () use ($callback) {
2625
$callback('foo');
2726
});
2827
},
29-
function ($callback, $errback) use ($loop) {
30-
$loop->addTimer(0.1, function () use ($callback) {
28+
function ($callback, $errback) {
29+
Loop::addTimer(0.1, function () use ($callback) {
3130
$callback('bar');
3231
});
3332
},
@@ -41,7 +40,7 @@ function ($callback, $errback) use ($loop) {
4140
$timer = new Timer($this);
4241
$timer->start();
4342

44-
$loop->run();
43+
Loop::run();
4544

4645
$timer->stop();
4746
$timer->assertInRange(0.1, 0.2);
@@ -78,15 +77,13 @@ public function testParallelWithDelayedError()
7877
{
7978
$called = 0;
8079

81-
$loop = new \React\EventLoop\StreamSelectLoop();
82-
8380
$tasks = array(
8481
function ($callback, $errback) use (&$called) {
8582
$callback('foo');
8683
$called++;
8784
},
88-
function ($callback, $errback) use ($loop) {
89-
$loop->addTimer(0.001, function () use ($errback) {
85+
function ($callback, $errback) {
86+
Loop::addTimer(0.001, function () use ($errback) {
9087
$e = new \RuntimeException('whoops');
9188
$errback($e);
9289
});
@@ -102,7 +99,7 @@ function ($callback, $errback) use (&$called) {
10299

103100
Util::parallel($tasks, $callback, $errback);
104101

105-
$loop->run();
102+
Loop::run();
106103

107104
$this->assertSame(2, $called);
108105
}

‎tests/UtilSeriesTest.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace React\Tests\Async;
44

55
use React\Async\Util;
6+
use React\EventLoop\Loop;
67

78
class UtilSeriesTest extends TestCase
89
{
@@ -18,16 +19,14 @@ public function testSeriesWithoutTasks()
1819

1920
public function testSeriesWithTasks()
2021
{
21-
$loop = new \React\EventLoop\StreamSelectLoop();
22-
2322
$tasks = array(
24-
function ($callback, $errback) use ($loop) {
25-
$loop->addTimer(0.05, function () use ($callback) {
23+
function ($callback, $errback) {
24+
Loop::addTimer(0.05, function () use ($callback) {
2625
$callback('foo');
2726
});
2827
},
29-
function ($callback, $errback) use ($loop) {
30-
$loop->addTimer(0.05, function () use ($callback) {
28+
function ($callback, $errback) {
29+
Loop::addTimer(0.05, function () use ($callback) {
3130
$callback('bar');
3231
});
3332
},
@@ -41,7 +40,7 @@ function ($callback, $errback) use ($loop) {
4140
$timer = new Timer($this);
4241
$timer->start();
4342

44-
$loop->run();
43+
Loop::run();
4544

4645
$timer->stop();
4746
$timer->assertInRange(0.10, 0.20);

‎tests/UtilWaterfallTest.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace React\Tests\Async;
44

55
use React\Async\Util;
6+
use React\EventLoop\Loop;
67

78
class UtilWaterfallTest extends TestCase
89
{
@@ -18,21 +19,19 @@ public function testWaterfallWithoutTasks()
1819

1920
public function testWaterfallWithTasks()
2021
{
21-
$loop = new \React\EventLoop\StreamSelectLoop();
22-
2322
$tasks = array(
24-
function ($callback, $errback) use ($loop) {
25-
$loop->addTimer(0.05, function () use ($callback) {
23+
function ($callback, $errback) {
24+
Loop::addTimer(0.05, function () use ($callback) {
2625
$callback('foo');
2726
});
2827
},
29-
function ($foo, $callback, $errback) use ($loop) {
30-
$loop->addTimer(0.05, function () use ($callback, $foo) {
28+
function ($foo, $callback, $errback) {
29+
Loop::addTimer(0.05, function () use ($callback, $foo) {
3130
$callback($foo.'bar');
3231
});
3332
},
34-
function ($bar, $callback, $errback) use ($loop) {
35-
$loop->addTimer(0.05, function () use ($callback, $bar) {
33+
function ($bar, $callback, $errback) {
34+
Loop::addTimer(0.05, function () use ($callback, $bar) {
3635
$callback($bar.'baz');
3736
});
3837
},
@@ -46,7 +45,7 @@ function ($bar, $callback, $errback) use ($loop) {
4645
$timer = new Timer($this);
4746
$timer->start();
4847

49-
$loop->run();
48+
Loop::run();
5049

5150
$timer->stop();
5251
$timer->assertInRange(0.15, 0.30);

0 commit comments

Comments
 (0)