top-think / framework

src/think/exception/Handle.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\exception;
 
@@ -72,12 +72,12 @@ 
             }
 
             if ($this->app->config->get('log.record_trace')) {
-                $log .= PHP_EOL . $exception->getTraceAsString();
+                $log .= PHP_EOL.$exception->getTraceAsString();
             }
 
             try {
                 $this->app->log->record($log, 'error');
-            } catch (Exception $e){}
+            } catch (Exception $e) {}
         }
     }
 
@@ -223,7 +223,7 @@ 
         ob_start();
         $data = $this->convertExceptionToArray($exception);
         extract($data);
-        include $this->app->config->get('app.exception_tmpl') ?: __DIR__ . '/../../tpl/think_exception.tpl';
+        include $this->app->config->get('app.exception_tmpl') ?: __DIR__.'/../../tpl/think_exception.tpl';
 
         return ob_get_clean();
     }
@@ -265,10 +265,10 @@ 
 
         if (strpos($message, ':')) {
             $name    = strstr($message, ':', true);
-            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+            $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message;
         } elseif (strpos($message, ',')) {
             $name    = strstr($message, ',', true);
-            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+            $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message;
         } elseif ($lang->has($message)) {
             $message = $lang->get($message);
         }

src/think/route/dispatch/Controller.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route\dispatch;
 
@@ -53,7 +53,7 @@ 
 
         if (strpos($controller, '.')) {
             $pos              = strrpos($controller, '.');
-            $this->controller = substr($controller, 0, $pos) . '.' . Str::studly(substr($controller, $pos + 1));
+            $this->controller = substr($controller, 0, $pos).'.'.Str::studly(substr($controller, $pos + 1));
         } else {
             $this->controller = Str::studly($controller);
         }
@@ -73,7 +73,7 @@ 
             // 实例化控制器
             $instance = $this->controller($this->controller);
         } catch (ClassNotFoundException $e) {
-            throw new HttpException(404, 'controller not exists:' . $e->getClass());
+            throw new HttpException(404, 'controller not exists:'.$e->getClass());
         }
 
         // 注册控制器中间件
@@ -81,10 +81,10 @@ 
 
         return $this->app->middleware->pipeline('controller')
             ->send($this->request)
-            ->then(function () use ($instance) {
+            ->then(function() use ($instance) {
                 // 获取当前操作名
                 $suffix = $this->rule->config('action_suffix');
-                $action = $this->actionName . $suffix;
+                $action = $this->actionName.$suffix;
 
                 if (is_callable([$instance, $action])) {
                     $vars = $this->request->param();
@@ -104,7 +104,7 @@ 
                     }
                 } else {
                     // 操作不存在
-                    throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
+                    throw new HttpException(404, 'method not exists:'.get_class($instance).'->'.$action.'()');
                 }
 
                 $data = $this->app->invokeReflectMethod($instance, $reflect, $vars);
@@ -131,11 +131,11 @@ 
 
             foreach ($middlewares as $key => $val) {
                 if (!is_int($key)) {
-                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function ($item) {
+                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function($item) {
                         return strtolower($item);
                     }, is_string($val['only']) ? explode(",", $val['only']) : $val['only']))) {
                         continue;
-                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function ($item) {
+                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function($item) {
                         return strtolower($item);
                     }, is_string($val['except']) ? explode(',', $val['except']) : $val['except']))) {
                         continue;
@@ -167,14 +167,14 @@ 
         $controllerLayer = $this->rule->config('controller_layer') ?: 'controller';
         $emptyController = $this->rule->config('empty_controller') ?: 'Error';
 
-        $class = $this->app->parseClass($controllerLayer, $name . $suffix);
+        $class = $this->app->parseClass($controllerLayer, $name.$suffix);
 
         if (class_exists($class)) {
             return $this->app->make($class, [], true);
-        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController . $suffix))) {
+        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController.$suffix))) {
             return $this->app->make($emptyClass, [], true);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 }

