top-think / framework

src/think/Request.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -384,7 +384,7 @@ 
      */
     public function domain(bool $port = false): string
     {
-        return $this->scheme() . '://' . $this->host($port);
+        return $this->scheme().'://'.$this->host($port);
     }
 
     /**
@@ -399,7 +399,7 @@ 
         if (!$root) {
             $item  = explode('.', $this->host());
             $count = count($item);
-            $root  = $count > 1 ? $item[$count - 2] . '.' . $item[$count - 1] : $item[0];
+            $root  = $count > 1 ? $item[$count - 2].'.'.$item[$count - 1] : $item[0];
         }
 
         return $root;
@@ -487,14 +487,14 @@ 
         } elseif ($this->server('REQUEST_URI')) {
             $url = $this->server('REQUEST_URI');
         } elseif ($this->server('ORIG_PATH_INFO')) {
-            $url = $this->server('ORIG_PATH_INFO') . (!empty($this->server('QUERY_STRING')) ? '?' . $this->server('QUERY_STRING') : '');
+            $url = $this->server('ORIG_PATH_INFO').(!empty($this->server('QUERY_STRING')) ? '?'.$this->server('QUERY_STRING') : '');
         } elseif (isset($_SERVER['argv'][1])) {
             $url = $_SERVER['argv'][1];
         } else {
             $url = '';
         }
 
-        return $complete ? $this->domain() . $url : $url;
+        return $complete ? $this->domain().$url : $url;
     }
 
     /**
@@ -522,7 +522,7 @@ 
             $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
         }
 
-        return $complete ? $this->domain() . $this->baseUrl : $this->baseUrl;
+        return $complete ? $this->domain().$this->baseUrl : $this->baseUrl;
     }
 
     /**
@@ -543,8 +543,8 @@ 
                     $url = $this->server('PHP_SELF');
                 } elseif (basename($this->server('ORIG_SCRIPT_NAME')) === $script_name) {
                     $url = $this->server('ORIG_SCRIPT_NAME');
-                } elseif (($pos = strpos($this->server('PHP_SELF'), '/' . $script_name)) !== false) {
-                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos) . '/' . $script_name;
+                } elseif (($pos = strpos($this->server('PHP_SELF'), '/'.$script_name)) !== false) {
+                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos).'/'.$script_name;
                 } elseif ($this->server('DOCUMENT_ROOT') && strpos($this->server('SCRIPT_FILENAME'), $this->server('DOCUMENT_ROOT')) === 0) {
                     $url = str_replace('\\', '/', str_replace($this->server('DOCUMENT_ROOT'), '', $this->server('SCRIPT_FILENAME')));
                 }
@@ -552,7 +552,7 @@ 
             $this->baseFile = $url;
         }
 
-        return $complete ? $this->domain() . $this->baseFile : $this->baseFile;
+        return $complete ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -583,7 +583,7 @@ 
             $this->root = rtrim($file, '/');
         }
 
-        return $complete ? $this->domain() . $this->root : $this->root;
+        return $complete ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -597,7 +597,7 @@ 
         $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
 
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root = '/'.ltrim($root, '/');
         }
 
         return $root;
@@ -1334,7 +1334,7 @@ 
                 if (is_scalar($data)) {
                     $data = (string) $data;
                 } else {
-                    throw new \InvalidArgumentException('variable type error：' . gettype($data));
+                    throw new \InvalidArgumentException('variable type error：'.gettype($data));
                 }
                 break;
         }

src/think/Http.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;
 
@@ -63,7 +63,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;
     }
 
     /**
@@ -167,8 +167,8 @@ 
         if (!$this->app->initialized()) {
             $this->app->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');
             }
         }
     }
@@ -195,7 +195,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;
 
@@ -213,7 +213,7 @@ 
         $routePath = $this->getRoutePath();
 
         if (is_dir($routePath)) {
-            $files = glob($routePath . '*.php');
+            $files = glob($routePath.'*.php');
             foreach ($files as $file) {
                 include $file;
             }
@@ -229,11 +229,11 @@ 
      */
     protected function getRoutePath(): string
     {
-        if ($this->isMulti() && is_dir($this->app->getAppPath() . 'route')) {
-            return $this->app->getAppPath() . 'route' . DIRECTORY_SEPARATOR;
+        if ($this->isMulti() && is_dir($this->app->getAppPath().'route')) {
+            return $this->app->getAppPath().'route'.DIRECTORY_SEPARATOR;
         }
 
-        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 : '');
     }
 
     /**
@@ -319,7 +319,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 {
@@ -327,7 +327,7 @@ 
                 }
 
                 if ($name) {
-                    $this->app->request->setRoot('/' . $name);
+                    $this->app->request->setRoot('/'.$name);
                     $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : '');
                 }
             }
@@ -347,26 +347,26 @@ 
     {
         $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 (!isset($this->register[$appName])) {
             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) {
@@ -375,16 +375,16 @@ 
                     $this->register[$appName]['config'][$name] = $this->app->config->load($file, $name, false);
                 }
 
-                if (is_file($appPath . 'event.php')) {
-                    $this->register[$appName]['event'] = include $appPath . 'event.php';
+                if (is_file($appPath.'event.php')) {
+                    $this->register[$appName]['event'] = include $appPath.'event.php';
                 }
 
-                if (is_file($appPath . 'middleware.php')) {
-                    $this->register[$appName]['middleware'] = include $appPath . 'middleware.php';
+                if (is_file($appPath.'middleware.php')) {
+                    $this->register[$appName]['middleware'] = include $appPath.'middleware.php';
                 }
 
-                if (is_file($appPath . 'provider.php')) {
-                    $this->register[$appName]['provider'] = include $appPath . 'provider.php';
+                if (is_file($appPath.'provider.php')) {
+                    $this->register[$appName]['provider'] = include $appPath.'provider.php';
                 }
             }
         }
@@ -411,7 +411,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);
     }
 
     /**