Merge branch 'master' into 0.4

# Conflicts:
#	README.md
This commit is contained in:
Chris Boden 2017-04-19 17:05:46 -04:00
commit 4ac1f914f3
4 changed files with 7 additions and 4 deletions

View File

@ -4,7 +4,7 @@
[![Autobahn Testsuite](https://img.shields.io/badge/Autobahn-passing-brightgreen.svg)](http://socketo.me/reports/ab/index.html)
[![Latest Stable Version](https://poser.pugx.org/cboden/ratchet/v/stable.png)](https://packagist.org/packages/cboden/ratchet)
A PHP 5.4 library for asynchronously serving WebSockets.
A PHP library for asynchronously serving WebSockets.
Build up your application through simple interfaces and re-use your application without changing any of its code just by combining different components.
##Requirements
@ -79,5 +79,5 @@ class MyChat implements MessageComponentInterface {
// Then some JavaScript in the browser:
var conn = new WebSocket('ws://localhost:8080/echo');
conn.onmessage = function(e) { console.log(e.data); };
conn.send('Hello Me!');
conn.onopen = function(e) { conn.send('Hello Me!'); };
```

View File

@ -33,4 +33,7 @@
, "symfony/http-foundation": "^2.2|^3.0"
, "symfony/routing": "^2.2|^3.0"
}
, "require-dev": {
"phpunit/phpunit": "~4.8"
}
}

View File

@ -8,7 +8,7 @@ use Ratchet\ConnectionInterface;
* WebSocket Application Messaging Protocol
*
* @link http://wamp.ws/spec
* @link https://github.com/oberstet/AutobahnJS
* @link https://github.com/oberstet/autobahn-js
*
* +--------------+----+------------------+
* | Message Type | ID | DIRECTION |

View File

@ -8,7 +8,7 @@ use Ratchet\ConnectionInterface;
* Enable support for the official WAMP sub-protocol in your application
* WAMP allows for Pub/Sub and RPC
* @link http://wamp.ws The WAMP specification
* @link https://github.com/oberstet/AutobahnJS Souce for client side library
* @link https://github.com/oberstet/autobahn-js Souce for client side library
* @link http://autobahn.s3.amazonaws.com/js/autobahn.min.js Minified client side library
*/
class WampServer implements MessageComponentInterface, WsServerInterface {