Skip to content

Commit 74da451

Browse files
committed
Merge branch 'refs/heads/evenement-2.0'
2 parents f690b16 + 4825dee commit 74da451

File tree

6 files changed

+28
-20
lines changed

6 files changed

+28
-20
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CHANGELOG
99
* BC break: Bump minimum PHP version to PHP 5.4, remove 5.3 specific hacks
1010
* BC break: Remove `$loop` argument from `HttpClient`: `Client`, `Request`, `Response`
1111
* BC break: Update to React/Promise 2.0
12+
* BC break: Update to Evenement 2.0
1213
* Bug fix: [Dns] Properly resolve CNAME aliases
1314
* Bug fix: [EventLoop] No error on removing non-existent streams (@clue)
1415
* Bug fix: [EventLoop] Do not silently remove feof listeners in `LibEvLoop`

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"require": {
1111
"php": ">=5.4.0",
12-
"evenement/evenement": "1.0.*",
12+
"evenement/evenement": "~2.0",
1313
"guzzle/parser": "~3.0",
1414
"react/promise": "~2.0"
1515
},

composer.lock

Lines changed: 23 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/React/ChildProcess/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"require": {
77
"php": ">=5.3.3",
8-
"evenement/evenement": "1.0.*",
8+
"evenement/evenement": "~2.0",
99
"react/event-loop": "0.2.*",
1010
"react/stream": "0.2.*"
1111
},

src/React/Socket/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"require": {
77
"php": ">=5.3.3",
8-
"evenement/evenement": "1.0.*",
8+
"evenement/evenement": "~2.0",
99
"react/event-loop": "0.3.*",
1010
"react/stream": "0.3.*"
1111
},

src/React/Stream/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"require": {
77
"php": ">=5.3.3",
8-
"evenement/evenement": "1.0.*"
8+
"evenement/evenement": "~2.0"
99
},
1010
"suggest": {
1111
"react/event-loop": "0.3.*",

0 commit comments

Comments
 (0)