Skip to content

Commit 0a60a7e

Browse files
committed
Update react/promise
1 parent 6771867 commit 0a60a7e

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

Config/FilesystemFactory.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use React\EventLoop\LoopInterface;
66
use React\Promise\Deferred;
7-
use React\Promise\Util;
7+
use React\Promise\When;
88
use React\Stream\Stream;
99

1010
class FilesystemFactory
@@ -19,7 +19,7 @@ public function __construct(LoopInterface $loop)
1919
public function create($filename)
2020
{
2121
return $this->loadEtcResolvConf($filename)
22-
->then(array($this, 'parseEtcResolvConf'));
22+
->then(array($this, 'parseEtcResolvConf'));
2323
}
2424

2525
public function parseEtcResolvConf($contents)
@@ -37,13 +37,13 @@ public function parseEtcResolvConf($contents)
3737
$config = new Config();
3838
$config->nameservers = $nameservers;
3939

40-
return Util::resolve($config);
40+
return When::resolve($config);
4141
}
4242

4343
public function loadEtcResolvConf($filename)
4444
{
4545
if (!file_exists($filename)) {
46-
return Util::reject(new \InvalidArgumentException("The filename for /etc/resolv.conf given does not exist: $filename"));
46+
return When::reject(new \InvalidArgumentException("The filename for /etc/resolv.conf given does not exist: $filename"));
4747
}
4848

4949
try {
@@ -67,7 +67,7 @@ public function loadEtcResolvConf($filename)
6767

6868
return $deferred->promise();
6969
} catch (\Exception $e) {
70-
return Util::reject($e);
70+
return When::reject($e);
7171
}
7272
}
7373
}

Query/CachedExecutor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use React\Dns\Model\Message;
66
use React\Dns\Model\Record;
7-
use React\Promise\Util;
7+
use React\Promise\When;
88

99
class CachedExecutor implements ExecutorInterface
1010
{
@@ -24,7 +24,7 @@ public function query($nameserver, Query $query)
2424
if (count($cachedRecords)) {
2525
$cachedResponse = $this->buildResponse($query, $cachedRecords);
2626

27-
return Util::resolve($cachedResponse);
27+
return When::resolve($cachedResponse);
2828
}
2929

3030
$cache = $this->cache;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"require": {
77
"php": ">=5.3.2",
88
"react/socket": "0.2.*",
9-
"react/promise": "dev-master"
9+
"react/promise": "1.0.*"
1010
},
1111
"autoload": {
1212
"psr-0": { "React\\Dns": "" }

0 commit comments

Comments
 (0)