top-think / framework

src/think/log/driver/File.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -86,7 +86,7 @@ 
                 if ($this->config['json']) {
                     $info[] = json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
                 } else {
-                    $info[$type][] = '[' . $time . '][' . $type . '] ' . $msg;
+                    $info[$type][] = '['.$time.']['.$type.'] '.$msg;
                 }
             }
 
@@ -125,7 +125,7 @@ 
             $info[$type] = is_array($msg) ? implode(PHP_EOL, $msg) : $msg;
         }
 
-        $message = implode(PHP_EOL, $info) . PHP_EOL;
+        $message = implode(PHP_EOL, $info).PHP_EOL;
 
         return error_log($message, 3, $destination);
     }
@@ -138,13 +138,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']) {
@@ -158,17 +158,17 @@ 
         if ($this->config['single']) {
             $name        = is_string($this->config['single']) ? $this->config['single'] : 'single';
             $cli         = $this->isCli ? '_cli' : '';
-            $destination = $this->config['path'] . $name . $cli . '.log';
+            $destination = $this->config['path'].$name.$cli.'.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;
@@ -188,14 +188,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';
     }
 
     /**
@@ -208,7 +208,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) {
                 //
             }

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;
 
@@ -56,7 +56,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;
     }
 
     /**
@@ -172,8 +172,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) {
@@ -186,9 +186,9 @@ 
         // 监听HttpRun
         $this->app->event->trigger('HttpRun');
 
-        $this->app->log->info($request->ip() . ' ' . $request->method() . ' ' . $request->host() . $request->url());
+        $this->app->log->info($request->ip().' '.$request->method().' '.$request->host().$request->url());
 
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         } : null;
 
@@ -204,7 +204,7 @@ 
     {
         // 加载路由定义
         if (is_dir($this->getRoutePath())) {
-            $files = glob($this->getRoutePath() . '*.php');
+            $files = glob($this->getRoutePath().'*.php');
             foreach ($files as $file) {
                 include $file;
             }
@@ -220,7 +220,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 : '');
     }
 
     /**
@@ -305,7 +305,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 {
@@ -313,7 +313,7 @@ 
                 }
 
                 if ($name) {
-                    $this->app->request->setRoot('/' . $name);
+                    $this->app->request->setRoot('/'.$name);
                     $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : '');
                 }
             }
@@ -333,41 +333,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');
             }
         }
 
@@ -375,7 +375,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);
     }
 
     /**