Skip to content

Commit 3660c94

Browse files
committed
Support React v0.4 (while keeping BC with v0.3)
Fixes #1
1 parent 596da73 commit 3660c94

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ php:
44
- 5.6
55
- hhvm
66
install:
7-
- composer install --prefer-source --no-interaction
7+
- composer update --prefer-source --no-interaction
88
script:
99
- phpunit --coverage-text

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"require": {
1717
"php": ">=5.3",
18-
"react/event-loop": "~0.3.0",
18+
"react/event-loop": "~0.3.0|~0.4.0",
1919
"clue/buzz-react": "~0.1.0",
20-
"react/promise": "~1.0"
20+
"react/promise": "~1.0|~2.0"
2121
}
2222
}

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Factory.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ public function createClient($url = null)
2424

2525
$connector = new UnixConnector($this->loop, $url);
2626

27-
$http = new HttpClient($this->loop, $connector, $connector);
27+
$ref = new \ReflectionClass('React\HttpClient\Client');
28+
if ($ref->getConstructor()->getNumberOfRequiredParameters() == 2) {
29+
// react/http-client:0.4 removed the $loop parameter
30+
$http = new HttpClient($connector, $connector);
31+
} else {
32+
$http = new HttpClient($this->loop, $connector, $connector);
33+
}
2834

2935
$sender = new Sender($http);
3036

0 commit comments

Comments
 (0)