Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.
Merged
Prev Previous commit
Next Next commit
test fixes
  • Loading branch information
mxp100 committed Aug 11, 2019
commit 18b2023ff99e61755e628a5102d6c087de609705
6 changes: 4 additions & 2 deletions src/Websocket/Websocket.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,19 @@ public function emit(string $event, $data): bool
/** @var Server $server */
$server = App::make(Server::class);

if ($server->taskworker) {
if (!empty($server->taskworker)) {
/** @var Manager $manager */
$manager = App::make(Manager::class);
$result = $manager->pushMessage($server, [
$manager->pushMessage($server, [
'sender' => $this->sender,
'fds' => $fds,
'broadcast' => $this->isBroadcast,
'assigned' => $assigned,
'event' => $event,
'message' => $data,
]);

$result = true;
} else {
$result = $server->task([
'action' => static::PUSH_ACTION,
Expand Down
3 changes: 2 additions & 1 deletion tests/Server/ManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ public function testOnTaskWorkerStart()
return $this->getEvent('swoole.workerStart');
});

$manager = $this->getManager($container);
$path = __DIR__ . '/../fixtures';
$manager = $this->getManager($container, $framework = 'laravel', $path);

$this->assertNull($manager->onWorkerStart($server));
}
Expand Down