top-think / framework

src/think/Http.php

Spacing +25 added lines, -25 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -55,7 +55,7 @@ 
     public function __construct(App $app)
     {
         $this->app   = $app;
-        $this->multi = is_dir($this->app->getBasePath() . 'controller') ? false : true;
+        $this->multi = is_dir($this->app->getBasePath().'controller') ? false : true;
     }
 
     /**
@@ -171,8 +171,8 @@ 
         $this->initialize();
 
         // 加载全局中间件
-        if (is_file($this->app->getBasePath() . 'middleware.php')) {
-            $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php');
+        if (is_file($this->app->getBasePath().'middleware.php')) {
+            $this->app->middleware->import(include $this->app->getBasePath().'middleware.php');
         }
 
         if ($this->multi) {
@@ -185,7 +185,7 @@ 
         // 监听HttpRun
         $this->app->event->trigger('HttpRun');
 
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         } : null;
 
@@ -201,7 +201,7 @@ 
     {
         // 加载路由定义
         if (is_dir($this->getRoutePath())) {
-            $files = glob($this->getRoutePath() . '*.php');
+            $files = glob($this->getRoutePath().'*.php');
             foreach ($files as $file) {
                 include $file;
             }
@@ -213,7 +213,7 @@ 
                 $this->app->console->call('route:build', [$this->name]);
             }
 
-            $filename = $this->app->getRuntimePath() . 'build_route.php';
+            $filename = $this->app->getRuntimePath().'build_route.php';
 
             if (is_file($filename)) {
                 include $filename;
@@ -228,7 +228,7 @@ 
      */
     protected function getRoutePath(): string
     {
-        return $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($this->isMulti() ? $this->getName() . DIRECTORY_SEPARATOR : '');
+        return $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($this->isMulti() ? $this->getName().DIRECTORY_SEPARATOR : '');
     }
 
     /**
@@ -313,7 +313,7 @@ 
                         $appName = $map[$name];
                     }
                 } elseif ($name && (false !== array_search($name, $map) || in_array($name, $deny))) {
-                    throw new HttpException(404, 'app not exists:' . $name);
+                    throw new HttpException(404, 'app not exists:'.$name);
                 } elseif ($name && isset($map['*'])) {
                     $appName = $map['*'];
                 } else {
@@ -321,7 +321,7 @@ 
                 }
 
                 if ($name) {
-                    $this->app->request->setRoot('/' . $name);
+                    $this->app->request->setRoot('/'.$name);
                     $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : '');
                 }
             }
@@ -341,41 +341,41 @@ 
     {
         $this->name = $appName;
         $this->app->request->setApp($appName);
-        $this->app->setAppPath($this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR);
-        $this->app->setRuntimePath($this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR);
+        $this->app->setAppPath($this->path ?: $this->app->getBasePath().$appName.DIRECTORY_SEPARATOR);
+        $this->app->setRuntimePath($this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$appName.DIRECTORY_SEPARATOR);
 
         //加载app文件
         if (is_dir($this->app->getAppPath())) {
             $appPath = $this->app->getAppPath();
 
-            if (is_file($appPath . 'common.php')) {
-                include_once $appPath . 'common.php';
+            if (is_file($appPath.'common.php')) {
+                include_once $appPath.'common.php';
             }
 
             $configPath = $this->app->getConfigPath();
 
             $files = [];
 
-            if (is_dir($configPath . $appName)) {
-                $files = array_merge($files, glob($configPath . $appName . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
-            } elseif (is_dir($appPath . 'config')) {
-                $files = array_merge($files, glob($appPath . 'config' . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
+            if (is_dir($configPath.$appName)) {
+                $files = array_merge($files, glob($configPath.$appName.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
+            } elseif (is_dir($appPath.'config')) {
+                $files = array_merge($files, glob($appPath.'config'.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
             }
 
             foreach ($files as $file) {
                 $this->app->config->load($file, pathinfo($file, PATHINFO_FILENAME));
             }
 
-            if (is_file($appPath . 'event.php')) {
-                $this->app->loadEvent(include $appPath . 'event.php');
+            if (is_file($appPath.'event.php')) {
+                $this->app->loadEvent(include $appPath.'event.php');
             }
 
-            if (is_file($appPath . 'middleware.php')) {
-                $this->app->middleware->import(include $appPath . 'middleware.php');
+            if (is_file($appPath.'middleware.php')) {
+                $this->app->middleware->import(include $appPath.'middleware.php');
             }
 
-            if (is_file($appPath . 'provider.php')) {
-                $this->app->bind(include $appPath . 'provider.php');
+            if (is_file($appPath.'provider.php')) {
+                $this->app->bind(include $appPath.'provider.php');
             }
         }
 
@@ -383,7 +383,7 @@ 
         $this->app->loadLangPack($this->app->lang->defaultLangSet());
 
         // 设置应用命名空间
-        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\' . $appName);
+        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\'.$appName);
     }
 
     /**

src/think/Session.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -387,7 +387,7 @@ 
             $this->data = $data;
         }
 
-        $sessionId = md5(microtime(true) . uniqid());
+        $sessionId = md5(microtime(true).uniqid());
 
         $this->setId($sessionId);
         return $sessionId;

src/think/Config.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -64,8 +64,8 @@ 
     {
         if (is_file($file)) {
             $filename = $file;
-        } elseif (is_file($this->path . $file . $this->ext)) {
-            $filename = $this->path . $file . $this->ext;
+        } elseif (is_file($this->path.$file.$this->ext)) {
+            $filename = $this->path.$file.$this->ext;
         }
 
         if (isset($filename)) {

src/think/filesystem/CacheStore.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\filesystem;
 

src/think/filesystem/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         $stream = fopen($file->getRealPath(), 'r');
 
         $result = $this->putStream(
-            $path = trim($path . '/' . $name, '/'), $stream, $options
+            $path = trim($path.'/'.$name, '/'), $stream, $options
         );
 
         if (is_resource($stream)) {

src/think/view/driver/Php.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\view\driver;
 
@@ -77,14 +77,14 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         $this->template = $template;
 
         // 记录视图信息
         $this->app->log
-            ->record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->record('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         extract($data, EXTR_OVERWRITE);
 
@@ -103,7 +103,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -115,7 +115,7 @@ 
     private function parseTemplate(string $template): string
     {
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $this->app->getAppPath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $this->app->getAppPath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $request = $this->app->request;
@@ -129,9 +129,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $app  = isset($app) ? $app : $request->app();
-            $path = $this->config['view_base'] . ($app ? $app . DIRECTORY_SEPARATOR : '');
+            $path = $this->config['view_base'].($app ? $app.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($app) ? $this->app->getBasePath() . $app . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($app) ? $this->app->getBasePath().$app.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -151,16 +151,16 @@ 
                         $template = App::parseName($request->action());
                     }
 
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     /**

src/think/facade/Console.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\facade;
 

src/think/log/driver/File.php

Spacing +25 added lines, -25 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -81,7 +81,7 @@ 
                     $msg = var_export($msg, true);
                 }
 
-                $info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg;
+                $info[$type][] = $this->config['json'] ? $msg : '[ '.$type.' ] '.$msg;
             }
 
             if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) {
@@ -143,13 +143,13 @@ 
     protected function getMasterLogFile(): string
     {
         if (empty($this->config['path'])) {
-            $this->config['path'] = $this->app->getRuntimePath() . 'log' . DIRECTORY_SEPARATOR;
+            $this->config['path'] = $this->app->getRuntimePath().'log'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->config['path'] .= DIRECTORY_SEPARATOR;
         }
 
         if ($this->config['max_files']) {
-            $files = glob($this->config['path'] . '*.log');
+            $files = glob($this->config['path'].'*.log');
 
             try {
                 if (count($files) > $this->config['max_files']) {
@@ -163,17 +163,17 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $destination = $this->config['path'] . $name . '.log';
+            $destination = $this->config['path'].$name.'.log';
         } else {
             $cli = $this->isCli ? '_cli' : '';
 
             if ($this->config['max_files']) {
-                $filename = date('Ymd') . $cli . '.log';
+                $filename = date('Ymd').$cli.'.log';
             } else {
-                $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . $cli . '.log';
+                $filename = date('Ym').DIRECTORY_SEPARATOR.date('d').$cli.'.log';
             }
 
-            $destination = $this->config['path'] . $filename;
+            $destination = $this->config['path'].$filename;
         }
 
         return $destination;
@@ -193,14 +193,14 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $name .= '_' . $type;
+            $name .= '_'.$type;
         } elseif ($this->config['max_files']) {
-            $name = date('Ymd') . '_' . $type . $cli;
+            $name = date('Ymd').'_'.$type.$cli;
         } else {
-            $name = date('d') . '_' . $type . $cli;
+            $name = date('d').'_'.$type.$cli;
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '.log';
+        return $path.DIRECTORY_SEPARATOR.$name.'.log';
     }
 
     /**
@@ -213,7 +213,7 @@ 
     {
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
             try {
-                rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
+                rename($destination, dirname($destination).DIRECTORY_SEPARATOR.time().'-'.basename($destination));
             } catch (\Exception $e) {
                 //
             }
@@ -229,14 +229,14 @@ 
     protected function parseCliLog(array $info): string
     {
         if ($this->config['json']) {
-            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
+            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
         } else {
             $now = $info['timestamp'];
             unset($info['timestamp']);
 
             $message = implode(PHP_EOL, $info);
 
-            $message = "[{$now}]" . $message . PHP_EOL;
+            $message = "[{$now}]".$message.PHP_EOL;
         }
 
         return $message;
@@ -259,13 +259,13 @@ 
 
         if ($this->config['json']) {
             $info = $requestInfo + $info;
-            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
+            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
         }
 
-        array_unshift($info, "---------------------------------------------------------------" . PHP_EOL . "[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
+        array_unshift($info, "---------------------------------------------------------------".PHP_EOL."[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
         unset($info['timestamp']);
 
-        return implode(PHP_EOL, $info) . PHP_EOL;
+        return implode(PHP_EOL, $info).PHP_EOL;
     }
 
     protected function getDebugLog(&$info, $append, $apart): void
@@ -280,9 +280,9 @@ 
                 $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
 
                 $info = [
-                    'runtime' => number_format($runtime, 6) . 's',
-                    'reqs'    => $reqs . 'req/s',
-                    'memory'  => $memory_use . 'kb',
+                    'runtime' => number_format($runtime, 6).'s',
+                    'reqs'    => $reqs.'req/s',
+                    'memory'  => $memory_use.'kb',
                     'file'    => count(get_included_files()),
                 ] + $info;
 
@@ -293,11 +293,11 @@ 
 
                 $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
 
-                $time_str   = '[运行时间：' . number_format($runtime, 6) . 's] [吞吐率：' . $reqs . 'req/s]';
-                $memory_str = ' [内存消耗：' . $memory_use . 'kb]';
-                $file_load  = ' [文件加载：' . count(get_included_files()) . ']';
+                $time_str   = '[运行时间：'.number_format($runtime, 6).'s] [吞吐率：'.$reqs.'req/s]';
+                $memory_str = ' [内存消耗：'.$memory_use.'kb]';
+                $file_load  = ' [文件加载：'.count(get_included_files()).']';
 
-                array_unshift($info, $time_str . $memory_str . $file_load);
+                array_unshift($info, $time_str.$memory_str.$file_load);
             }
         }
     }

src/think/cache/Driver.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\cache;
 
@@ -81,7 +81,7 @@ 
      */
     public function getCacheKey(string $name): string
     {
-        return $this->options['prefix'] . $name;
+        return $this->options['prefix'].$name;
     }
 
     /**
@@ -142,14 +142,14 @@ 
 
         $time = time();
 
-        while ($time + 5 > time() && $this->has($name . '_lock')) {
+        while ($time + 5 > time() && $this->has($name.'_lock')) {
             // 存在锁定则等待
             usleep(200000);
         }
 
         try {
             // 锁定
-            $this->set($name . '_lock', true);
+            $this->set($name.'_lock', true);
 
             if ($value instanceof \Closure) {
                 // 获取缓存数据
@@ -160,9 +160,9 @@ 
             $this->set($name, $value, $expire);
 
             // 解锁
-            $this->delete($name . '_lock');
+            $this->delete($name.'_lock');
         } catch (\Exception | \throwable $e) {
-            $this->delete($name . '_lock');
+            $this->delete($name.'_lock');
             throw $e;
         }
 
@@ -181,7 +181,7 @@ 
         $key  = implode('-', $name);
 
         if (!isset($this->tag[$key])) {
-            $name = array_map(function ($val) {
+            $name = array_map(function($val) {
                 return $this->getTagKey($val);
             }, $name);
             $this->tag[$key] = new TagSet($name, $this);
@@ -210,7 +210,7 @@ 
      */
     public function getTagKey(string $tag): string
     {
-        return $this->options['tag_prefix'] . md5($tag);
+        return $this->options['tag_prefix'].md5($tag);
     }
 
     /**