src/think/Middleware.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: Slince <taosikai@yeah.net>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -133,8 +133,8 @@ 
     public function pipeline(string $type = 'global')
     {
         return (new Pipeline())
-            ->through(array_map(function ($middleware) {
-                return function ($request, $next) use ($middleware) {
+            ->through(array_map(function($middleware) {
+                return function($request, $next) use ($middleware) {
                     [$call, $params] = $middleware;
                     if (is_array($call) && is_string($call[0])) {
                         $call = [$this->app->make($call[0]), $call[1]];
@@ -229,7 +229,7 @@ 
     protected function sortMiddleware(array $middlewares)
     {
         $priority = $this->app->config->get('middleware.priority', []);
-        uasort($middlewares, function ($a, $b) use ($priority) {
+        uasort($middlewares, function($a, $b) use ($priority) {
             $aPriority = $this->getMiddlewarePriority($priority, $a);
             $bPriority = $this->getMiddlewarePriority($priority, $b);
             return $bPriority - $aPriority;

src/think/session/Store.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
      */
     public function setId($id = null): void
     {
-        $this->id = is_string($id) && strlen($id) === 32 && ctype_alnum($id) ? $id : md5(microtime(true) . session_create_id());
+        $this->id = is_string($id) && strlen($id) === 32 && ctype_alnum($id) ? $id : md5(microtime(true).session_create_id());
     }
 
     /**

src/think/log/driver/Socket.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: luofei614 <weibo.com/luofei614>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -92,7 +92,7 @@ 
             if ($this->app->exists('request')) {
                 $currentUri = $this->app->request->url(true);
             } else {
-                $currentUri = 'cmd:' . implode(' ', $_SERVER['argv'] ?? []);
+                $currentUri = 'cmd:'.implode(' ', $_SERVER['argv'] ?? []);
             }
 
             if (!empty($this->config['format_head'])) {
@@ -116,7 +116,7 @@ 
         foreach ($log as $type => $val) {
             $trace[] = [
                 'type' => isset($expandLevel[$type]) ? 'group' : 'groupCollapsed',
-                'msg'  => '[ ' . $type . ' ]',
+                'msg'  => '[ '.$type.' ]',
                 'css'  => $this->css[$type] ?? '',
             ];
 
@@ -202,7 +202,7 @@ 
         ];
 
         $msg     = json_encode($logs, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PARTIAL_OUTPUT_ON_ERROR);
-        $address = '/' . $clientId; //将client_id作为地址， server端通过地址判断将日志发布给谁
+        $address = '/'.$clientId; //将client_id作为地址， server端通过地址判断将日志发布给谁
 
         $this->send($this->config['host'], $this->config['port'], $msg, $address);
     }
@@ -285,7 +285,7 @@ 
      */
     protected function send($host, $port, $message = '', $address = '/')
     {
-        $url = 'http://' . $host . ':' . $port . $address;
+        $url = 'http://'.$host.':'.$port.$address;
         $ch  = curl_init();
 
         curl_setopt($ch, CURLOPT_URL, $url);

src/think/response/File.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\response;
 
@@ -41,7 +41,7 @@ 
     protected function output($data)
     {
         if (!$this->isContent && !is_file($data)) {
-            throw new Exception('file not exists:' . $data);
+            throw new Exception('file not exists:'.$data);
         }
 
         ob_end_clean();
@@ -62,13 +62,13 @@ 
 
         $this->header['Pragma']                    = 'public';
         $this->header['Content-Type']              = $mimeType ?: 'application/octet-stream';
-        $this->header['Cache-control']             = 'max-age=' . $this->expire;
-        $this->header['Content-Disposition']       = ($this->isForceDownload ? 'attachment; ' : '') . 'filename="' . $name . '"';
+        $this->header['Cache-control']             = 'max-age='.$this->expire;
+        $this->header['Content-Disposition']       = ($this->isForceDownload ? 'attachment; ' : '').'filename="'.$name.'"';
         $this->header['Content-Length']            = $size;
         $this->header['Content-Transfer-Encoding'] = 'binary';
-        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT';
+        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire).' GMT';
 
-        $this->lastModified(gmdate('D, d M Y H:i:s', time()) . ' GMT');
+        $this->lastModified(gmdate('D, d M Y H:i:s', time()).' GMT');
 
         return $this->isContent ? $data : file_get_contents($data);
     }
@@ -149,7 +149,7 @@ 
         $this->name = $filename;
 
         if ($extension && false === strpos($filename, '.')) {
-            $this->name .= '.' . pathinfo($this->data, PATHINFO_EXTENSION);
+            $this->name .= '.'.pathinfo($this->data, PATHINFO_EXTENSION);
         }
 
         return $this;

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;
 
@@ -162,13 +162,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);
@@ -228,7 +228,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;
     }
@@ -304,7 +304,7 @@ 
      */
     public function getBasePath(): string
     {
-        return $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'app'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -362,7 +362,7 @@ 
      */
     public function getConfigPath(): string
     {
-        return $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'config'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -408,8 +408,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');
@@ -422,7 +422,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);
@@ -461,7 +461,7 @@ 
         }
 
         // 加载系统语言包
-        $files = glob($this->appPath . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
+        $files = glob($this->appPath.'lang'.DIRECTORY_SEPARATOR.$langset.'.*');
         $this->lang->load($files);
 
         // 加载扩展（自定义）语言包
@@ -479,7 +479,7 @@ 
      */
     public function boot(): void
     {
-        array_walk($this->services, function ($service) {
+        array_walk($this->services, function($service) {
             $this->bootService($service);
         });
     }
@@ -493,30 +493,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);
             }
@@ -581,9 +581,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;
     }
 
     /**
@@ -602,7 +602,7 @@ 
      */
     protected function getDefaultRootPath(): string
     {
-        return dirname($this->thinkPath, 4) . DIRECTORY_SEPARATOR;
+        return dirname($this->thinkPath, 4).DIRECTORY_SEPARATOR;
     }
 
 }

src/think/console/command/Clear.php

Spacing +9 added lines, -9 removed lines

@@ -30,18 +30,18 @@ 
 
     protected function execute(Input $input, Output $output)
     {
-        $runtimePath = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR;
+        $runtimePath = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR;
 
         if ($input->getOption('cache')) {
-            $path = $runtimePath . 'cache';
+            $path = $runtimePath.'cache';
         } elseif ($input->getOption('log')) {
-            $path = $runtimePath . 'log';
+            $path = $runtimePath.'log';
         } else {
             $path = $input->getOption('path') ?: $runtimePath;
         }
 
         $rmdir = $input->getOption('dir') ? true : false;
-        $this->clear(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, $rmdir);
+        $this->clear(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR, $rmdir);
 
         $output->writeln("<info>Clear Successed</info>");
     }
@@ -51,13 +51,13 @@ 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
-            if ('.' != $file && '..' != $file && is_dir($path . $file)) {
-                $this->clear($path . $file . DIRECTORY_SEPARATOR, $rmdir);
+            if ('.' != $file && '..' != $file && is_dir($path.$file)) {
+                $this->clear($path.$file.DIRECTORY_SEPARATOR, $rmdir);
                 if ($rmdir) {
-                    rmdir($path . $file);
+                    rmdir($path.$file);
                 }
-            } elseif ('.gitignore' != $file && is_file($path . $file)) {
-                unlink($path . $file);
+            } elseif ('.gitignore' != $file && is_file($path.$file)) {
+                unlink($path.$file);
             }
         }
     }

src/helper.php

Spacing +13 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 //------------------------
 // ThinkPHP 助手函数
@@ -190,12 +190,12 @@ 
         $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
 
         if (PHP_SAPI == 'cli') {
-            $output = PHP_EOL . $output . PHP_EOL;
+            $output = PHP_EOL.$output.PHP_EOL;
         } else {
             if (!extension_loaded('xdebug')) {
                 $output = htmlspecialchars($output, ENT_SUBSTITUTE);
             }
-            $output = '<pre>' . $output . '</pre>';
+            $output = '<pre>'.$output.'</pre>';
         }
 
         echo $output;
@@ -274,8 +274,7 @@ 
         }
 
         return isset($has) ?
-        request()->has($key, $method) :
-        request()->$method($key, $default, $filter);
+        request()->has($key, $method) : request()->$method($key, $default, $filter);
     }
 }
 
@@ -352,7 +351,7 @@ 
     function parse_name(string $name, int $type = 0, bool $ucfirst = true): string
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
 
@@ -453,7 +452,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 
@@ -468,7 +467,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<meta name="csrf-token" content="' . $token . '">';
+        return '<meta name="csrf-token" content="'.$token.'">';
     }
 }
 
@@ -593,7 +592,7 @@ 
      */
     function app_path($path = '')
     {
-        return app()->getAppPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getAppPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -606,7 +605,7 @@ 
      */
     function base_path($path = '')
     {
-        return app()->getBasePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getBasePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -619,7 +618,7 @@ 
      */
     function config_path($path = '')
     {
-        return app()->getConfigPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getConfigPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -632,7 +631,7 @@ 
      */
     function public_path($path = '')
     {
-        return app()->getRootPath() . 'public' . DIRECTORY_SEPARATOR . ($path ? ltrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path);
+        return app()->getRootPath().'public'.DIRECTORY_SEPARATOR.($path ? ltrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -645,7 +644,7 @@ 
      */
     function runtime_path($path = '')
     {
-        return app()->getRuntimePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getRuntimePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -658,6 +657,6 @@ 
      */
     function root_path($path = '')
     {
-        return app()->getRootPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getRootPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }