Merge branch 'socket' into 0.4

# Conflicts:
#	composer.json
#	src/Ratchet/Server/IoServer.php
This commit is contained in:
Chris Boden 2017-04-19 16:48:03 -04:00
commit 55610686b1

View File

@ -28,7 +28,7 @@
, "require": {
"php": ">=5.4.2"
, "ratchet/rfc6455": "^0.2"
, "react/socket": "^0.5"
, "react/socket": "^0.7 || ^0.6 || ^0.5"
, "guzzlehttp/psr7": "^1.0"
, "symfony/http-foundation": "^2.2|^3.0"
, "symfony/routing": "^2.2|^3.0"