top-think / framework

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;
 
@@ -65,8 +65,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/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;
 
@@ -363,7 +363,7 @@ 
      */
     public function domain(bool $port = false): string
     {
-        return $this->scheme() . '://' . $this->host($port);
+        return $this->scheme().'://'.$this->host($port);
     }
 
     /**
@@ -378,7 +378,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;
@@ -466,14 +466,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;
     }
 
     /**
@@ -501,7 +501,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;
     }
 
     /**
@@ -522,8 +522,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')));
                 }
@@ -531,7 +531,7 @@ 
             $this->baseFile = $url;
         }
 
-        return $complete ? $this->domain() . $this->baseFile : $this->baseFile;
+        return $complete ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -562,7 +562,7 @@ 
             $this->root = rtrim($file, '/');
         }
 
-        return $complete ? $this->domain() . $this->root : $this->root;
+        return $complete ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -576,7 +576,7 @@ 
         $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
 
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root = '/'.ltrim($root, '/');
         }
 
         return $root;
@@ -1317,7 +1317,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/Event.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;
 
@@ -187,7 +187,7 @@ 
         foreach ($methods as $method) {
             $name = $method->getName();
             if (0 === strpos($name, 'on')) {
-                $this->listen($prefix . substr($name, 2), [$observer, $name]);
+                $this->listen($prefix.substr($name, 2), [$observer, $name]);
             }
         }
 

src/think/middleware/LoadLangPack.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\middleware;
 
@@ -48,7 +48,7 @@ 
         if ($this->lang->defaultLangSet() != $langset) {
             // 加载系统语言包
             $this->lang->load([
-                $this->app->getThinkPath() . 'lang' . DIRECTORY_SEPARATOR . $langset . '.php',
+                $this->app->getThinkPath().'lang'.DIRECTORY_SEPARATOR.$langset.'.php',
             ]);
 
             $this->app->LoadLangPack($langset);

src/think/middleware/FormTokenCheck.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 

src/think/middleware/AllowCrossDomain.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 

src/think/middleware/CheckRequestCache.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\middleware;
 
@@ -88,9 +88,9 @@ 
 
         if (isset($key) && 200 == $response->getCode() && $response->isAllowCache()) {
             $header                  = $response->getHeader();
-            $header['Cache-Control'] = 'max-age=' . $expire . ',must-revalidate';
-            $header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
-            $header['Expires']       = gmdate('D, d M Y H:i:s', time() + $expire) . ' GMT';
+            $header['Cache-Control'] = 'max-age='.$expire.',must-revalidate';
+            $header['Last-Modified'] = gmdate('D, d M Y H:i:s').' GMT';
+            $header['Expires']       = gmdate('D, d M Y H:i:s', time() + $expire).' GMT';
 
             $this->cache->tag($tag)->set($key, [$response->getContent(), $header, time()], $expire);
         }
@@ -141,12 +141,12 @@ 
         if (false !== strpos($key, ':')) {
             $param = $request->param();
             foreach ($param as $item => $val) {
-                if (is_string($val) && false !== strpos($key, ':' . $item)) {
-                    $key = str_replace(':' . $item, $val, $key);
+                if (is_string($val) && false !== strpos($key, ':'.$item)) {
+                    $key = str_replace(':'.$item, $val, $key);
                 }
             }
         } elseif (strpos($key, ']')) {
-            if ('[' . $request->ext() . ']' == $key) {
+            if ('['.$request->ext().']' == $key) {
                 // 缓存某个后缀的请求
                 $key = md5($request->url());
             } else {

src/think/middleware/SessionInit.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace think\middleware;
 

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,6 +602,6 @@ 
      */
     protected function getDefaultRootPath(): string
     {
-        return dirname($this->thinkPath, 4) . DIRECTORY_SEPARATOR;
+        return dirname($this->thinkPath, 4).DIRECTORY_SEPARATOR;
     }
 }