@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | public function interval() |
| 13 | 13 | { |
| 14 | - return (int)(static::GLOBAL_TIMER_LOCK_SECONDS * 0.9) * 1000; |
|
| 14 | + return (int) (static::GLOBAL_TIMER_LOCK_SECONDS * 0.9) * 1000; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function isImmediate() |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | $ip = isset($conf['listen_ip']) ? $conf['listen_ip'] : '127.0.0.1'; |
| 39 | 39 | $port = isset($conf['listen_port']) ? $conf['listen_port'] : 5200; |
| 40 | - $socketType = isset($conf['socket_type']) ? (int)$conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
| 40 | + $socketType = isset($conf['socket_type']) ? (int) $conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
| 41 | 41 | |
| 42 | 42 | if ($socketType === SWOOLE_SOCK_UNIX_STREAM) { |
| 43 | 43 | $socketDir = dirname($ip); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | protected function triggerWebSocketEvent($event, array $params) |
| 95 | 95 | { |
| 96 | - return $this->callWithCatchException(function () use ($event, $params) { |
|
| 96 | + return $this->callWithCatchException(function() use ($event, $params) { |
|
| 97 | 97 | $handler = $this->getWebSocketHandler(); |
| 98 | 98 | |
| 99 | 99 | if (method_exists($handler, $event)) { |
@@ -108,19 +108,19 @@ discard block |
||
| 108 | 108 | protected function bindWebSocketEvents() |
| 109 | 109 | { |
| 110 | 110 | if ($this->enableWebSocket) { |
| 111 | - $this->swoole->on('HandShake', function () { |
|
| 111 | + $this->swoole->on('HandShake', function() { |
|
| 112 | 112 | return $this->triggerWebSocketEvent('onHandShake', func_get_args()); |
| 113 | 113 | }); |
| 114 | 114 | |
| 115 | - $this->swoole->on('Open', function () { |
|
| 115 | + $this->swoole->on('Open', function() { |
|
| 116 | 116 | $this->triggerWebSocketEvent('onOpen', func_get_args()); |
| 117 | 117 | }); |
| 118 | 118 | |
| 119 | - $this->swoole->on('Message', function () { |
|
| 119 | + $this->swoole->on('Message', function() { |
|
| 120 | 120 | $this->triggerWebSocketEvent('onMessage', func_get_args()); |
| 121 | 121 | }); |
| 122 | 122 | |
| 123 | - $this->swoole->on('Close', function (WebSocketServer $server, $fd, $reactorId) { |
|
| 123 | + $this->swoole->on('Close', function(WebSocketServer $server, $fd, $reactorId) { |
|
| 124 | 124 | $clientInfo = $server->getClientInfo($fd); |
| 125 | 125 | if (isset($clientInfo['websocket_status']) && $clientInfo['websocket_status'] === \WEBSOCKET_STATUS_FRAME) { |
| 126 | 126 | $this->triggerWebSocketEvent('onClose', func_get_args()); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | protected function triggerPortEvent(Port $port, $handlerClass, $event, array $params) |
| 134 | 134 | { |
| 135 | - return $this->callWithCatchException(function () use ($port, $handlerClass, $event, $params) { |
|
| 135 | + return $this->callWithCatchException(function() use ($port, $handlerClass, $event, $params) { |
|
| 136 | 136 | $handler = $this->getSocketHandler($port, $handlerClass); |
| 137 | 137 | |
| 138 | 138 | if (method_exists($handler, $event)) { |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | 'BufferEmpty', |
| 178 | 178 | ]; |
| 179 | 179 | foreach ($events as $event) { |
| 180 | - $port->on($event, function () use ($port, $handlerClass, $event) { |
|
| 181 | - $this->triggerPortEvent($port, $handlerClass, 'on' . $event, func_get_args()); |
|
| 180 | + $port->on($event, function() use ($port, $handlerClass, $event) { |
|
| 181 | + $this->triggerPortEvent($port, $handlerClass, 'on'.$event, func_get_args()); |
|
| 182 | 182 | }); |
| 183 | 183 | } |
| 184 | 184 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | |
| 228 | 228 | protected function bindSwooleTables() |
| 229 | 229 | { |
| 230 | - $tables = isset($this->conf['swoole_tables']) ? (array)$this->conf['swoole_tables'] : []; |
|
| 230 | + $tables = isset($this->conf['swoole_tables']) ? (array) $this->conf['swoole_tables'] : []; |
|
| 231 | 231 | foreach ($tables as $name => $table) { |
| 232 | 232 | $t = new Table($table['size']); |
| 233 | 233 | foreach ($table['column'] as $column) { |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | $headers = [ |
| 325 | 325 | 'Upgrade' => 'websocket', |
| 326 | 326 | 'Connection' => 'Upgrade', |
| 327 | - 'Sec-WebSocket-Accept' => base64_encode(sha1($secKey . '258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true)), |
|
| 327 | + 'Sec-WebSocket-Accept' => base64_encode(sha1($secKey.'258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true)), |
|
| 328 | 328 | 'Sec-WebSocket-Version' => '13', |
| 329 | 329 | ]; |
| 330 | 330 | |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | if (!($listener instanceof Listener)) { |
| 371 | 371 | throw new \InvalidArgumentException(sprintf('%s must extend the abstract class %s', $listenerClass, Listener::class)); |
| 372 | 372 | } |
| 373 | - $this->callWithCatchException(function () use ($listener) { |
|
| 373 | + $this->callWithCatchException(function() use ($listener) { |
|
| 374 | 374 | $listener->handle(); |
| 375 | 375 | }, [], $event->getTries()); |
| 376 | 376 | } |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | protected function handleTask(Task $task) |
| 381 | 381 | { |
| 382 | - return $this->callWithCatchException(function () use ($task) { |
|
| 382 | + return $this->callWithCatchException(function() use ($task) { |
|
| 383 | 383 | $task->handle(); |
| 384 | 384 | return true; |
| 385 | 385 | }, [], $task->getTries()); |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | protected function fireEvent($event, $interface, array $arguments) |
| 389 | 389 | { |
| 390 | 390 | if (isset($this->conf['event_handlers'][$event])) { |
| 391 | - $eventHandlers = (array)$this->conf['event_handlers'][$event]; |
|
| 391 | + $eventHandlers = (array) $this->conf['event_handlers'][$event]; |
|
| 392 | 392 | foreach ($eventHandlers as $eventHandler) { |
| 393 | 393 | if (!isset(class_implements($eventHandler)[$interface])) { |
| 394 | 394 | throw new \InvalidArgumentException(sprintf( |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | ) |
| 399 | 399 | ); |
| 400 | 400 | } |
| 401 | - $this->callWithCatchException(function () use ($eventHandler, $arguments) { |
|
| 401 | + $this->callWithCatchException(function() use ($eventHandler, $arguments) { |
|
| 402 | 402 | call_user_func_array([(new $eventHandler), 'handle'], $arguments); |
| 403 | 403 | }); |
| 404 | 404 | } |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | $parts = parse_url($url); |
| 32 | 32 | $path = isset($parts['path']) ? $parts['path'] : '/'; |
| 33 | 33 | if (isset($parts['query'])) { |
| 34 | - $path .= '?' . $parts['query']; |
|
| 34 | + $path .= '?'.$parts['query']; |
|
| 35 | 35 | } |
| 36 | 36 | if (isset($parts['fragment'])) { |
| 37 | - $path .= '#' . $parts['fragment']; |
|
| 37 | + $path .= '#'.$parts['fragment']; |
|
| 38 | 38 | } |
| 39 | 39 | $client = new CoroutineClient($parts['host'], isset($parts['port']) ? $parts['port'] : 80, isset($parts['scheme']) && $parts['scheme'] === 'https'); |
| 40 | 40 | if (isset($options['timeout'])) { |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | continue; |
| 91 | 91 | } |
| 92 | 92 | if (isset($headers[$key])) { |
| 93 | - $headers[$key] = (array)$headers[$key]; |
|
| 93 | + $headers[$key] = (array) $headers[$key]; |
|
| 94 | 94 | $headers[$key][] = isset($middle[1]) ? trim($middle[1]) : ''; |
| 95 | 95 | } else { |
| 96 | 96 | $headers[$key] = isset($middle[1]) ? trim($middle[1]) : ''; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $server[$headerServerMapping[$key]] = $value; |
| 52 | 52 | } else { |
| 53 | 53 | $key = str_replace('-', '_', $key); |
| 54 | - $server['http_' . $key] = $value; |
|
| 54 | + $server['http_'.$key] = $value; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | $server = array_change_key_case($server, CASE_UPPER); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | && isset($_SERVER['QUERY_STRING']) |
| 66 | 66 | && $_SERVER['QUERY_STRING'] !== '' |
| 67 | 67 | ) { |
| 68 | - $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING']; |
|
| 68 | + $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING']; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | // Fix argv & argc |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | self::autoload($this->conf['root_path']); |
| 83 | 83 | |
| 84 | 84 | // Make kernel for Laravel |
| 85 | - $app = require $this->conf['root_path'] . '/bootstrap/app.php'; |
|
| 85 | + $app = require $this->conf['root_path'].'/bootstrap/app.php'; |
|
| 86 | 86 | $kernel = $this->conf['is_lumen'] ? null : $app->make(HttpKernel::class); |
| 87 | 87 | |
| 88 | 88 | // Boot |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | { |
| 103 | 103 | $cfgPaths = [ |
| 104 | 104 | // Framework default configuration |
| 105 | - $this->conf['root_path'] . '/vendor/laravel/lumen-framework/config/', |
|
| 105 | + $this->conf['root_path'].'/vendor/laravel/lumen-framework/config/', |
|
| 106 | 106 | // App configuration |
| 107 | - $this->conf['root_path'] . '/config/', |
|
| 107 | + $this->conf['root_path'].'/config/', |
|
| 108 | 108 | ]; |
| 109 | 109 | |
| 110 | 110 | $keys = []; |
| 111 | 111 | foreach ($cfgPaths as $cfgPath) { |
| 112 | - $configs = (array)glob($cfgPath . '*.php'); |
|
| 112 | + $configs = (array) glob($cfgPath.'*.php'); |
|
| 113 | 113 | foreach ($configs as $config) { |
| 114 | 114 | $config = substr(basename($config), 0, -4); |
| 115 | 115 | $keys[$config] = $config; |
@@ -123,11 +123,11 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | public static function autoload($rootPath) |
| 125 | 125 | { |
| 126 | - $autoload = $rootPath . '/bootstrap/autoload.php'; |
|
| 126 | + $autoload = $rootPath.'/bootstrap/autoload.php'; |
|
| 127 | 127 | if (file_exists($autoload)) { |
| 128 | 128 | require_once $autoload; |
| 129 | 129 | } else { |
| 130 | - require_once $rootPath . '/vendor/autoload.php'; |
|
| 130 | + require_once $rootPath.'/vendor/autoload.php'; |
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // prefer content in response, secondly ob |
| 159 | - if (!($response instanceof StreamedResponse) && (string)$content === '' && ob_get_length() > 0) { |
|
| 159 | + if (!($response instanceof StreamedResponse) && (string) $content === '' && ob_get_length() > 0) { |
|
| 160 | 160 | $response->setContent(ob_get_contents()); |
| 161 | 161 | } |
| 162 | 162 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } |
| 174 | 174 | $uri = urldecode($uri); |
| 175 | 175 | |
| 176 | - $requestFile = $this->conf['static_path'] . $uri; |
|
| 176 | + $requestFile = $this->conf['static_path'].$uri; |
|
| 177 | 177 | if (is_file($requestFile)) { |
| 178 | 178 | return $this->createStaticResponse($requestFile, $request); |
| 179 | 179 | } |
@@ -189,9 +189,9 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | protected function lookupIndex($folder) |
| 191 | 191 | { |
| 192 | - $folder = rtrim($folder, '/') . '/'; |
|
| 192 | + $folder = rtrim($folder, '/').'/'; |
|
| 193 | 193 | foreach (self::$staticIndexList as $index) { |
| 194 | - $tmpFile = $folder . $index; |
|
| 194 | + $tmpFile = $folder.$index; |
|
| 195 | 195 | if (is_file($tmpFile)) { |
| 196 | 196 | return $tmpFile; |
| 197 | 197 | } |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | |
| 233 | 233 | public function bindSwoole($swoole) |
| 234 | 234 | { |
| 235 | - $this->currentApp->singleton('swoole', function () use ($swoole) { |
|
| 235 | + $this->currentApp->singleton('swoole', function() use ($swoole) { |
|
| 236 | 236 | return $swoole; |
| 237 | 237 | }); |
| 238 | 238 | } |
@@ -19,17 +19,17 @@ |
||
| 19 | 19 | return false; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - $fileTypes = isset($config['file_types']) ? (array)$config['file_types'] : []; |
|
| 22 | + $fileTypes = isset($config['file_types']) ? (array) $config['file_types'] : []; |
|
| 23 | 23 | if (empty($fileTypes)) { |
| 24 | 24 | $this->warning('No file types to watch by inotify'); |
| 25 | 25 | return false; |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - $callback = function () use ($config, $laravelConf) { |
|
| 28 | + $callback = function() use ($config, $laravelConf) { |
|
| 29 | 29 | $log = !empty($config['log']); |
| 30 | 30 | $this->setProcessTitle(sprintf('%s laravels: inotify process', $config['process_prefix'])); |
| 31 | 31 | $inotify = new Inotify($config['watch_path'], IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVE, |
| 32 | - function ($event) use ($log, $laravelConf) { |
|
| 32 | + function($event) use ($log, $laravelConf) { |
|
| 33 | 33 | Portal::runLaravelSCommand($laravelConf['root_path'], 'reload'); |
| 34 | 34 | if ($log) { |
| 35 | 35 | $action = 'file:'; |
@@ -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->getConfigPath())); |
|
| 123 | + $config = unserialize((string) file_get_contents($this->getConfigPath())); |
|
| 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 | ); |
@@ -131,9 +131,9 @@ discard block |
||
| 131 | 131 | if ($value === false) { |
| 132 | 132 | continue; |
| 133 | 133 | } |
| 134 | - $passOptionStr .= sprintf('--%s%s ', $key, is_bool($value) ? '' : ('=' . $value)); |
|
| 134 | + $passOptionStr .= sprintf('--%s%s ', $key, is_bool($value) ? '' : ('='.$value)); |
|
| 135 | 135 | } |
| 136 | - $statusCode = self::runArtisanCommand($this->basePath, trim('laravels config ' . $passOptionStr)); |
|
| 136 | + $statusCode = self::runArtisanCommand($this->basePath, trim('laravels config '.$passOptionStr)); |
|
| 137 | 137 | if ($statusCode !== 0) { |
| 138 | 138 | return $statusCode; |
| 139 | 139 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | $config = $this->getConfig(); |
| 143 | 143 | |
| 144 | 144 | if (!$config['server']['ignore_check_pid'] && file_exists($config['server']['swoole']['pid_file'])) { |
| 145 | - $pid = (int)file_get_contents($config['server']['swoole']['pid_file']); |
|
| 145 | + $pid = (int) file_get_contents($config['server']['swoole']['pid_file']); |
|
| 146 | 146 | if ($pid > 0 && self::kill($pid, 0)) { |
| 147 | 147 | $this->warning(sprintf('Swoole[PID=%d] is already running.', $pid)); |
| 148 | 148 | return 1; |
@@ -194,8 +194,8 @@ discard block |
||
| 194 | 194 | $basePath = dirname($pidFile); |
| 195 | 195 | $deleteFiles = [ |
| 196 | 196 | $pidFile, |
| 197 | - $basePath . '/laravels-custom-processes.pid', |
|
| 198 | - $basePath . '/laravels-timer-process.pid', |
|
| 197 | + $basePath.'/laravels-custom-processes.pid', |
|
| 198 | + $basePath.'/laravels-timer-process.pid', |
|
| 199 | 199 | ]; |
| 200 | 200 | foreach ($deleteFiles as $deleteFile) { |
| 201 | 201 | if (file_exists($deleteFile)) { |
@@ -237,9 +237,9 @@ discard block |
||
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | // Reload custom processes |
| 240 | - $pidFile = dirname($pidFile) . '/laravels-custom-processes.pid'; |
|
| 240 | + $pidFile = dirname($pidFile).'/laravels-custom-processes.pid'; |
|
| 241 | 241 | if (file_exists($pidFile)) { |
| 242 | - $pids = (array)explode("\n", trim(file_get_contents($pidFile))); |
|
| 242 | + $pids = (array) explode("\n", trim(file_get_contents($pidFile))); |
|
| 243 | 243 | unlink($pidFile); |
| 244 | 244 | foreach ($pids as $pid) { |
| 245 | 245 | if (!$pid || !self::kill($pid, 0)) { |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | |
| 258 | 258 | // Reload timer process |
| 259 | 259 | if (!empty($config['server']['timer']['enable']) && !empty($config['server']['timer']['jobs'])) { |
| 260 | - $pidFile = dirname($pidFile) . '/laravels-timer-process.pid'; |
|
| 260 | + $pidFile = dirname($pidFile).'/laravels-timer-process.pid'; |
|
| 261 | 261 | $pid = file_get_contents($pidFile); |
| 262 | 262 | if (!$pid || !self::kill($pid, 0)) { |
| 263 | 263 | $this->error("Timer process[PID={$pid}] does not exist, or permission denied."); |
@@ -281,9 +281,9 @@ discard block |
||
| 281 | 281 | public function loadApollo(array $options) |
| 282 | 282 | { |
| 283 | 283 | Client::putCommandOptionsToEnv($options); |
| 284 | - $envFile = $this->basePath . '/.env'; |
|
| 284 | + $envFile = $this->basePath.'/.env'; |
|
| 285 | 285 | if (isset($options['env'])) { |
| 286 | - $envFile .= '.' . $options['env']; |
|
| 286 | + $envFile .= '.'.$options['env']; |
|
| 287 | 287 | } |
| 288 | 288 | Client::createFromCommandOptions($options)->pullAllAndSave($envFile); |
| 289 | 289 | } |
@@ -311,12 +311,12 @@ discard block |
||
| 311 | 311 | $phpCmd = sprintf('%s -c "%s"', PHP_BINARY, $iniFile); |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | - $checkSwooleCmd = $phpCmd . ' --ri swoole'; |
|
| 315 | - $checkOutput = (string)shell_exec($checkSwooleCmd); |
|
| 314 | + $checkSwooleCmd = $phpCmd.' --ri swoole'; |
|
| 315 | + $checkOutput = (string) shell_exec($checkSwooleCmd); |
|
| 316 | 316 | if (stripos($checkOutput, 'enabled') === false) { |
| 317 | 317 | $phpCmd .= ' -d "extension=swoole"'; |
| 318 | 318 | } |
| 319 | - return trim($phpCmd . ' ' . $subCmd); |
|
| 319 | + return trim($phpCmd.' '.$subCmd); |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | public static function runArtisanCommand($basePath, $cmd) |
@@ -333,16 +333,16 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | public function getConfig() |
| 335 | 335 | { |
| 336 | - return unserialize((string)file_get_contents($this->getConfigPath())); |
|
| 336 | + return unserialize((string) file_get_contents($this->getConfigPath())); |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | protected function getConfigPath() |
| 340 | 340 | { |
| 341 | 341 | $storagePath = getenv('APP_STORAGE_PATH'); |
| 342 | 342 | if ($storagePath === false) { |
| 343 | - $storagePath = $this->basePath . '/storage'; |
|
| 343 | + $storagePath = $this->basePath.'/storage'; |
|
| 344 | 344 | } |
| 345 | - return $storagePath . '/laravels.conf'; |
|
| 345 | + return $storagePath.'/laravels.conf'; |
|
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | public static function runCommand($cmd, $input = null) |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | public static function kill($pid, $sig) |
| 364 | 364 | { |
| 365 | 365 | try { |
| 366 | - return Process::kill((int)$pid, $sig); |
|
| 366 | + return Process::kill((int) $pid, $sig); |
|
| 367 | 367 | } catch (\Exception $e) { |
| 368 | 368 | return false; |
| 369 | 369 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | public function addCustomProcesses(Server $swoole, $processPrefix, array $processes, array $laravelConfig) |
| 13 | 13 | { |
| 14 | - $pidfile = dirname($swoole->setting['pid_file']) . '/' . $this->customProcessPidFile; |
|
| 14 | + $pidfile = dirname($swoole->setting['pid_file']).'/'.$this->customProcessPidFile; |
|
| 15 | 15 | if (file_exists($pidfile)) { |
| 16 | 16 | unlink($pidfile); |
| 17 | 17 | } |
@@ -26,9 +26,9 @@ discard block |
||
| 26 | 26 | continue; |
| 27 | 27 | } |
| 28 | 28 | $processClass = $item['class']; |
| 29 | - $restartInterval = isset($item['restart_interval']) ? (int)$item['restart_interval'] : 5; |
|
| 30 | - $callback = function (Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) { |
|
| 31 | - file_put_contents($pidfile, $worker->pid . "\n", FILE_APPEND | LOCK_EX); |
|
| 29 | + $restartInterval = isset($item['restart_interval']) ? (int) $item['restart_interval'] : 5; |
|
| 30 | + $callback = function(Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) { |
|
| 31 | + file_put_contents($pidfile, $worker->pid."\n", FILE_APPEND | LOCK_EX); |
|
| 32 | 32 | $this->initLaravel($laravelConfig, $swoole); |
| 33 | 33 | if (!isset(class_implements($processClass)[CustomProcessInterface::class])) { |
| 34 | 34 | throw new \InvalidArgumentException( |
@@ -42,13 +42,13 @@ discard block |
||
| 42 | 42 | /**@var CustomProcessInterface $processClass */ |
| 43 | 43 | $this->setProcessTitle(sprintf('%s laravels: %s process', $processPrefix, $name)); |
| 44 | 44 | |
| 45 | - Process::signal(SIGUSR1, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 45 | + Process::signal(SIGUSR1, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 46 | 46 | $this->info(sprintf('Reloading %s process[PID=%d].', $name, $worker->pid)); |
| 47 | 47 | $processClass::onReload($swoole, $worker); |
| 48 | 48 | }); |
| 49 | 49 | |
| 50 | 50 | if (method_exists($processClass, 'onStop')) { |
| 51 | - Process::signal(SIGTERM, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 51 | + Process::signal(SIGTERM, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) { |
|
| 52 | 52 | $this->info(sprintf('Stopping %s process[PID=%d].', $name, $worker->pid)); |
| 53 | 53 | $processClass::onStop($swoole, $worker); |
| 54 | 54 | }); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | for ($i = 0; $i < $item['num']; $i++) { |
| 73 | 73 | $process = $this->makeProcess($callback, $item); |
| 74 | 74 | $swoole->addProcess($process); |
| 75 | - $processList[$name . $i] = $process; |
|
| 75 | + $processList[$name.$i] = $process; |
|
| 76 | 76 | } |
| 77 | 77 | } else { // For single process |
| 78 | 78 | $process = $this->makeProcess($callback, $item); |