hhxsv5 / laravel-s

src/Swoole/Request.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,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);
@@ -64,7 +64,7 @@ 
             && isset($_SERVER['QUERY_STRING'])
             && strlen($_SERVER['QUERY_STRING']) > 0
         ) {
-            $_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) {
                     $reloadCmd = trim(sprintf('%s -c "%s" %s/bin/laravels reload', PHP_BINARY, php_ini_loaded_file(), $laravelConf['root_path']));
                     Portal::runCommand($reloadCmd);
                     if ($log) {

src/Swoole/Task/BaseTask.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
         if ($delay < 0) {
             throw new \InvalidArgumentException('The delay must be greater than or equal to 0');
         }
-        $this->delay = (int)$delay;
+        $this->delay = (int) $delay;
         return $this;
     }
 
@@ -51,7 +51,7 @@ 
         if ($tries < 1) {
             throw new \InvalidArgumentException('The number of attempts must be greater than or equal to 1');
         }
-        $this->tries = (int)$tries;
+        $this->tries = (int) $tries;
         return $this;
     }
 
@@ -71,19 +71,19 @@ 
      */
     protected function task($task)
     {
-        $deliver = function () use ($task) {
+        $deliver = function() use ($task) {
             /**@var \Swoole\Http\Server $swoole */
             $swoole = app('swoole');
             // The worker_id of timer process is -1
             if ($swoole->worker_id === -1 || $swoole->taskworker) {
-                $taskWorkerNum = isset($swoole->setting['task_worker_num']) ? (int)$swoole->setting['task_worker_num'] : 0;
+                $taskWorkerNum = isset($swoole->setting['task_worker_num']) ? (int) $swoole->setting['task_worker_num'] : 0;
                 if ($taskWorkerNum < 2) {
                     throw new \InvalidArgumentException('LaravelS: async task needs to set task_worker_num >= 2');
                 }
                 $workerNum = isset($swoole->setting['worker_num']) ? $swoole->setting['worker_num'] : 0;
                 $totalNum = $workerNum + $taskWorkerNum;
 
-                $getAvailableId = function ($startId, $endId, $excludeId) {
+                $getAvailableId = function($startId, $endId, $excludeId) {
                     $ids = range($startId, $endId);
                     $ids = array_flip($ids);
                     unset($ids[$excludeId]);

src/LaravelS.php

Spacing +3 added lines, -3 removed lines

@@ -76,13 +76,13 @@
         parent::bindWebSocketEvent();
 
         if ($this->enableWebSocket) {
-            $eventHandler = function ($method, array $params) {
-                $this->callWithCatchException(function () use ($method, $params) {
+            $eventHandler = function($method, array $params) {
+                $this->callWithCatchException(function() use ($method, $params) {
                     call_user_func_array([$this->getWebSocketHandler(), $method], $params);
                 });
             };
 
-            $this->swoole->on('Open', function (WebSocketServer $server, SwooleRequest $request) use ($eventHandler) {
+            $this->swoole->on('Open', function(WebSocketServer $server, SwooleRequest $request) use ($eventHandler) {
                 // Start Laravel's lifetime, then support session ...middleware.
                 $laravelRequest = $this->convertRequest($this->laravel, $request);
                 $this->laravel->bindRequest($laravelRequest);

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);
         }
@@ -29,9 +29,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(
@@ -45,13 +45,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);
                     });
@@ -59,7 +59,7 @@ 
 
                 $coroutineAvailable = class_exists('Swoole\Coroutine');
                 $coroutineRuntimeAvailable = class_exists('Swoole\Runtime');
-                $runProcess = function () use ($name, $processClass, $restartInterval, $swoole, $worker, $coroutineAvailable, $coroutineRuntimeAvailable) {
+                $runProcess = function() use ($name, $processClass, $restartInterval, $swoole, $worker, $coroutineAvailable, $coroutineRuntimeAvailable) {
                     $coroutineRuntimeAvailable && \Swoole\Runtime::enableCoroutine();
                     $this->callWithCatchException([$processClass, 'callback'], [$swoole, $worker]);
                     // Avoid frequent process creation

src/Components/Apollo/Process.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
                 'class'    => self::class,
                 'redirect' => false,
                 'pipe'     => 0,
-                'enable'   => (bool)getenv('ENABLE_APOLLO'),
+                'enable'   => (bool) getenv('ENABLE_APOLLO'),
             ],
         ];
     }
@@ -29,11 +29,11 @@ 
     {
         $filename = base_path('.env');
         if (isset($_ENV['LARAVEL_ENV'])) {
-            $filename .= '.' . $_ENV['LARAVEL_ENV'];
+            $filename .= '.'.$_ENV['LARAVEL_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);
             $process->exec(PHP_BINARY, [base_path('bin/laravels'), 'reload']);

src/Swoole/Timer/TimerTrait.php

Spacing +7 added lines, -7 removed lines

@@ -24,8 +24,8 @@ 
             $config['jobs'][] = CheckGlobalTimerAliveCronJob::class;
         }
 
-        $callback = function (Process $process) use ($swoole, $config, $laravelConfig) {
-            $pidfile = dirname($swoole->setting['pid_file']) . '/' . $this->timerPidFile;
+        $callback = function(Process $process) use ($swoole, $config, $laravelConfig) {
+            $pidfile = dirname($swoole->setting['pid_file']).'/'.$this->timerPidFile;
             file_put_contents($pidfile, $process->pid);
             $this->setProcessTitle(sprintf('%s laravels: timer process', $config['process_prefix']));
             $this->initLaravel($laravelConfig, $swoole);
@@ -39,13 +39,13 @@ 
 
             $timerIds = $this->registerTimers($config['jobs']);
 
-            Process::signal(SIGUSR1, function ($signo) use ($config, $timerIds, $process) {
+            Process::signal(SIGUSR1, function($signo) use ($config, $timerIds, $process) {
                 foreach ($timerIds as $timerId) {
                     if (Timer::exists($timerId)) {
                         Timer::clear($timerId);
                     }
                 }
-                Timer::after($config['max_wait_time'] * 1000, function () use ($process) {
+                Timer::after($config['max_wait_time'] * 1000, function() use ($process) {
                     $process->exit(0);
                 });
             });
@@ -76,9 +76,9 @@ 
             if (empty($job->interval())) {
                 throw new \InvalidArgumentException(sprintf('The interval of %s cannot be empty', get_class($job)));
             }
-            $runJob = function () use ($job) {
-                $runCallback = function () use ($job) {
-                    $this->callWithCatchException(function () use ($job) {
+            $runJob = function() use ($job) {
+                $runCallback = function() use ($job) {
+                    $this->callWithCatchException(function() use ($job) {
                         if (($job instanceof CheckGlobalTimerAliveCronJob) || $job::isEnable()) {
                             $job->run();
                         }

src/Illuminate/LaravelSCommand.php

Spacing +18 added lines, -18 removed lines

@@ -21,7 +21,7 @@ 
 
     public function handle()
     {
-        $action = (string)$this->argument('action');
+        $action = (string) $this->argument('action');
         switch ($action) {
             case 'publish':
                 $this->publish();
@@ -53,7 +53,7 @@ 
     {
         // Load configuration laravel.php manually for Lumen
         $basePath = config('laravels.laravel_base_path') ?: base_path();
-        if ($this->isLumen() && file_exists($basePath . '/config/laravels.php')) {
+        if ($this->isLumen() && file_exists($basePath.'/config/laravels.php')) {
             $this->getLaravel()->configure('laravels');
         }
     }
@@ -109,7 +109,7 @@ 
                 $laravelSVersion,
             ],
             [
-                $this->getApplication()->getName() . ' [<info>' . env('APP_ENV', config('app.env')) . '</info>]',
+                $this->getApplication()->getName().' [<info>'.env('APP_ENV', config('app.env')).'</info>]',
                 $this->getApplication()->getVersion(),
             ],
         ]);
@@ -119,7 +119,7 @@ 
     {
         $this->comment('>>> Protocols');
 
-        $config = unserialize((string)file_get_contents($this->getConfPath()));
+        $config = unserialize((string) file_get_contents($this->getConfPath()));
         $socketType = isset($config['server']['socket_type']) ? $config['server']['socket_type'] : SWOOLE_SOCK_TCP;
         if (in_array($socketType, [SWOOLE_SOCK_UNIX_DGRAM, SWOOLE_SOCK_UNIX_STREAM])) {
             $listenAt = $config['server']['listen_ip'];
@@ -158,7 +158,7 @@ 
                 continue;
             }
 
-            $name = 'Port#' . $key . ' ';
+            $name = 'Port#'.$key.' ';
             $name .= isset($socketTypeNames[$socket['type']]) ? $socketTypeNames[$socket['type']] : 'Unknown socket';
             $tableRows [] = [
                 $name,
@@ -186,8 +186,8 @@ 
         $laravelConf = [
             'root_path'           => $svrConf['laravel_base_path'],
             'static_path'         => $svrConf['swoole']['document_root'],
-            'cleaners'            => array_unique((array)Arr::get($svrConf, 'cleaners', [])),
-            'register_providers'  => array_unique((array)Arr::get($svrConf, 'register_providers', [])),
+            'cleaners'            => array_unique((array) Arr::get($svrConf, 'cleaners', [])),
+            'register_providers'  => array_unique((array) Arr::get($svrConf, 'register_providers', [])),
             'destroy_controllers' => Arr::get($svrConf, 'destroy_controllers', []),
             'is_lumen'            => $this->isLumen(),
             '_SERVER'             => $_SERVER,
@@ -220,7 +220,7 @@ 
             $svrConf['ignore_check_pid'] = false;
         }
         if (empty($svrConf['swoole']['document_root'])) {
-            $svrConf['swoole']['document_root'] = $svrConf['laravel_base_path'] . '/public';
+            $svrConf['swoole']['document_root'] = $svrConf['laravel_base_path'].'/public';
         }
         if ($this->option('daemonize')) {
             $svrConf['swoole']['daemonize'] = true;
@@ -235,7 +235,7 @@ 
         }
 
         // Set X-Version
-        $xVersion = (string)$this->option('x-version');
+        $xVersion = (string) $this->option('x-version');
         if ($xVersion !== '') {
             $_SERVER['X_VERSION'] = $_ENV['X_VERSION'] = $xVersion;
         }
@@ -262,34 +262,34 @@ 
     public function publish()
     {
         $basePath = config('laravels.laravel_base_path') ?: base_path();
-        $configPath = $basePath . '/config/laravels.php';
+        $configPath = $basePath.'/config/laravels.php';
         $todoList = [
             [
-                'from' => realpath(__DIR__ . '/../../config/laravels.php'),
+                'from' => realpath(__DIR__.'/../../config/laravels.php'),
                 'to'   => $configPath,
                 'mode' => 0644,
             ],
             [
-                'from' => realpath(__DIR__ . '/../../bin/laravels'),
-                'to'   => $basePath . '/bin/laravels',
+                'from' => realpath(__DIR__.'/../../bin/laravels'),
+                'to'   => $basePath.'/bin/laravels',
                 'mode' => 0755,
                 'link' => true,
             ],
             [
-                'from' => realpath(__DIR__ . '/../../bin/fswatch'),
-                'to'   => $basePath . '/bin/fswatch',
+                'from' => realpath(__DIR__.'/../../bin/fswatch'),
+                'to'   => $basePath.'/bin/fswatch',
                 'mode' => 0755,
                 'link' => true,
             ],
             [
-                'from' => realpath(__DIR__ . '/../../bin/inotify'),
-                'to'   => $basePath . '/bin/inotify',
+                'from' => realpath(__DIR__.'/../../bin/inotify'),
+                'to'   => $basePath.'/bin/inotify',
                 'mode' => 0755,
                 'link' => true,
             ],
         ];
         if (file_exists($configPath)) {
-            $choice = $this->anticipate($configPath . ' already exists, do you want to override it ? Y/N',
+            $choice = $this->anticipate($configPath.' already exists, do you want to override it ? Y/N',
                 ['Y', 'N'],
                 'N'
             );

src/Console/Portal.php

Spacing +13 added lines, -13 removed lines

@@ -131,9 +131,9 @@ 
             if ($value === false) {
                 continue;
             }
-            $passOptionStr .= sprintf('--%s%s ', $key, is_bool($value) ? '' : ('=' . $value));
+            $passOptionStr .= sprintf('--%s%s ', $key, is_bool($value) ? '' : ('='.$value));
         }
-        $statusCode = $this->runArtisanCommand(trim('laravels config ' . $passOptionStr));
+        $statusCode = $this->runArtisanCommand(trim('laravels config '.$passOptionStr));
         if ($statusCode !== 0) {
             return $statusCode;
         }
@@ -142,7 +142,7 @@ 
         $config = $this->getConfig();
 
         if (!$config['server']['ignore_check_pid'] && file_exists($config['server']['swoole']['pid_file'])) {
-            $pid = (int)file_get_contents($config['server']['swoole']['pid_file']);
+            $pid = (int) file_get_contents($config['server']['swoole']['pid_file']);
             if ($pid > 0 && self::kill($pid, 0)) {
                 $this->warning(sprintf('Swoole[PID=%d] is already running.', $pid));
                 return 1;
@@ -188,8 +188,8 @@ 
                 $basePath = dirname($pidFile);
                 $deleteFiles = [
                     $pidFile,
-                    $basePath . '/laravels-custom-processes.pid',
-                    $basePath . '/laravels-timer-process.pid',
+                    $basePath.'/laravels-custom-processes.pid',
+                    $basePath.'/laravels-timer-process.pid',
                 ];
                 foreach ($deleteFiles as $deleteFile) {
                     if (file_exists($deleteFile)) {
@@ -239,9 +239,9 @@ 
         }
 
         // Reload custom processes
-        $pidFile = dirname($pidFile) . '/laravels-custom-processes.pid';
+        $pidFile = dirname($pidFile).'/laravels-custom-processes.pid';
         if (file_exists($pidFile)) {
-            $pids = (array)explode("\n", trim(file_get_contents($pidFile)));
+            $pids = (array) explode("\n", trim(file_get_contents($pidFile)));
             unlink($pidFile);
             foreach ($pids as $pid) {
                 if (!$pid || !self::kill($pid, 0)) {
@@ -259,7 +259,7 @@ 
 
         // Reload timer process
         if (!empty($config['server']['timer']['enable']) && !empty($config['server']['timer']['jobs'])) {
-            $pidFile = dirname($pidFile) . '/laravels-timer-process.pid';
+            $pidFile = dirname($pidFile).'/laravels-timer-process.pid';
             $pid = file_get_contents($pidFile);
             if (!$pid || !self::kill($pid, 0)) {
                 $this->error("Timer process[PID={$pid}] does not exist, or permission denied.");
@@ -283,9 +283,9 @@ 
     public function loadApollo(array $options)
     {
         Client::putCommandOptionsToEnv($options);
-        $envFile = $this->basePath . '/.env';
+        $envFile = $this->basePath.'/.env';
         if (isset($options['env'])) {
-            $envFile .= '.' . $options['env'];
+            $envFile .= '.'.$options['env'];
         }
         Client::createFromCommandOptions($options)->pullAllAndSave($envFile);
     }
@@ -306,12 +306,12 @@ 
 
     public function getConfig()
     {
-        return unserialize((string)file_get_contents($this->getConfPath()));
+        return unserialize((string) file_get_contents($this->getConfPath()));
     }
 
     protected function getConfPath()
     {
-        return $this->basePath . '/storage/laravels.conf';
+        return $this->basePath.'/storage/laravels.conf';
     }
 
     public static function runCommand($cmd, $input = null)
@@ -332,7 +332,7 @@ 
     public static function kill($pid, $sig)
     {
         try {
-            return Process::kill((int)$pid, $sig);
+            return Process::kill((int) $pid, $sig);
         } catch (\Exception $e) {
             return false;
         }