@@ -15,31 +15,31 @@ |
||
15 | 15 | public function boot() |
16 | 16 | { |
17 | 17 | $this->publishes([ |
18 | - __DIR__ . '/../../../config/prometheus.php' => base_path('config/prometheus.php'), |
|
18 | + __DIR__.'/../../../config/prometheus.php' => base_path('config/prometheus.php'), |
|
19 | 19 | ]); |
20 | 20 | } |
21 | 21 | |
22 | 22 | public function register() |
23 | 23 | { |
24 | 24 | $this->mergeConfigFrom( |
25 | - __DIR__ . '/../../../config/prometheus.php', 'prometheus' |
|
25 | + __DIR__.'/../../../config/prometheus.php', 'prometheus' |
|
26 | 26 | ); |
27 | - $this->app->singleton(RequestMiddleware::class, function ($app) { |
|
27 | + $this->app->singleton(RequestMiddleware::class, function($app) { |
|
28 | 28 | return new RequestMiddleware($app->make(HttpRequestCollector::class)); |
29 | 29 | }); |
30 | - $this->app->singleton(HttpRequestCollector::class, function ($app) { |
|
30 | + $this->app->singleton(HttpRequestCollector::class, function($app) { |
|
31 | 31 | return new HttpRequestCollector($app['config']->get('prometheus')); |
32 | 32 | }); |
33 | - $this->app->singleton(SwooleProcessCollector::class, function ($app) { |
|
33 | + $this->app->singleton(SwooleProcessCollector::class, function($app) { |
|
34 | 34 | return new SwooleProcessCollector($app['config']->get('prometheus')); |
35 | 35 | }); |
36 | - $this->app->singleton(SwooleStatsCollector::class, function ($app) { |
|
36 | + $this->app->singleton(SwooleStatsCollector::class, function($app) { |
|
37 | 37 | return new SwooleStatsCollector($app['config']->get('prometheus')); |
38 | 38 | }); |
39 | - $this->app->singleton(SystemCollector::class, function ($app) { |
|
39 | + $this->app->singleton(SystemCollector::class, function($app) { |
|
40 | 40 | return new SystemCollector($app['config']->get('prometheus')); |
41 | 41 | }); |
42 | - $this->app->singleton(Exporter::class, function ($app) { |
|
42 | + $this->app->singleton(Exporter::class, function($app) { |
|
43 | 43 | return new Exporter($app['config']->get('prometheus')); |
44 | 44 | }); |
45 | 45 | } |
@@ -20,26 +20,26 @@ discard block |
||
20 | 20 | if ($routes instanceof \Illuminate\Routing\RouteCollection) { // Laravel |
21 | 21 | foreach ($routes->getRoutes() as $route) { |
22 | 22 | $method = $route->methods()[0]; |
23 | - $uri = '/' . ltrim($route->uri(), '/'); |
|
24 | - $this->routes[$method . $uri] = $uri; |
|
23 | + $uri = '/'.ltrim($route->uri(), '/'); |
|
24 | + $this->routes[$method.$uri] = $uri; |
|
25 | 25 | |
26 | 26 | $action = $route->getAction(); |
27 | 27 | if (is_string($action['uses'])) { // Uses |
28 | - $this->routesByUses[$method . $action['uses']] = $uri; |
|
28 | + $this->routesByUses[$method.$action['uses']] = $uri; |
|
29 | 29 | } elseif ($action['uses'] instanceof Closure) { // Closure |
30 | 30 | $objectId = spl_object_hash($action['uses']); |
31 | - $this->routesByClosure[$method . $objectId] = $uri; |
|
31 | + $this->routesByClosure[$method.$objectId] = $uri; |
|
32 | 32 | } |
33 | 33 | } |
34 | 34 | } elseif (is_array($routes)) { // Lumen |
35 | 35 | $this->routes = $routes; |
36 | 36 | foreach ($routes as $route) { |
37 | 37 | if (isset($route['action']['uses'])) { // Uses |
38 | - $this->routesByUses[$route['method'] . $route['action']['uses']] = $route['uri']; |
|
38 | + $this->routesByUses[$route['method'].$route['action']['uses']] = $route['uri']; |
|
39 | 39 | } |
40 | 40 | if (isset($route['action'][0]) && $route['action'][0] instanceof Closure) { // Closure |
41 | 41 | $objectId = spl_object_hash($route['action'][0]); |
42 | - $this->routesByClosure[$route['method'] . $objectId] = $route['uri']; |
|
42 | + $this->routesByClosure[$route['method'].$objectId] = $route['uri']; |
|
43 | 43 | } |
44 | 44 | } |
45 | 45 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | { |
83 | 83 | $method = $request->getMethod(); |
84 | 84 | $uri = $request->getPathInfo(); |
85 | - $key = $method . $uri; |
|
85 | + $key = $method.$uri; |
|
86 | 86 | if (isset($this->routes[$key])) { |
87 | 87 | return $uri; |
88 | 88 | } |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | $uri = $route->uri(); |
93 | 93 | } elseif (is_array($route)) { // Lumen |
94 | 94 | if (isset($route[1]['uses'])) { |
95 | - $key = $method . $route[1]['uses']; |
|
95 | + $key = $method.$route[1]['uses']; |
|
96 | 96 | if (isset($this->routesByUses[$key])) { |
97 | 97 | $uri = $this->routesByUses[$key]; |
98 | 98 | } |
99 | 99 | } elseif (isset($route[1][0]) && $route[1][0] instanceof Closure) { |
100 | - $key = $method . spl_object_hash($route[1][0]); |
|
100 | + $key = $method.spl_object_hash($route[1][0]); |
|
101 | 101 | if (isset($this->routesByClosure[$key])) { |
102 | 102 | $uri = $this->routesByClosure[$key]; |
103 | 103 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if ($delay < 0) { |
29 | 29 | throw new \InvalidArgumentException('The delay must be greater than or equal to 0'); |
30 | 30 | } |
31 | - $this->delay = (int)$delay; |
|
31 | + $this->delay = (int) $delay; |
|
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | if ($tries < 1) { |
52 | 52 | throw new \InvalidArgumentException('The number of attempts must be greater than or equal to 1'); |
53 | 53 | } |
54 | - $this->tries = (int)$tries; |
|
54 | + $this->tries = (int) $tries; |
|
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | static $dispatch; |
75 | 75 | if (!$dispatch) { |
76 | - $dispatch = static function ($task) { |
|
76 | + $dispatch = static function($task) { |
|
77 | 77 | /**@var \Swoole\Http\Server $swoole */ |
78 | 78 | $swoole = app('swoole'); |
79 | 79 | // The worker_id of timer process is -1 |
@@ -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 | } |
@@ -314,12 +314,12 @@ discard block |
||
314 | 314 | $checkSwooleCmd = $phpCmd.' --ri swoole'; |
315 | 315 | $checkOpenSwooleCmd = $phpCmd.' --ri openswoole'; |
316 | 316 | // Short-circuit, if Swoole is found Loaded already. If not, check for Open-Swoole as well. |
317 | - if (stripos((string)shell_exec($checkSwooleCmd), 'enabled') === false |
|
318 | - && stripos((string)shell_exec($checkOpenSwooleCmd), 'enabled') === false) { |
|
317 | + if (stripos((string) shell_exec($checkSwooleCmd), 'enabled') === false |
|
318 | + && stripos((string) shell_exec($checkOpenSwooleCmd), 'enabled') === false) { |
|
319 | 319 | $phpCmd .= ' -d "extension=swoole"'; |
320 | 320 | } |
321 | 321 | |
322 | - return trim($phpCmd . ' ' . $subCmd); |
|
322 | + return trim($phpCmd.' '.$subCmd); |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | public static function runArtisanCommand($basePath, $cmd) |
@@ -336,16 +336,16 @@ discard block |
||
336 | 336 | |
337 | 337 | public function getConfig() |
338 | 338 | { |
339 | - return unserialize((string)file_get_contents($this->getConfigPath())); |
|
339 | + return unserialize((string) file_get_contents($this->getConfigPath())); |
|
340 | 340 | } |
341 | 341 | |
342 | 342 | protected function getConfigPath() |
343 | 343 | { |
344 | 344 | $storagePath = getenv('APP_STORAGE_PATH'); |
345 | 345 | if ($storagePath === false) { |
346 | - $storagePath = $this->basePath . '/storage'; |
|
346 | + $storagePath = $this->basePath.'/storage'; |
|
347 | 347 | } |
348 | - return $storagePath . '/laravels.conf'; |
|
348 | + return $storagePath.'/laravels.conf'; |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | public static function runCommand($cmd, $input = null) |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | public static function kill($pid, $sig) |
367 | 367 | { |
368 | 368 | try { |
369 | - return Process::kill((int)$pid, $sig); |
|
369 | + return Process::kill((int) $pid, $sig); |
|
370 | 370 | } catch (\Exception $e) { |
371 | 371 | return false; |
372 | 372 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | $ip = isset($conf['listen_ip']) ? $conf['listen_ip'] : '127.0.0.1'; |
40 | 40 | $port = isset($conf['listen_port']) ? $conf['listen_port'] : 5200; |
41 | - $socketType = isset($conf['socket_type']) ? (int)$conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
41 | + $socketType = isset($conf['socket_type']) ? (int) $conf['socket_type'] : SWOOLE_SOCK_TCP; |
|
42 | 42 | |
43 | 43 | if ($socketType === SWOOLE_SOCK_UNIX_STREAM) { |
44 | 44 | $socketDir = dirname($ip); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | protected function triggerWebSocketEvent($event, array $params) |
102 | 102 | { |
103 | - return $this->callWithCatchException(function () use ($event, $params) { |
|
103 | + return $this->callWithCatchException(function() use ($event, $params) { |
|
104 | 104 | $handler = $this->getWebSocketHandler(); |
105 | 105 | |
106 | 106 | if (method_exists($handler, $event)) { |
@@ -115,19 +115,19 @@ discard block |
||
115 | 115 | protected function bindWebSocketEvents() |
116 | 116 | { |
117 | 117 | if ($this->enableWebSocket) { |
118 | - $this->swoole->on('HandShake', function () { |
|
118 | + $this->swoole->on('HandShake', function() { |
|
119 | 119 | return $this->triggerWebSocketEvent('onHandShake', func_get_args()); |
120 | 120 | }); |
121 | 121 | |
122 | - $this->swoole->on('Open', function () { |
|
122 | + $this->swoole->on('Open', function() { |
|
123 | 123 | $this->triggerWebSocketEvent('onOpen', func_get_args()); |
124 | 124 | }); |
125 | 125 | |
126 | - $this->swoole->on('Message', function () { |
|
126 | + $this->swoole->on('Message', function() { |
|
127 | 127 | $this->triggerWebSocketEvent('onMessage', func_get_args()); |
128 | 128 | }); |
129 | 129 | |
130 | - $this->swoole->on('Close', function (WebSocketServer $server, $fd, $reactorId) { |
|
130 | + $this->swoole->on('Close', function(WebSocketServer $server, $fd, $reactorId) { |
|
131 | 131 | $clientInfo = $server->getClientInfo($fd); |
132 | 132 | if (isset($clientInfo['websocket_status']) && $clientInfo['websocket_status'] === \WEBSOCKET_STATUS_FRAME) { |
133 | 133 | $this->triggerWebSocketEvent('onClose', func_get_args()); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | protected function triggerPortEvent(Port $port, $handlerClass, $event, array $params) |
141 | 141 | { |
142 | - return $this->callWithCatchException(function () use ($port, $handlerClass, $event, $params) { |
|
142 | + return $this->callWithCatchException(function() use ($port, $handlerClass, $event, $params) { |
|
143 | 143 | $handler = $this->getSocketHandler($port, $handlerClass); |
144 | 144 | |
145 | 145 | if (method_exists($handler, $event)) { |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | 'BufferEmpty', |
185 | 185 | ]; |
186 | 186 | foreach ($events as $event) { |
187 | - $port->on($event, function () use ($port, $handlerClass, $event) { |
|
188 | - $this->triggerPortEvent($port, $handlerClass, 'on' . $event, func_get_args()); |
|
187 | + $port->on($event, function() use ($port, $handlerClass, $event) { |
|
188 | + $this->triggerPortEvent($port, $handlerClass, 'on'.$event, func_get_args()); |
|
189 | 189 | }); |
190 | 190 | } |
191 | 191 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | protected function bindSwooleTables() |
226 | 226 | { |
227 | - $tables = isset($this->conf['swoole_tables']) ? (array)$this->conf['swoole_tables'] : []; |
|
227 | + $tables = isset($this->conf['swoole_tables']) ? (array) $this->conf['swoole_tables'] : []; |
|
228 | 228 | foreach ($tables as $name => $table) { |
229 | 229 | $t = new Table($table['size']); |
230 | 230 | foreach ($table['column'] as $column) { |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $headers = [ |
324 | 324 | 'Upgrade' => 'websocket', |
325 | 325 | 'Connection' => 'Upgrade', |
326 | - 'Sec-WebSocket-Accept' => base64_encode(sha1($secKey . '258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true)), |
|
326 | + 'Sec-WebSocket-Accept' => base64_encode(sha1($secKey.'258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true)), |
|
327 | 327 | 'Sec-WebSocket-Version' => '13', |
328 | 328 | ]; |
329 | 329 | |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | throw new \InvalidArgumentException(sprintf('%s must extend the abstract class %s', $listenerClass, Listener::class)); |
371 | 371 | } |
372 | 372 | |
373 | - $result = $this->callWithCatchException(function () use ($listener, $event) { |
|
373 | + $result = $this->callWithCatchException(function() use ($listener, $event) { |
|
374 | 374 | return $listener->handle($event); |
375 | 375 | }, [], $event->getTries()); |
376 | 376 | |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | |
383 | 383 | protected function handleTask(Task $task) |
384 | 384 | { |
385 | - return $this->callWithCatchException(function () use ($task) { |
|
385 | + return $this->callWithCatchException(function() use ($task) { |
|
386 | 386 | $task->handle(); |
387 | 387 | return true; |
388 | 388 | }, [], $task->getTries()); |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | protected function fireEvent($event, $interface, array $arguments) |
392 | 392 | { |
393 | 393 | if (isset($this->conf['event_handlers'][$event])) { |
394 | - $eventHandlers = (array)$this->conf['event_handlers'][$event]; |
|
394 | + $eventHandlers = (array) $this->conf['event_handlers'][$event]; |
|
395 | 395 | foreach ($eventHandlers as $eventHandler) { |
396 | 396 | if (!isset(class_implements($eventHandler)[$interface])) { |
397 | 397 | throw new \InvalidArgumentException(sprintf( |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | ) |
402 | 402 | ); |
403 | 403 | } |
404 | - $this->callWithCatchException(function () use ($eventHandler, $arguments) { |
|
404 | + $this->callWithCatchException(function() use ($eventHandler, $arguments) { |
|
405 | 405 | call_user_func_array([(new $eventHandler), 'handle'], $arguments); |
406 | 406 | }); |
407 | 407 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | public function handle() |
26 | 26 | { |
27 | - $action = (string)$this->argument('action'); |
|
27 | + $action = (string) $this->argument('action'); |
|
28 | 28 | switch ($action) { |
29 | 29 | case 'publish': |
30 | 30 | $this->publish(); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | { |
57 | 57 | // Load configuration laravel.php manually for Lumen |
58 | 58 | $basePath = config('laravels.laravel_base_path') ?: base_path(); |
59 | - if ($this->isLumen() && file_exists($basePath . '/config/laravels.php')) { |
|
59 | + if ($this->isLumen() && file_exists($basePath.'/config/laravels.php')) { |
|
60 | 60 | $this->getLaravel()->configure('laravels'); |
61 | 61 | } |
62 | 62 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $laravelSVersion, |
114 | 114 | ], |
115 | 115 | [ |
116 | - $this->getApplication()->getName() . ' [<info>' . env('APP_ENV', config('app.env')) . '</info>]', |
|
116 | + $this->getApplication()->getName().' [<info>'.env('APP_ENV', config('app.env')).'</info>]', |
|
117 | 117 | $this->getApplication()->getVersion(), |
118 | 118 | ], |
119 | 119 | ]); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | { |
124 | 124 | $this->comment('>>> Protocols'); |
125 | 125 | |
126 | - $config = unserialize((string)file_get_contents($this->getConfigPath())); |
|
126 | + $config = unserialize((string) file_get_contents($this->getConfigPath())); |
|
127 | 127 | $ssl = isset($config['server']['swoole']['ssl_key_file'], $config['server']['swoole']['ssl_cert_file']); |
128 | 128 | $socketType = isset($config['server']['socket_type']) ? $config['server']['socket_type'] : SWOOLE_SOCK_TCP; |
129 | 129 | if (in_array($socketType, [SWOOLE_SOCK_UNIX_DGRAM, SWOOLE_SOCK_UNIX_STREAM])) { |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | continue; |
164 | 164 | } |
165 | 165 | |
166 | - $name = 'Port#' . $key . ' '; |
|
166 | + $name = 'Port#'.$key.' '; |
|
167 | 167 | $name .= isset($socketTypeNames[$socket['type']]) ? $socketTypeNames[$socket['type']] : 'Unknown socket'; |
168 | 168 | $tableRows [] = [ |
169 | 169 | $name, |
@@ -196,8 +196,8 @@ discard block |
||
196 | 196 | $laravelConf = [ |
197 | 197 | 'root_path' => $svrConf['laravel_base_path'], |
198 | 198 | 'static_path' => $svrConf['swoole']['document_root'], |
199 | - 'cleaners' => array_unique((array)Arr::get($svrConf, 'cleaners', [])), |
|
200 | - 'register_providers' => array_unique((array)Arr::get($svrConf, 'register_providers', [])), |
|
199 | + 'cleaners' => array_unique((array) Arr::get($svrConf, 'cleaners', [])), |
|
200 | + 'register_providers' => array_unique((array) Arr::get($svrConf, 'register_providers', [])), |
|
201 | 201 | 'destroy_controllers' => Arr::get($svrConf, 'destroy_controllers', []), |
202 | 202 | 'is_lumen' => $this->isLumen(), |
203 | 203 | '_SERVER' => $_SERVER, |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | $svrConf['laravel_base_path'] = base_path(); |
223 | 223 | } |
224 | 224 | if (empty($svrConf['process_prefix'])) { |
225 | - $svrConf['process_prefix'] = trim(config('app.name', '') . ' ' . $svrConf['laravel_base_path']); |
|
225 | + $svrConf['process_prefix'] = trim(config('app.name', '').' '.$svrConf['laravel_base_path']); |
|
226 | 226 | } |
227 | 227 | if ($this->option('ignore')) { |
228 | 228 | $svrConf['ignore_check_pid'] = true; |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $svrConf['ignore_check_pid'] = false; |
231 | 231 | } |
232 | 232 | if (empty($svrConf['swoole']['document_root'])) { |
233 | - $svrConf['swoole']['document_root'] = $svrConf['laravel_base_path'] . '/public'; |
|
233 | + $svrConf['swoole']['document_root'] = $svrConf['laravel_base_path'].'/public'; |
|
234 | 234 | } |
235 | 235 | if ($this->option('daemonize')) { |
236 | 236 | $svrConf['swoole']['daemonize'] = true; |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | } |
256 | 256 | |
257 | 257 | // Set X-Version |
258 | - $xVersion = (string)$this->option('x-version'); |
|
258 | + $xVersion = (string) $this->option('x-version'); |
|
259 | 259 | if ($xVersion !== '') { |
260 | 260 | $_SERVER['X_VERSION'] = $_ENV['X_VERSION'] = $xVersion; |
261 | 261 | } |
@@ -282,34 +282,34 @@ discard block |
||
282 | 282 | public function publish() |
283 | 283 | { |
284 | 284 | $basePath = config('laravels.laravel_base_path') ?: base_path(); |
285 | - $configPath = $basePath . '/config/laravels.php'; |
|
285 | + $configPath = $basePath.'/config/laravels.php'; |
|
286 | 286 | $todoList = [ |
287 | 287 | [ |
288 | - 'from' => realpath(__DIR__ . '/../../config/laravels.php'), |
|
288 | + 'from' => realpath(__DIR__.'/../../config/laravels.php'), |
|
289 | 289 | 'to' => $configPath, |
290 | 290 | 'mode' => 0644, |
291 | 291 | ], |
292 | 292 | [ |
293 | - 'from' => realpath(__DIR__ . '/../../bin/laravels'), |
|
294 | - 'to' => $basePath . '/bin/laravels', |
|
293 | + 'from' => realpath(__DIR__.'/../../bin/laravels'), |
|
294 | + 'to' => $basePath.'/bin/laravels', |
|
295 | 295 | 'mode' => 0755, |
296 | 296 | 'link' => true, |
297 | 297 | ], |
298 | 298 | [ |
299 | - 'from' => realpath(__DIR__ . '/../../bin/fswatch'), |
|
300 | - 'to' => $basePath . '/bin/fswatch', |
|
299 | + 'from' => realpath(__DIR__.'/../../bin/fswatch'), |
|
300 | + 'to' => $basePath.'/bin/fswatch', |
|
301 | 301 | 'mode' => 0755, |
302 | 302 | 'link' => true, |
303 | 303 | ], |
304 | 304 | [ |
305 | - 'from' => realpath(__DIR__ . '/../../bin/inotify'), |
|
306 | - 'to' => $basePath . '/bin/inotify', |
|
305 | + 'from' => realpath(__DIR__.'/../../bin/inotify'), |
|
306 | + 'to' => $basePath.'/bin/inotify', |
|
307 | 307 | 'mode' => 0755, |
308 | 308 | 'link' => true, |
309 | 309 | ], |
310 | 310 | ]; |
311 | 311 | if (file_exists($configPath)) { |
312 | - $choice = $this->anticipate($configPath . ' already exists, do you want to override it ? Y/N', |
|
312 | + $choice = $this->anticipate($configPath.' already exists, do you want to override it ? Y/N', |
|
313 | 313 | ['Y', 'N'], |
314 | 314 | 'N' |
315 | 315 | ); |