faeez/rfc6455
1
0
Fork 0
Code Issues Pull Requests Actions Packages Repo. Project Releases Wiki Activity

Reverse the order of context to make optional

Browse Source
This commit is contained in:
Chris Boden 2015-06-04 23:20:05 -04:00
parent 59464f855c
commit 06263cd9a5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Messaging/Streaming/MessageStreamer.php
View File

@ -59,7 +59,7 @@ class MessageStreamer {
* @param callable(FrameInterface) $onControl * @param callable(FrameInterface) $onControl
* @return MessageInterface * @return MessageInterface
*/ */
public function onData($data, $context, MessageInterface $message = null, callable $onMessage, callable $onControl = null) { public function onData($data, MessageInterface $message = null, callable $onMessage, callable $onControl = null, $context = null) {
$overflow = ''; $overflow = '';
$onControl ?: $this->noop; $onControl ?: $this->noop;
@ -97,7 +97,7 @@ class MessageStreamer {
$overflow = $frame->extractOverflow(); $overflow = $frame->extractOverflow();
if (strlen($overflow) > 0) { if (strlen($overflow) > 0) {
$message = $this->onData($overflow, $context, $message, $onMessage, $onControl); $message = $this->onData($overflow, $message, $onMessage, $onControl, $context);
} }
return $message; return $message;
@ -121,7 +121,7 @@ class MessageStreamer {
} }
if (strlen($overflow) > 0) { if (strlen($overflow) > 0) {
$this->onData($overflow, $context, $message, $onMessage, $onControl); $this->onData($overflow, $message, $onMessage, $onControl, $context);
} }
return $message; return $message;

4
tests/ab/startServer.php
View File

@ -33,7 +33,7 @@ $server->on('request', function (\React\Http\Request $request, \React\Http\Respo
$msg = null; $msg = null;
$request->on('data', function($data) use ($ms, $response, &$msg) { $request->on('data', function($data) use ($ms, $response, &$msg) {
$msg = $ms->onData($data, $response, $msg, function(MessageInterface $msg, \React\Http\Response $conn) { $msg = $ms->onData($data, $msg, function(MessageInterface $msg, \React\Http\Response $conn) {
$conn->write($msg->getContents()); $conn->write($msg->getContents());
}, function(FrameInterface $frame, \React\Http\Response $conn) use ($ms) { }, function(FrameInterface $frame, \React\Http\Response $conn) use ($ms) {
switch ($frame->getOpCode()) { switch ($frame->getOpCode()) {
@ -44,7 +44,7 @@ $server->on('request', function (\React\Http\Request $request, \React\Http\Respo
$conn->write($ms->newFrame($frame->getPayload(), true, Frame::OP_PONG)->getContents()); $conn->write($ms->newFrame($frame->getPayload(), true, Frame::OP_PONG)->getContents());
break; break;
} }
}); }, $response);
}); });
}); });
$socket->listen(9001, '0.0.0.0'); $socket->listen(9001, '0.0.0.0');