hhxsv5 / laravel-s

src/Swoole/Request.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
                 $server[$headerServerMapping[$key]] = $value;
             } else {
                 $key = str_replace('-', '_', $key);
-                $server['http_' . $key] = $value;
+                $server['http_'.$key] = $value;
             }
         }
         $server = array_change_key_case($server, CASE_UPPER);
@@ -65,7 +65,7 @@ 
             && isset($_SERVER['QUERY_STRING'])
             && $_SERVER['QUERY_STRING'] !== ''
         ) {
-            $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+            $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
         }
 
         // Fix argv & argc

src/Swoole/InotifyTrait.php

Spacing +3 added lines, -3 removed lines

@@ -19,17 +19,17 @@
             return false;
         }
 
-        $fileTypes = isset($config['file_types']) ? (array)$config['file_types'] : [];
+        $fileTypes = isset($config['file_types']) ? (array) $config['file_types'] : [];
         if (empty($fileTypes)) {
             $this->warning('No file types to watch by inotify');
             return false;
         }
 
-        $callback = function () use ($config, $laravelConf) {
+        $callback = function() use ($config, $laravelConf) {
             $log = !empty($config['log']);
             $this->setProcessTitle(sprintf('%s laravels: inotify process', $config['process_prefix']));
             $inotify = new Inotify($config['watch_path'], IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVE,
-                function ($event) use ($log, $laravelConf) {
+                function($event) use ($log, $laravelConf) {
                     Portal::runLaravelSCommand($laravelConf['root_path'], 'reload');
                     if ($log) {
                         $action = 'file:';

src/Swoole/Process/CustomProcessTrait.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
 
     public function addCustomProcesses(Server $swoole, $processPrefix, array $processes, array $laravelConfig)
     {
-        $pidfile = dirname($swoole->setting['pid_file']) . '/' . $this->customProcessPidFile;
+        $pidfile = dirname($swoole->setting['pid_file']).'/'.$this->customProcessPidFile;
         if (file_exists($pidfile)) {
             unlink($pidfile);
         }
@@ -26,9 +26,9 @@ 
                 continue;
             }
             $processClass = $item['class'];
-            $restartInterval = isset($item['restart_interval']) ? (int)$item['restart_interval'] : 5;
-            $callback = function (Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) {
-                file_put_contents($pidfile, $worker->pid . "\n", FILE_APPEND | LOCK_EX);
+            $restartInterval = isset($item['restart_interval']) ? (int) $item['restart_interval'] : 5;
+            $callback = function(Process $worker) use ($pidfile, $swoole, $processPrefix, $processClass, $restartInterval, $name, $laravelConfig) {
+                file_put_contents($pidfile, $worker->pid."\n", FILE_APPEND | LOCK_EX);
                 $this->initLaravel($laravelConfig, $swoole);
                 if (!isset(class_implements($processClass)[CustomProcessInterface::class])) {
                     throw new \InvalidArgumentException(
@@ -42,13 +42,13 @@ 
                 /**@var CustomProcessInterface $processClass */
                 $this->setProcessTitle(sprintf('%s laravels: %s process', $processPrefix, $name));
 
-                Process::signal(SIGUSR1, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) {
+                Process::signal(SIGUSR1, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) {
                     $this->info(sprintf('Reloading %s process[PID=%d].', $name, $worker->pid));
                     $processClass::onReload($swoole, $worker);
                 });
 
                 if (method_exists($processClass, 'onStop')) {
-                    Process::signal(SIGTERM, function ($signo) use ($name, $processClass, $worker, $pidfile, $swoole) {
+                    Process::signal(SIGTERM, function($signo) use ($name, $processClass, $worker, $pidfile, $swoole) {
                         $this->info(sprintf('Stopping %s process[PID=%d].', $name, $worker->pid));
                         $processClass::onStop($swoole, $worker);
                     });
@@ -72,7 +72,7 @@ 
                 for ($i = 0; $i < $item['num']; $i++) {
                     $process = $this->makeProcess($callback, $item);
                     $swoole->addProcess($process);
-                    $processList[$name . $i] = $process;
+                    $processList[$name.$i] = $process;
                 }
             } else {  // For single process
                 $process = $this->makeProcess($callback, $item);

src/Components/Apollo/Client.php

Spacing +14 added lines, -14 removed lines

@@ -41,10 +41,10 @@ 
             $this->clientIp = current(swoole_get_local_ip()) ?: gethostname();
         }
         if (isset($settings['pull_timeout'])) {
-            $this->pullTimeout = (int)$settings['pull_timeout'];
+            $this->pullTimeout = (int) $settings['pull_timeout'];
         }
         if (isset($settings['backup_old_env'])) {
-            $this->backupOldEnv = (bool)$settings['backup_old_env'];
+            $this->backupOldEnv = (bool) $settings['backup_old_env'];
         }
     }
 
@@ -73,11 +73,11 @@ 
         $settings = [
             'server'         => getenv('APOLLO_SERVER'),
             'app_id'         => getenv('APOLLO_APP_ID'),
-            'cluster'        => ($cluster = (string)getenv('APOLLO_CLUSTER')) !== '' ? $cluster : null,
-            'namespaces'     => ($namespaces = (string)getenv('APOLLO_NAMESPACES')) !== '' ? explode(',', $namespaces) : null,
-            'client_ip'      => ($clientIp = (string)getenv('APOLLO_CLIENT_IP')) !== '' ? $clientIp : null,
-            'pull_timeout'   => ($pullTimeout = (int)getenv('APOLLO_PULL_TIMEOUT')) > 0 ? $pullTimeout : null,
-            'backup_old_env' => ($backupOldEnv = (bool)getenv('APOLLO_BACKUP_OLD_ENV')) ? $backupOldEnv : null,
+            'cluster'        => ($cluster = (string) getenv('APOLLO_CLUSTER')) !== '' ? $cluster : null,
+            'namespaces'     => ($namespaces = (string) getenv('APOLLO_NAMESPACES')) !== '' ? explode(',', $namespaces) : null,
+            'client_ip'      => ($clientIp = (string) getenv('APOLLO_CLIENT_IP')) !== '' ? $clientIp : null,
+            'pull_timeout'   => ($pullTimeout = (int) getenv('APOLLO_PULL_TIMEOUT')) > 0 ? $pullTimeout : null,
+            'backup_old_env' => ($backupOldEnv = (bool) getenv('APOLLO_BACKUP_OLD_ENV')) ? $backupOldEnv : null,
         ];
         return new static($settings);
     }
@@ -93,8 +93,8 @@ 
             'cluster'        => isset($options['apollo-cluster']) && $options['apollo-cluster'] !== '' ? $options['apollo-cluster'] : null,
             'namespaces'     => !empty($options['apollo-namespaces']) ? $options['apollo-namespaces'] : null,
             'client_ip'      => isset($options['apollo-client-ip']) && $options['apollo-client-ip'] !== '' ? $options['apollo-client-ip'] : null,
-            'pull_timeout'   => isset($options['apollo-pull-timeout']) ? (int)$options['apollo-pull-timeout'] : null,
-            'backup_old_env' => isset($options['apollo-backup-old-env']) ? (bool)$options['apollo-backup-old-env'] : null,
+            'pull_timeout'   => isset($options['apollo-pull-timeout']) ? (int) $options['apollo-pull-timeout'] : null,
+            'backup_old_env' => isset($options['apollo-backup-old-env']) ? (bool) $options['apollo-backup-old-env'] : null,
         ];
         return new static($settings);
     }
@@ -116,7 +116,7 @@ 
         $configs = [];
         $uri = sprintf('%s/configs/%s/%s/', $this->server, $this->appId, $this->cluster);
         foreach ($namespaces as $namespace) {
-            $url = $uri . $namespace . '?' . http_build_query([
+            $url = $uri.$namespace.'?'.http_build_query([
                     'releaseKey' => $withReleaseKey && isset($this->releaseKeys[$namespace]) ? $this->releaseKeys[$namespace] : null,
                     'ip'         => $this->clientIp,
                 ]);
@@ -146,11 +146,11 @@ 
         $all = $this->pullAll(false, $options);
         if (count($all) !== count($this->namespaces)) {
             $lackNamespaces = array_diff($this->namespaces, array_keys($all));
-            throw new \RuntimeException('Missing Apollo configurations for namespaces ' . implode(',', $lackNamespaces));
+            throw new \RuntimeException('Missing Apollo configurations for namespaces '.implode(',', $lackNamespaces));
         }
         $configs = [];
         foreach ($all as $namespace => $config) {
-            $configs[] = '# Namespace: ' . $config['namespaceName'];
+            $configs[] = '# Namespace: '.$config['namespaceName'];
             ksort($config['configurations']);
             foreach ($config['configurations'] as $key => $value) {
                 $configs[] = sprintf('%s=%s', $key, $value);
@@ -160,7 +160,7 @@ 
             throw new \RuntimeException('Empty Apollo configuration list');
         }
         if ($this->backupOldEnv && file_exists($filepath)) {
-            rename($filepath, $filepath . '.' . date('YmdHis'));
+            rename($filepath, $filepath.'.'.date('YmdHis'));
         }
         $fileContent = implode(PHP_EOL, $configs);
         if (Context::inCoroutine()) {
@@ -200,7 +200,7 @@ 
                 if (!empty($this->notifications) && current($this->notifications)['notificationId'] !== -1) { // Ignore the first pull
                     $callback($notifications);
                 }
-                array_walk($notifications, function (&$notification) {
+                array_walk($notifications, function(&$notification) {
                     unset($notification['messages']);
                 });
                 $this->notifications = array_merge($this->notifications, array_column($notifications, null, 'namespaceName'));

src/Components/Prometheus/Exporter.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
                 'value' => $apcSmaInfo['avail_mem'],
             ],
         ];
-        foreach (new \APCuIterator('/^' . $this->config['apcu_key_prefix'] . $this->config['apcu_key_separator'] . '/') as $item) {
+        foreach (new \APCuIterator('/^'.$this->config['apcu_key_prefix'].$this->config['apcu_key_separator'].'/') as $item) {
             $parts = explode($this->config['apcu_key_separator'], $item['key']);
             parse_str($parts[3], $labels);
             if (is_array($item['value'])) {
@@ -62,8 +62,8 @@ 
         $metrics = $this->getMetrics();
         $lines = [];
         foreach ($metrics as $metric) {
-            $lines[] = "# HELP " . $metric['name'] . " {$metric['help']}";
-            $lines[] = "# TYPE " . $metric['name'] . " {$metric['type']}";
+            $lines[] = "# HELP ".$metric['name']." {$metric['help']}";
+            $lines[] = "# TYPE ".$metric['name']." {$metric['type']}";
 
             $metricLabels = isset($metric['labels']) ? $metric['labels'] : [];
             $labels = ['{'];
@@ -73,7 +73,7 @@ 
             }
             $labels[] = '}';
             $labelStr = implode('', $labels);
-            $lines[] = $metric['name'] . "$labelStr {$metric['value']}";
+            $lines[] = $metric['name']."$labelStr {$metric['value']}";
         }
         return implode("\n", $lines);
     }

src/Components/Prometheus/CollectorProcess.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
                 'class'    => static::class,
                 'redirect' => false,
                 'pipe'     => 0,
-                'enable'   => (bool)config('prometheus.enable', true),
+                'enable'   => (bool) config('prometheus.enable', true),
             ],
         ];
     }
@@ -38,7 +38,7 @@ 
         $taskWorkerNum = isset($swoole->setting['task_worker_num']) ? $swoole->setting['task_worker_num'] : 0;
         $totalNum = $workerNum + $taskWorkerNum - 1;
         $workerIds = range(0, $totalNum);
-        $runJob = function () use ($swoole, $workerIds, $processCollector, $swooleStatsCollector, $systemCollector) {
+        $runJob = function() use ($swoole, $workerIds, $processCollector, $swooleStatsCollector, $systemCollector) {
             // Collect the metrics of Swoole stats()
             $swooleStatsCollector->collect();
 

src/Components/Apollo/Process.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
                 'class'    => static::class,
                 'redirect' => false,
                 'pipe'     => 0,
-                'enable'   => (bool)getenv('ENABLE_APOLLO'),
+                'enable'   => (bool) getenv('ENABLE_APOLLO'),
             ],
         ];
     }
@@ -30,11 +30,11 @@ 
     {
         $filename = base_path('.env');
         if (isset($_ENV['_ENV'])) {
-            $filename .= '.' . $_ENV['_ENV'];
+            $filename .= '.'.$_ENV['_ENV'];
         }
 
         self::$apollo = Client::createFromEnv();
-        self::$apollo->startWatchNotification(function (array $notifications) use ($process, $filename) {
+        self::$apollo->startWatchNotification(function(array $notifications) use ($process, $filename) {
             $configs = self::$apollo->pullAllAndSave($filename);
             app('log')->info('[ApolloProcess] Pull all configurations', $configs);
             Portal::runLaravelSCommand(base_path(), 'reload');

src/Components/Prometheus/ServiceProvider.php

Spacing +8 added lines, -8 removed lines

@@ -15,31 +15,31 @@
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/../../../config/prometheus.php' => base_path('config/prometheus.php'),
+            __DIR__.'/../../../config/prometheus.php' => base_path('config/prometheus.php'),
         ]);
     }
 
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__ . '/../../../config/prometheus.php', 'prometheus'
+            __DIR__.'/../../../config/prometheus.php', 'prometheus'
         );
-        $this->app->singleton(RequestMiddleware::class, function ($app) {
+        $this->app->singleton(RequestMiddleware::class, function($app) {
             return new RequestMiddleware($app->make(HttpRequestCollector::class));
         });
-        $this->app->singleton(HttpRequestCollector::class, function ($app) {
+        $this->app->singleton(HttpRequestCollector::class, function($app) {
             return new HttpRequestCollector($app['config']->get('prometheus'));
         });
-        $this->app->singleton(SwooleProcessCollector::class, function ($app) {
+        $this->app->singleton(SwooleProcessCollector::class, function($app) {
             return new SwooleProcessCollector($app['config']->get('prometheus'));
         });
-        $this->app->singleton(SwooleStatsCollector::class, function ($app) {
+        $this->app->singleton(SwooleStatsCollector::class, function($app) {
             return new SwooleStatsCollector($app['config']->get('prometheus'));
         });
-        $this->app->singleton(SystemCollector::class, function ($app) {
+        $this->app->singleton(SystemCollector::class, function($app) {
             return new SystemCollector($app['config']->get('prometheus'));
         });
-        $this->app->singleton(Exporter::class, function ($app) {
+        $this->app->singleton(Exporter::class, function($app) {
             return new Exporter($app['config']->get('prometheus'));
         });
     }

src/Components/Prometheus/Collectors/HttpRequestCollector.php

Spacing +9 added lines, -9 removed lines

@@ -20,26 +20,26 @@ 
         if ($routes instanceof \Illuminate\Routing\RouteCollection) { // Laravel
             foreach ($routes->getRoutes() as $route) {
                 $method = $route->methods()[0];
-                $uri = '/' . ltrim($route->uri(), '/');
-                $this->routes[$method . $uri] = $uri;
+                $uri = '/'.ltrim($route->uri(), '/');
+                $this->routes[$method.$uri] = $uri;
 
                 $action = $route->getAction();
                 if (is_string($action['uses'])) { // Uses
-                    $this->routesByUses[$method . $action['uses']] = $uri;
+                    $this->routesByUses[$method.$action['uses']] = $uri;
                 } elseif ($action['uses'] instanceof Closure) {  // Closure
                     $objectId = spl_object_hash($action['uses']);
-                    $this->routesByClosure[$method . $objectId] = $uri;
+                    $this->routesByClosure[$method.$objectId] = $uri;
                 }
             }
         } elseif (is_array($routes)) { // Lumen
             $this->routes = $routes;
             foreach ($routes as $route) {
                 if (isset($route['action']['uses'])) { // Uses
-                    $this->routesByUses[$route['method'] . $route['action']['uses']] = $route['uri'];
+                    $this->routesByUses[$route['method'].$route['action']['uses']] = $route['uri'];
                 }
                 if (isset($route['action'][0]) && $route['action'][0] instanceof Closure) { // Closure
                     $objectId = spl_object_hash($route['action'][0]);
-                    $this->routesByClosure[$route['method'] . $objectId] = $route['uri'];
+                    $this->routesByClosure[$route['method'].$objectId] = $route['uri'];
                 }
             }
         }
@@ -82,7 +82,7 @@ 
     {
         $method = $request->getMethod();
         $uri = $request->getPathInfo();
-        $key = $method . $uri;
+        $key = $method.$uri;
         if (isset($this->routes[$key])) {
             return $uri;
         }
@@ -92,12 +92,12 @@ 
             $uri = $route->uri();
         } elseif (is_array($route)) { // Lumen
             if (isset($route[1]['uses'])) {
-                $key = $method . $route[1]['uses'];
+                $key = $method.$route[1]['uses'];
                 if (isset($this->routesByUses[$key])) {
                     $uri = $this->routesByUses[$key];
                 }
             } elseif (isset($route[1][0]) && $route[1][0] instanceof Closure) {
-                $key = $method . spl_object_hash($route[1][0]);
+                $key = $method.spl_object_hash($route[1][0]);
                 if (isset($this->routesByClosure[$key])) {
                     $uri = $this->routesByClosure[$key];
                 }