Make it possible to use any kind of callable for PUB/SUB callbacks.

This commit is contained in:
Daniele Alessandri
2011-12-01 21:21:22 +01:00
parent d81346641f
commit a910807666
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -377,7 +377,7 @@ class Client
}
foreach ($pubsub as $message) {
if ($callable($pubsub, $message) === false) {
if (call_user_func($callable, $pubsub, $message) === false) {
$pubsub->closeContext();
}
}
+3 -3
View File
@@ -124,18 +124,18 @@ class DispatcherLoop
if ($kind !== PubSubContext::MESSAGE && $kind !== PubSubContext::PMESSAGE) {
if (isset($this->subscriptionCallback)) {
$callback = $this->subscriptionCallback;
$callback($message);
call_user_func($callback, $message);
}
continue;
}
if (isset($this->callbacks[$message->channel])) {
$callback = $this->callbacks[$message->channel];
$callback($message->payload);
call_user_func($callback, $message->payload);
}
else if (isset($this->defaultCallback)) {
$callback = $this->defaultCallback;
$callback($message);
call_user_func($callback, $message);
}
}
}