top-think / framework

src/think/App.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -155,13 +155,13 @@ 
      */
     public function __construct(string $rootPath = '')
     {
-        $this->thinkPath   = dirname(__DIR__) . DIRECTORY_SEPARATOR;
-        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
-        $this->appPath     = $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
+        $this->thinkPath   = dirname(__DIR__).DIRECTORY_SEPARATOR;
+        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
+        $this->appPath     = $this->rootPath.'app'.DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
 
-        if (is_file($this->appPath . 'provider.php')) {
-            $this->bind(include $this->appPath . 'provider.php');
+        if (is_file($this->appPath.'provider.php')) {
+            $this->bind(include $this->appPath.'provider.php');
         }
 
         static::setInstance($this);
@@ -221,7 +221,7 @@ 
     public function getService($service)
     {
         $name = is_string($service) ? $service : get_class($service);
-        return array_values(array_filter($this->services, function ($value) use ($name) {
+        return array_values(array_filter($this->services, function($value) use ($name) {
             return $value instanceof $name;
         }, ARRAY_FILTER_USE_BOTH))[0] ?? null;
     }
@@ -297,7 +297,7 @@ 
      */
     public function getBasePath(): string
     {
-        return $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'app'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -355,7 +355,7 @@ 
      */
     public function getConfigPath(): string
     {
-        return $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'config'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -401,8 +401,8 @@ 
         $this->beginMem  = memory_get_usage();
 
         // 加载环境变量
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
+        if (is_file($this->rootPath.'.env')) {
+            $this->env->load($this->rootPath.'.env');
         }
 
         $this->configExt = $this->env->get('config_ext', '.php');
@@ -415,7 +415,7 @@ 
         // 加载框架默认语言包
         $langSet = $this->lang->defaultLangSet();
 
-        $this->lang->load($this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $langSet . '.php');
+        $this->lang->load($this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$langSet.'.php');
 
         // 加载应用默认语言包
         $this->loadLangPack($langSet);
@@ -454,7 +454,7 @@ 
         }
 
         // 加载系统语言包
-        $files = glob($this->appPath . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
+        $files = glob($this->appPath.'lang'.DIRECTORY_SEPARATOR.$langset.'.*');
         $this->lang->load($files);
 
         // 加载扩展（自定义）语言包
@@ -472,7 +472,7 @@ 
      */
     public function boot(): void
     {
-        array_walk($this->services, function ($service) {
+        array_walk($this->services, function($service) {
             $this->bootService($service);
         });
     }
@@ -486,30 +486,30 @@ 
     {
         $appPath = $this->getAppPath();
 
-        if (is_file($appPath . 'common.php')) {
-            include_once $appPath . 'common.php';
+        if (is_file($appPath.'common.php')) {
+            include_once $appPath.'common.php';
         }
 
-        include_once $this->thinkPath . 'helper.php';
+        include_once $this->thinkPath.'helper.php';
 
         $configPath = $this->getConfigPath();
 
         $files = [];
 
         if (is_dir($configPath)) {
-            $files = glob($configPath . '*' . $this->configExt);
+            $files = glob($configPath.'*'.$this->configExt);
         }
 
         foreach ($files as $file) {
             $this->config->load($file, pathinfo($file, PATHINFO_FILENAME));
         }
 
-        if (is_file($appPath . 'event.php')) {
-            $this->loadEvent(include $appPath . 'event.php');
+        if (is_file($appPath.'event.php')) {
+            $this->loadEvent(include $appPath.'event.php');
         }
 
-        if (is_file($appPath . 'service.php')) {
-            $services = include $appPath . 'service.php';
+        if (is_file($appPath.'service.php')) {
+            $services = include $appPath.'service.php';
             foreach ($services as $service) {
                 $this->register($service);
             }
@@ -574,9 +574,9 @@ 
         $name  = str_replace(['/', '.'], '\\', $name);
         $array = explode('\\', $name);
         $class = Str::studly(array_pop($array));
-        $path  = $array ? implode('\\', $array) . '\\' : '';
+        $path  = $array ? implode('\\', $array).'\\' : '';
 
-        return $this->namespace . '\\' . $layer . '\\' . $path . $class;
+        return $this->namespace.'\\'.$layer.'\\'.$path.$class;
     }
 
     /**
@@ -597,7 +597,7 @@ 
     {
         $path = dirname(dirname(dirname(dirname($this->thinkPath))));
 
-        return $path . DIRECTORY_SEPARATOR;
+        return $path.DIRECTORY_SEPARATOR;
     }
 
 }

src/think/console/command/optimize/Route.php

Spacing +7 added lines, -7 removed lines

@@ -29,14 +29,14 @@ 
     {
         $app = $input->getArgument('app');
 
-        if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) {
+        if (empty($app) && !is_dir($this->app->getBasePath().'controller')) {
             $output->writeln('<error>Miss app name!</error>');
             return false;
         }
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -51,21 +51,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
         //触发路由载入完成事件
         $this->app->event->trigger(RouteLoaded::class);
 
-        $content = '<?php ' . PHP_EOL . 'return ';
-        $content .= '\Opis\Closure\unserialize(\'' . \Opis\Closure\serialize($this->app->route->getName()) . '\');';
+        $content = '<?php '.PHP_EOL.'return ';
+        $content .= '\Opis\Closure\unserialize(\''.\Opis\Closure\serialize($this->app->route->getName()).'\');';
         return $content;
     }
 

src/think/middleware/TraceDebug.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 
@@ -60,7 +60,7 @@ 
 
         // 注册日志监听
         if ($debug) {
-            $this->app->event->listen(LogWrite::class, function ($event) {
+            $this->app->event->listen(LogWrite::class, function($event) {
                 if (empty($this->config['channel']) || $this->config['channel'] == $event->channel) {
                     $this->log = array_merge_recursive($this->log, $event->log);
                 }
@@ -98,9 +98,9 @@ 
                 // trace调试信息注入
                 $pos = strripos($content, '</body>');
                 if (false !== $pos) {
-                    $content = substr($content, 0, $pos) . $output . substr($content, $pos);
+                    $content = substr($content, 0, $pos).$output.substr($content, $pos);
                 } else {
-                    $content = $content . $output;
+                    $content = $content.$output;
                 }
             }
         }

src/think/console/Table.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -207,7 +207,7 @@ 
             $array[] = str_repeat($style[1], $width + 2);
         }
 
-        return $style[0] . implode($style[2], $array) . $style[3] . PHP_EOL;
+        return $style[0].implode($style[2], $array).$style[3].PHP_EOL;
     }
 
     /**
@@ -221,11 +221,11 @@ 
         $content = $this->renderSeparator('top');
 
         foreach ($this->header as $key => $header) {
-            $array[] = ' ' . str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign);
+            $array[] = ' '.str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign);
         }
 
         if (!empty($array)) {
-            $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL;
+            $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL;
 
             if (!empty($this->rows)) {
                 $content .= $this->renderSeparator('middle');
@@ -268,12 +268,12 @@ 
                     $content .= $this->renderSeparator('middle');
                 } elseif (is_scalar($row)) {
                     $content .= $this->renderSeparator('cross-top');
-                    $width = 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function ($a, $b) {
+                    $width = 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function($a, $b) {
                         return $a + $b;
                     });
                     $array = str_pad($row, $width);
 
-                    $content .= $style[0] . ' ' . $array . ' ' . $style[3] . PHP_EOL;
+                    $content .= $style[0].' '.$array.' '.$style[3].PHP_EOL;
                     $content .= $this->renderSeparator('cross-bottom');
                 } else {
                     $array = [];
@@ -285,10 +285,10 @@ 
                         if (false !== $encoding = mb_detect_encoding((string) $val, null, true)) {
                             $width += strlen((string) $val) - mb_strwidth((string) $val, $encoding);
                         }
-                        $array[] = ' ' . str_pad((string) $val, $width, ' ', $this->cellAlign);
+                        $array[] = ' '.str_pad((string) $val, $width, ' ', $this->cellAlign);
                     }
 
-                    $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL;
+                    $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL;
                 }
             }
         }

src/think/Db.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -67,7 +67,7 @@ 
     public function getConfig(string $name = '', $default = null)
     {
         if ('' !== $name) {
-            return $this->config->get('database.' . $name, $default);
+            return $this->config->get('database.'.$name, $default);
         }
 
         return $this->config->get('database');
@@ -92,7 +92,7 @@ 
     public function event(string $event, callable $callback): void
     {
         if ($this->event) {
-            $this->event->listen('db.' . $event, $callback);
+            $this->event->listen('db.'.$event, $callback);
         }
     }
 
@@ -107,7 +107,7 @@ 
     public function trigger(string $event, $params = null, bool $once = false)
     {
         if ($this->event) {
-            return $this->event->trigger('db.' . $event, $params, $once);
+            return $this->event->trigger('db.'.$event, $params, $once);
         }
     }
 }

src/think/console/command/ServiceDiscover.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console\command;
 
@@ -26,7 +26,7 @@ 
 
     public function execute(Input $input, Output $output)
     {
-        if (is_file($path = $this->app->getRootPath() . 'vendor/composer/installed.json')) {
+        if (is_file($path = $this->app->getRootPath().'vendor/composer/installed.json')) {
             $packages = json_decode(@file_get_contents($path), true);
 
             $services = [];
@@ -36,11 +36,11 @@ 
                 }
             }
 
-            $header = '// This file is automatically generated at:' . date('Y-m-d H:i:s') . PHP_EOL . 'declare (strict_types = 1);' . PHP_EOL;
+            $header = '// This file is automatically generated at:'.date('Y-m-d H:i:s').PHP_EOL.'declare (strict_types = 1);'.PHP_EOL;
 
-            $content = '<?php ' . PHP_EOL . $header . "return " . var_export($services, true) . ';';
+            $content = '<?php '.PHP_EOL.$header."return ".var_export($services, true).';';
 
-            file_put_contents($this->app->getRootPath() . 'vendor/services.php', $content);
+            file_put_contents($this->app->getRootPath().'vendor/services.php', $content);
 
             $output->writeln('<info>Succeed!</info>');
         }

src/think/initializer/RegisterService.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\initializer;
 
@@ -31,7 +31,7 @@ 
 
     public function init(App $app)
     {
-        $file = $app->getRootPath() . 'vendor/services.php';
+        $file = $app->getRootPath().'vendor/services.php';
 
         $services = $this->services;
 

src/think/log/ChannelSet.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log;
 

src/think/log/driver/Socket.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: luofei614 <weibo.com/luofei614>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -74,9 +74,9 @@ 
         if ($this->config['debug']) {
 
             if (isset($_SERVER['HTTP_HOST'])) {
-                $current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                $current_uri = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
             } else {
-                $current_uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+                $current_uri = 'cmd:'.implode(' ', $_SERVER['argv']);
             }
 
             // 基本信息
@@ -90,7 +90,7 @@ 
         foreach ($log as $type => $val) {
             $trace[] = [
                 'type' => 'groupCollapsed',
-                'msg'  => '[ ' . $type . ' ]',
+                'msg'  => '[ '.$type.' ]',
                 'css'  => isset($this->css[$type]) ? $this->css[$type] : '',
             ];
 
@@ -176,7 +176,7 @@ 
         ];
 
         $msg     = @json_encode($logs);
-        $address = '/' . $client_id; //将client_id作为地址， server端通过地址判断将日志发布给谁
+        $address = '/'.$client_id; //将client_id作为地址， server端通过地址判断将日志发布给谁
 
         $this->send($this->config['host'], $msg, $address);
     }
@@ -249,7 +249,7 @@ 
      */
     protected function send($host, $message = '', $address = '/')
     {
-        $url = 'http://' . $host . ':' . $this->port . $address;
+        $url = 'http://'.$host.':'.$this->port.$address;
         $ch  = curl_init();
 
         curl_setopt($ch, CURLOPT_URL, $url);