@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | public function handle() |
| 23 | 23 | { |
| 24 | - $action = (string)$this->argument('action'); |
|
| 24 | + $action = (string) $this->argument('action'); |
|
| 25 | 25 | switch ($action) { |
| 26 | 26 | case 'publish': |
| 27 | 27 | $this->publish(); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | { |
| 54 | 54 | // Load configuration laravel.php manually for Lumen |
| 55 | 55 | $basePath = config('laravels.laravel_base_path') ?: base_path(); |
| 56 | - if ($this->isLumen() && file_exists($basePath . '/config/laravels.php')) { |
|
| 56 | + if ($this->isLumen() && file_exists($basePath.'/config/laravels.php')) { |
|
| 57 | 57 | $this->getLaravel()->configure('laravels'); |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $laravelSVersion, |
| 111 | 111 | ], |
| 112 | 112 | [ |
| 113 | - $this->getApplication()->getName() . ' [<info>' . env('APP_ENV', config('app.env')) . '</info>]', |
|
| 113 | + $this->getApplication()->getName().' [<info>'.env('APP_ENV', config('app.env')).'</info>]', |
|
| 114 | 114 | $this->getApplication()->getVersion(), |
| 115 | 115 | ], |
| 116 | 116 | ]); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | { |
| 121 | 121 | $this->comment('>>> Protocols'); |
| 122 | 122 | |
| 123 | - $config = unserialize((string)file_get_contents($this->getConfPath())); |
|
| 123 | + $config = unserialize((string) file_get_contents($this->getConfPath())); |
|
| 124 | 124 | $ssl = isset($config['server']['swoole']['ssl_key_file'], $config['server']['swoole']['ssl_cert_file']); |
| 125 | 125 | $socketType = isset($config['server']['socket_type']) ? $config['server']['socket_type'] : SWOOLE_SOCK_TCP; |
| 126 | 126 | if (in_array($socketType, [SWOOLE_SOCK_UNIX_DGRAM, SWOOLE_SOCK_UNIX_STREAM])) { |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | continue; |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - $name = 'Port#' . $key . ' '; |
|
| 163 | + $name = 'Port#'.$key.' '; |
|
| 164 | 164 | $name .= isset($socketTypeNames[$socket['type']]) ? $socketTypeNames[$socket['type']] : 'Unknown socket'; |
| 165 | 165 | $tableRows [] = [ |
| 166 | 166 | $name, |
@@ -188,8 +188,8 @@ discard block |
||
| 188 | 188 | $laravelConf = [ |
| 189 | 189 | 'root_path' => $svrConf['laravel_base_path'], |
| 190 | 190 | 'static_path' => $svrConf['swoole']['document_root'], |
| 191 | - 'cleaners' => array_unique((array)Arr::get($svrConf, 'cleaners', [])), |
|
| 192 | - 'register_providers' => array_unique((array)Arr::get($svrConf, 'register_providers', [])), |
|
| 191 | + 'cleaners' => array_unique((array) Arr::get($svrConf, 'cleaners', [])), |
|
| 192 | + 'register_providers' => array_unique((array) Arr::get($svrConf, 'register_providers', [])), |
|
| 193 | 193 | 'destroy_controllers' => Arr::get($svrConf, 'destroy_controllers', []), |
| 194 | 194 | 'is_lumen' => $this->isLumen(), |
| 195 | 195 | '_SERVER' => $_SERVER, |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | $svrConf['ignore_check_pid'] = false; |
| 223 | 223 | } |
| 224 | 224 | if (empty($svrConf['swoole']['document_root'])) { |
| 225 | - $svrConf['swoole']['document_root'] = $svrConf['laravel_base_path'] . '/public'; |
|
| 225 | + $svrConf['swoole']['document_root'] = $svrConf['laravel_base_path'].'/public'; |
|
| 226 | 226 | } |
| 227 | 227 | if ($this->option('daemonize')) { |
| 228 | 228 | $svrConf['swoole']['daemonize'] = true; |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | // Set X-Version |
| 240 | - $xVersion = (string)$this->option('x-version'); |
|
| 240 | + $xVersion = (string) $this->option('x-version'); |
|
| 241 | 241 | if ($xVersion !== '') { |
| 242 | 242 | $_SERVER['X_VERSION'] = $_ENV['X_VERSION'] = $xVersion; |
| 243 | 243 | } |
@@ -264,34 +264,34 @@ discard block |
||
| 264 | 264 | public function publish() |
| 265 | 265 | { |
| 266 | 266 | $basePath = config('laravels.laravel_base_path') ?: base_path(); |
| 267 | - $configPath = $basePath . '/config/laravels.php'; |
|
| 267 | + $configPath = $basePath.'/config/laravels.php'; |
|
| 268 | 268 | $todoList = [ |
| 269 | 269 | [ |
| 270 | - 'from' => realpath(__DIR__ . '/../../config/laravels.php'), |
|
| 270 | + 'from' => realpath(__DIR__.'/../../config/laravels.php'), |
|
| 271 | 271 | 'to' => $configPath, |
| 272 | 272 | 'mode' => 0644, |
| 273 | 273 | ], |
| 274 | 274 | [ |
| 275 | - 'from' => realpath(__DIR__ . '/../../bin/laravels'), |
|
| 276 | - 'to' => $basePath . '/bin/laravels', |
|
| 275 | + 'from' => realpath(__DIR__.'/../../bin/laravels'), |
|
| 276 | + 'to' => $basePath.'/bin/laravels', |
|
| 277 | 277 | 'mode' => 0755, |
| 278 | 278 | 'link' => true, |
| 279 | 279 | ], |
| 280 | 280 | [ |
| 281 | - 'from' => realpath(__DIR__ . '/../../bin/fswatch'), |
|
| 282 | - 'to' => $basePath . '/bin/fswatch', |
|
| 281 | + 'from' => realpath(__DIR__.'/../../bin/fswatch'), |
|
| 282 | + 'to' => $basePath.'/bin/fswatch', |
|
| 283 | 283 | 'mode' => 0755, |
| 284 | 284 | 'link' => true, |
| 285 | 285 | ], |
| 286 | 286 | [ |
| 287 | - 'from' => realpath(__DIR__ . '/../../bin/inotify'), |
|
| 288 | - 'to' => $basePath . '/bin/inotify', |
|
| 287 | + 'from' => realpath(__DIR__.'/../../bin/inotify'), |
|
| 288 | + 'to' => $basePath.'/bin/inotify', |
|
| 289 | 289 | 'mode' => 0755, |
| 290 | 290 | 'link' => true, |
| 291 | 291 | ], |
| 292 | 292 | ]; |
| 293 | 293 | if (file_exists($configPath)) { |
| 294 | - $choice = $this->anticipate($configPath . ' already exists, do you want to override it ? Y/N', |
|
| 294 | + $choice = $this->anticipate($configPath.' already exists, do you want to override it ? Y/N', |
|
| 295 | 295 | ['Y', 'N'], |
| 296 | 296 | 'N' |
| 297 | 297 | ); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | $ip = isset($conf['listen_ip']) ? $conf['listen_ip'] : '127.0.0.1'; |
| 43 | 43 | $port = isset($conf['listen_port']) ? $conf['listen_port'] : 5200; |
| 44 | - $socketType = isset($conf['socket_type']) ? (int)$conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
| 44 | + $socketType = isset($conf['socket_type']) ? (int) $conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
| 45 | 45 | |
| 46 | 46 | if ($socketType === SWOOLE_SOCK_UNIX_STREAM) { |
| 47 | 47 | $socketDir = dirname($ip); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | protected function triggerWebSocketEvent($event, array $params) |
| 99 | 99 | { |
| 100 | - return $this->callWithCatchException(function () use ($event, $params) { |
|
| 100 | + return $this->callWithCatchException(function() use ($event, $params) { |
|
| 101 | 101 | $handler = $this->getWebSocketHandler(); |
| 102 | 102 | |
| 103 | 103 | if (method_exists($handler, $event)) { |
@@ -116,19 +116,19 @@ discard block |
||
| 116 | 116 | protected function bindWebSocketEvents() |
| 117 | 117 | { |
| 118 | 118 | if ($this->enableWebSocket) { |
| 119 | - $this->swoole->on('HandShake', function () { |
|
| 119 | + $this->swoole->on('HandShake', function() { |
|
| 120 | 120 | return $this->triggerWebSocketEvent('onHandShake', func_get_args()); |
| 121 | 121 | }); |
| 122 | 122 | |
| 123 | - $this->swoole->on('Open', function () { |
|
| 123 | + $this->swoole->on('Open', function() { |
|
| 124 | 124 | $this->triggerWebSocketEvent('onOpen', func_get_args()); |
| 125 | 125 | }); |
| 126 | 126 | |
| 127 | - $this->swoole->on('Message', function () { |
|
| 127 | + $this->swoole->on('Message', function() { |
|
| 128 | 128 | $this->triggerWebSocketEvent('onMessage', func_get_args()); |
| 129 | 129 | }); |
| 130 | 130 | |
| 131 | - $this->swoole->on('Close', function (WebSocketServer $server, $fd, $reactorId) { |
|
| 131 | + $this->swoole->on('Close', function(WebSocketServer $server, $fd, $reactorId) { |
|
| 132 | 132 | $clientInfo = $server->getClientInfo($fd); |
| 133 | 133 | if (isset($clientInfo['websocket_status']) && $clientInfo['websocket_status'] === \WEBSOCKET_STATUS_FRAME) { |
| 134 | 134 | $this->triggerWebSocketEvent('onClose', func_get_args()); |
@@ -156,9 +156,9 @@ discard block |
||
| 156 | 156 | $port->set(empty($socket['settings']) ? [] : $socket['settings']); |
| 157 | 157 | |
| 158 | 158 | $handlerClass = $socket['handler']; |
| 159 | - $eventHandler = function ($event, array $params) use ($port, $handlerClass) { |
|
| 159 | + $eventHandler = function($event, array $params) use ($port, $handlerClass) { |
|
| 160 | 160 | $handler = $this->getSocketHandler($port, $handlerClass); |
| 161 | - return $this->callWithCatchException(function () use ($handler, $event, $params) { |
|
| 161 | + return $this->callWithCatchException(function() use ($handler, $event, $params) { |
|
| 162 | 162 | if (method_exists($handler, $event)) { |
| 163 | 163 | if ($event === 'onHandShake' || $event === 'onRequest') { |
| 164 | 164 | $this->startHandleHttp($params[0]); |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | // Set default HandShake |
| 185 | 185 | if ($event === 'onHandShake' && method_exists($handler, 'onOpen')) { |
| 186 | 186 | $this->startHandleHttp($params[0]); |
| 187 | - $params[] = function () use ($handler, $params) { |
|
| 187 | + $params[] = function() use ($handler, $params) { |
|
| 188 | 188 | call_user_func_array([$handler, 'onOpen'], func_get_args()); |
| 189 | 189 | $this->endHandleHttp($params[0]); |
| 190 | 190 | }; |
@@ -208,8 +208,8 @@ discard block |
||
| 208 | 208 | 'BufferEmpty', |
| 209 | 209 | ]; |
| 210 | 210 | foreach ($events as $event) { |
| 211 | - $port->on($event, function () use ($event, $eventHandler) { |
|
| 212 | - return $eventHandler('on' . $event, func_get_args()); |
|
| 211 | + $port->on($event, function() use ($event, $eventHandler) { |
|
| 212 | + return $eventHandler('on'.$event, func_get_args()); |
|
| 213 | 213 | }); |
| 214 | 214 | } |
| 215 | 215 | } |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | |
| 259 | 259 | protected function bindSwooleTables() |
| 260 | 260 | { |
| 261 | - $tables = isset($this->conf['swoole_tables']) ? (array)$this->conf['swoole_tables'] : []; |
|
| 261 | + $tables = isset($this->conf['swoole_tables']) ? (array) $this->conf['swoole_tables'] : []; |
|
| 262 | 262 | foreach ($tables as $name => $table) { |
| 263 | 263 | $t = new Table($table['size']); |
| 264 | 264 | foreach ($table['column'] as $column) { |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | $headers = [ |
| 356 | 356 | 'Upgrade' => 'websocket', |
| 357 | 357 | 'Connection' => 'Upgrade', |
| 358 | - 'Sec-WebSocket-Accept' => base64_encode(sha1($secKey . '258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true)), |
|
| 358 | + 'Sec-WebSocket-Accept' => base64_encode(sha1($secKey.'258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true)), |
|
| 359 | 359 | 'Sec-WebSocket-Version' => '13', |
| 360 | 360 | ]; |
| 361 | 361 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | |
| 376 | 376 | if (is_callable($onOpen)) { |
| 377 | 377 | if (method_exists($this->swoole, 'defer')) { |
| 378 | - $this->swoole->defer(function () use ($onOpen, $request) { |
|
| 378 | + $this->swoole->defer(function() use ($onOpen, $request) { |
|
| 379 | 379 | call_user_func($onOpen, $this->swoole, $request); |
| 380 | 380 | }); |
| 381 | 381 | } else { |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | if (!($listener instanceof Listener)) { |
| 413 | 413 | throw new \InvalidArgumentException(sprintf('%s must extend the abstract class %s', $listenerClass, Listener::class)); |
| 414 | 414 | } |
| 415 | - $this->callWithCatchException(function () use ($listener) { |
|
| 415 | + $this->callWithCatchException(function() use ($listener) { |
|
| 416 | 416 | $listener->handle(); |
| 417 | 417 | }, [], $event->getTries()); |
| 418 | 418 | } |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | |
| 422 | 422 | protected function handleTask(Task $task) |
| 423 | 423 | { |
| 424 | - return $this->callWithCatchException(function () use ($task) { |
|
| 424 | + return $this->callWithCatchException(function() use ($task) { |
|
| 425 | 425 | $task->handle(); |
| 426 | 426 | return true; |
| 427 | 427 | }, [], $task->getTries()); |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | protected function fireEvent($event, $interface, array $arguments) |
| 431 | 431 | { |
| 432 | 432 | if (isset($this->conf['event_handlers'][$event])) { |
| 433 | - $eventHandlers = (array)$this->conf['event_handlers'][$event]; |
|
| 433 | + $eventHandlers = (array) $this->conf['event_handlers'][$event]; |
|
| 434 | 434 | foreach ($eventHandlers as $eventHandler) { |
| 435 | 435 | if (!isset(class_implements($eventHandler)[$interface])) { |
| 436 | 436 | throw new \InvalidArgumentException(sprintf( |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | ) |
| 441 | 441 | ); |
| 442 | 442 | } |
| 443 | - $this->callWithCatchException(function () use ($eventHandler, $arguments) { |
|
| 443 | + $this->callWithCatchException(function() use ($eventHandler, $arguments) { |
|
| 444 | 444 | call_user_func_array([(new $eventHandler), 'handle'], $arguments); |
| 445 | 445 | }); |
| 446 | 446 | } |