hhxsv5 / laravel-s

src/Illuminate/LaravelSCommand.php

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
 
     public function handle()
     {
-        $action = (string)$this->argument('action');
+        $action = (string) $this->argument('action');
         switch ($action) {
             case 'publish':
                 $this->publish();
@@ -56,7 +56,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');
         }
     }
@@ -113,7 +113,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(),
             ],
         ]);
@@ -123,7 +123,7 @@ 
     {
         $this->comment('>>> Protocols');
 
-        $config = unserialize((string)file_get_contents($this->getConfigPath()));
+        $config = unserialize((string) file_get_contents($this->getConfigPath()));
         $ssl = isset($config['server']['swoole']['ssl_key_file'], $config['server']['swoole']['ssl_cert_file']);
         $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])) {
@@ -163,7 +163,7 @@ 
                 continue;
             }
 
-            $name = 'Port#' . $key . ' ';
+            $name = 'Port#'.$key.' ';
             $name .= isset($socketTypeNames[$socket['type']]) ? $socketTypeNames[$socket['type']] : 'Unknown socket';
             $tableRows [] = [
                 $name,
@@ -196,8 +196,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,
@@ -222,7 +222,7 @@ 
             $svrConf['laravel_base_path'] = base_path();
         }
         if (empty($svrConf['process_prefix'])) {
-            $svrConf['process_prefix'] = trim(config('app.name', '') . ' ' . $svrConf['laravel_base_path']);
+            $svrConf['process_prefix'] = trim(config('app.name', '').' '.$svrConf['laravel_base_path']);
         }
         if ($this->option('ignore')) {
             $svrConf['ignore_check_pid'] = true;
@@ -230,7 +230,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;
@@ -255,7 +255,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;
         }
@@ -282,34 +282,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/Swoole/Timer/CronJob.php

Spacing +5 added lines, -5 removed lines

@@ -92,7 +92,7 @@ 
 
     public static function getGlobalTimerCacheKey()
     {
-        return 'laravels:timer:' . strtolower(self::$globalTimerLockKey);
+        return 'laravels:timer:'.strtolower(self::$globalTimerLockKey);
     }
 
     public static function getGlobalTimerLock()
@@ -105,7 +105,7 @@ 
         $expire = self::GLOBAL_TIMER_LOCK_SECONDS;
         $result = $redis->set($key, $value, 'ex', $expire, 'nx');
         // Compatible with Predis and PhpRedis
-        return $result === true || ((string)$result === 'OK');
+        return $result === true || ((string) $result === 'OK');
     }
 
     protected static function getCurrentInstanceId()
@@ -117,7 +117,7 @@ 
     {
         /**@var \Redis|\RedisCluster|\Predis\Client $redis */
         $redis = app('redis')->client(); // Fix: Redis exists() always returns false on cluster mode for some older versions of Laravel/Lumen, see https://github.com/illuminate/redis/commit/62ff6a06a9c91902d3baa7feda20bab5e807606f
-        return (bool)$redis->exists(self::getGlobalTimerCacheKey());
+        return (bool) $redis->exists(self::getGlobalTimerCacheKey());
     }
 
     public static function isCurrentTimerAlive()
@@ -133,7 +133,7 @@ 
     {
         /**@var \Illuminate\Redis\RedisManager $redis */
         $redis = app('redis');
-        return (bool)$redis->expire(self::getGlobalTimerCacheKey(), $expire);
+        return (bool) $redis->expire(self::getGlobalTimerCacheKey(), $expire);
     }
 
     public static function setGlobalTimerLockKey($lockKey)
@@ -154,7 +154,7 @@ 
 
     public static function setEnable($enable)
     {
-        self::$enable = (bool)$enable;
+        self::$enable = (bool) $enable;
     }
 
     public static function isEnable()

src/Illuminate/Laravel.php

Spacing +12 added lines, -12 removed lines

@@ -82,7 +82,7 @@ 
         self::autoload($this->conf['root_path']);
 
         // Make kernel for Laravel
-        $app = require $this->conf['root_path'] . '/bootstrap/app.php';
+        $app = require $this->conf['root_path'].'/bootstrap/app.php';
         $kernel = $this->conf['is_lumen'] ? null : $app->make(HttpKernel::class);
 
         // Boot
@@ -102,14 +102,14 @@ 
     {
         $cfgPaths = [
             // Framework default configuration
-            $this->conf['root_path'] . '/vendor/laravel/lumen-framework/config/',
+            $this->conf['root_path'].'/vendor/laravel/lumen-framework/config/',
             // App configuration
-            $this->conf['root_path'] . '/config/',
+            $this->conf['root_path'].'/config/',
         ];
 
         $keys = [];
         foreach ($cfgPaths as $cfgPath) {
-            $configs = (array)glob($cfgPath . '*.php');
+            $configs = (array) glob($cfgPath.'*.php');
             foreach ($configs as $config) {
                 $config = substr(basename($config), 0, -4);
                 $keys[$config] = $config;
@@ -123,11 +123,11 @@ 
 
     public static function autoload($rootPath)
     {
-        $autoload = $rootPath . '/bootstrap/autoload.php';
+        $autoload = $rootPath.'/bootstrap/autoload.php';
         if (file_exists($autoload)) {
             require_once $autoload;
         } else {
-            require_once $rootPath . '/vendor/autoload.php';
+            require_once $rootPath.'/vendor/autoload.php';
         }
     }
 
@@ -156,7 +156,7 @@ 
         }
 
         // prefer content in response, secondly ob
-        if (!($response instanceof StreamedResponse) && (string)$content === '' && ob_get_length() > 0) {
+        if (!($response instanceof StreamedResponse) && (string) $content === '' && ob_get_length() > 0) {
             $response->setContent(ob_get_contents());
         }
 
@@ -168,12 +168,12 @@ 
     public function handleStatic(IlluminateRequest $request)
     {
         $uri = $request->getRequestUri();
-        $uri = (string)str_replace("\0", '', urldecode($uri));
+        $uri = (string) str_replace("\0", '', urldecode($uri));
         if (isset(self::$staticBlackList[$uri]) || strpos($uri, '/..') !== false) {
             return false;
         }
 
-        $requestFile = $this->conf['static_path'] . $uri;
+        $requestFile = $this->conf['static_path'].$uri;
         if (is_file($requestFile)) {
             return $this->createStaticResponse($requestFile, $request);
         }
@@ -189,9 +189,9 @@ 
 
     protected function lookupIndex($folder)
     {
-        $folder = rtrim($folder, '/') . '/';
+        $folder = rtrim($folder, '/').'/';
         foreach (self::$staticIndexList as $index) {
-            $tmpFile = $folder . $index;
+            $tmpFile = $folder.$index;
             if (is_file($tmpFile)) {
                 return $tmpFile;
             }
@@ -232,7 +232,7 @@ 
 
     public function bindSwoole($swoole)
     {
-        $this->currentApp->singleton('swoole', function () use ($swoole) {
+        $this->currentApp->singleton('swoole', function() use ($swoole) {
             return $swoole;
         });
     }

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) {
                 $key = preg_replace('/[^a-zA-Z0-9_.]/', '_', $key);
@@ -161,7 +161,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()) {
@@ -201,7 +201,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/Console/Portal.php

Spacing +19 added lines, -19 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 = self::runArtisanCommand($this->basePath, trim('laravels config ' . $passOptionStr));
+        $statusCode = self::runArtisanCommand($this->basePath, 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;
@@ -194,8 +194,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)) {
@@ -237,9 +237,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)) {
@@ -257,7 +257,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.");
@@ -281,9 +281,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);
     }
@@ -311,15 +311,15 @@ 
             $phpCmd = sprintf('%s -c "%s"', PHP_BINARY, $iniFile);
         }
 
-        $checkSwooleCmd = $phpCmd . ' --ri swoole';
-        $checkOpenSwooleCmd = $phpCmd . ' --ri openswoole';
+        $checkSwooleCmd = $phpCmd.' --ri swoole';
+        $checkOpenSwooleCmd = $phpCmd.' --ri openswoole';
         // Short-circuit, if Swoole is found Loaded already. If not, check for Open-Swoole as well.
-        if (stripos((string)shell_exec($checkSwooleCmd), 'enabled') === false
-            && stripos((string)shell_exec($checkOpenSwooleCmd), 'enabled') === false) {
+        if (stripos((string) shell_exec($checkSwooleCmd), 'enabled') === false
+            && stripos((string) shell_exec($checkOpenSwooleCmd), 'enabled') === false) {
             $phpCmd .= ' -d "extension=swoole"';
         }
 
-        return trim($phpCmd . ' ' . $subCmd);
+        return trim($phpCmd.' '.$subCmd);
     }
 
     public static function runArtisanCommand($basePath, $cmd)
@@ -336,16 +336,16 @@ 
 
     public function getConfig()
     {
-        return unserialize((string)file_get_contents($this->getConfigPath()));
+        return unserialize((string) file_get_contents($this->getConfigPath()));
     }
 
     protected function getConfigPath()
     {
         $storagePath = getenv('APP_STORAGE_PATH');
         if ($storagePath === false) {
-            $storagePath = $this->basePath . '/storage';
+            $storagePath = $this->basePath.'/storage';
         }
-        return $storagePath . '/laravels.conf';
+        return $storagePath.'/laravels.conf';
     }
 
     public static function runCommand($cmd, $input = null)
@@ -366,7 +366,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;
         }