top-think / framework

src/think/session/driver/Memcache.php

Spacing +5 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\session\driver;
 
@@ -62,8 +62,7 @@ 
         foreach ($hosts as $i => $host) {
             $port = $ports[$i] ?? $ports[0];
             $this->config['timeout'] > 0 ?
-            $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1, $this->config['timeout']) :
-            $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1);
+            $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1, $this->config['timeout']) : $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1);
         }
 
         return true;
@@ -77,7 +76,7 @@ 
      */
     public function read(string $sessID): string
     {
-        return (string) $this->handler->get($this->config['prefix'] . $sessID);
+        return (string) $this->handler->get($this->config['prefix'].$sessID);
     }
 
     /**
@@ -89,7 +88,7 @@ 
      */
     public function write(string $sessID, string $data): bool
     {
-        return $this->handler->set($this->config['prefix'] . $sessID, $data, 0, $this->config['expire']);
+        return $this->handler->set($this->config['prefix'].$sessID, $data, 0, $this->config['expire']);
     }
 
     /**
@@ -100,7 +99,7 @@ 
      */
     public function delete(string $sessID): bool
     {
-        return $this->handler->delete($this->config['prefix'] . $sessID);
+        return $this->handler->delete($this->config['prefix'].$sessID);
     }
 
 }

src/think/session/driver/Redis.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\session\driver;
 
@@ -86,7 +86,7 @@ 
      */
     public function read(string $sessID): string
     {
-        return (string) $this->handler->get($this->config['prefix'] . $sessID);
+        return (string) $this->handler->get($this->config['prefix'].$sessID);
     }
 
     /**
@@ -99,9 +99,9 @@ 
     public function write(string $sessID, string $data): bool
     {
         if ($this->config['expire'] > 0) {
-            $result = $this->handler->setex($this->config['prefix'] . $sessID, $this->config['expire'], $data);
+            $result = $this->handler->setex($this->config['prefix'].$sessID, $this->config['expire'], $data);
         } else {
-            $result = $this->handler->set($this->config['prefix'] . $sessID, $data);
+            $result = $this->handler->set($this->config['prefix'].$sessID, $data);
         }
 
         return $result ? true : false;
@@ -115,7 +115,7 @@ 
      */
     public function delete(string $sessID): bool
     {
-        return $this->handler->delete($this->config['prefix'] . $sessID) > 0;
+        return $this->handler->delete($this->config['prefix'].$sessID) > 0;
     }
 
 }

src/think/session/driver/File.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\session\driver;
 
@@ -34,7 +34,7 @@ 
         $this->config = array_merge($this->config, $config);
 
         if (empty($this->config['path'])) {
-            $this->config['path'] = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'session' . DIRECTORY_SEPARATOR;
+            $this->config['path'] = $app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'session'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->config['path'] .= DIRECTORY_SEPARATOR;
         }
@@ -72,11 +72,11 @@ 
     public function gc()
     {
         $maxlifetime = $this->config['gc_maxlifetime'];
-        $list        = glob($this->config['path'] . '*');
+        $list        = glob($this->config['path'].'*');
 
         foreach ($list as $path) {
             if (is_dir($path)) {
-                $files = glob($path . DIRECTORY_SEPARATOR . '*.php');
+                $files = glob($path.DIRECTORY_SEPARATOR.'*.php');
                 foreach ($files as $file) {
                     if (time() > filemtime($file) + $maxlifetime) {
                         unlink($file);
@@ -99,12 +99,12 @@ 
     {
         if ($this->config['prefix']) {
             // 使用子目录
-            $name = $this->config['prefix'] . DIRECTORY_SEPARATOR . 'sess_' . $name;
+            $name = $this->config['prefix'].DIRECTORY_SEPARATOR.'sess_'.$name;
         } else {
-            $name = 'sess_' . $name;
+            $name = 'sess_'.$name;
         }
 
-        $filename = $this->config['path'] . $name . '.php';
+        $filename = $this->config['path'].$name.'.php';
         $dir      = dirname($filename);
 
         if ($auto && !is_dir($dir)) {
@@ -174,7 +174,7 @@ 
             $data = gzcompress($data, 3);
         }
 
-        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
+        $data   = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data;
         $result = file_put_contents($filename, $data);
 
         if ($result) {

src/think/View.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;
 

src/think/File.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -86,7 +86,7 @@ 
     {
         $target = $this->getTargetFile($directory, $name);
 
-        set_error_handler(function ($type, $msg) use (&$error) {
+        set_error_handler(function($type, $msg) use (&$error) {
             $error = $msg;
         });
         $renamed = rename($this->getPathname(), $target);
@@ -116,7 +116,7 @@ 
             throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
         }
 
-        $target = rtrim($directory, '/\\') . \DIRECTORY_SEPARATOR . (null === $name ? $this->getBasename() : $this->getName($name));
+        $target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
 
         return new self($target, false);
     }
@@ -159,18 +159,18 @@ 
                 switch (true) {
                     case in_array($rule, hash_algos()):
                         $hash           = $this->hash($rule);
-                        $this->hashName = substr($hash, 0, 2) . DIRECTORY_SEPARATOR . substr($hash, 2);
+                        $this->hashName = substr($hash, 0, 2).DIRECTORY_SEPARATOR.substr($hash, 2);
                         break;
                     case is_callable($rule):
                         $this->hashName = call_user_func($rule);
                         break;
                     default:
-                        $this->hashName = date('Ymd') . DIRECTORY_SEPARATOR . md5((string) microtime(true));
+                        $this->hashName = date('Ymd').DIRECTORY_SEPARATOR.md5((string) microtime(true));
                         break;
                 }
             }
         }
 
-        return $this->hashName . '.' . $this->extension();
+        return $this->hashName.'.'.$this->extension();
     }
 }

src/think/Filesystem.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;
 

src/think/route/Dispatch.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\route;
 

src/think/route/Domain.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\route;
 
@@ -156,7 +156,7 @@ 
             $this->parseUrlParams($array[2], $param);
         }
 
-        return new CallbackDispatch($request, $this, [$namespace . '\\' . App::parseName($class, 1), $method], $param);
+        return new CallbackDispatch($request, $this, [$namespace.'\\'.App::parseName($class, 1), $method], $param);
     }
 
     /**
@@ -177,7 +177,7 @@ 
             $this->parseUrlParams($array[1], $param);
         }
 
-        return new ControllerDispatch($request, $this, $controller . '/' . $action, $param);
+        return new ControllerDispatch($request, $this, $controller.'/'.$action, $param);
     }
 
 }

src/think/route/Rule.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\route;
 
@@ -602,7 +602,7 @@ 
     {
         if (is_string($route) && isset($option['prefix'])) {
             // 路由地址前缀
-            $route = $option['prefix'] . $route;
+            $route = $option['prefix'].$route;
         }
 
         // 替换路由地址中的变量
@@ -610,10 +610,10 @@ 
             $search = $replace = [];
 
             foreach ($matches as $key => $value) {
-                $search[]  = '<' . $key . '>';
+                $search[]  = '<'.$key.'>';
                 $replace[] = $value;
 
-                $search[]  = ':' . $key;
+                $search[]  = ':'.$key;
                 $replace[] = $value;
             }
 
@@ -718,7 +718,7 @@ 
         // AJAX PJAX 请求检查
         foreach (['ajax', 'pjax', 'json'] as $item) {
             if (isset($option[$item])) {
-                $call = 'is' . $item;
+                $call = 'is'.$item;
                 if ($option[$item] && !$request->$call() || !$option[$item] && $request->$call()) {
                     return false;
                 }
@@ -726,8 +726,8 @@ 
         }
 
         // 伪静态后缀检测
-        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|' . $option['ext'] . '|', '|' . $request->ext() . '|'))
-            || (isset($option['deny_ext']) && false !== stripos('|' . $option['deny_ext'] . '|', '|' . $request->ext() . '|')))) {
+        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|'.$option['ext'].'|', '|'.$request->ext().'|'))
+            || (isset($option['deny_ext']) && false !== stripos('|'.$option['deny_ext'].'|', '|'.$request->ext().'|')))) {
             return false;
         }
 
@@ -764,7 +764,7 @@ 
     protected function parseUrlParams(string $url, array &$var = []): void
     {
         if ($url) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, $url);
         }
@@ -826,7 +826,7 @@ 
             $regex .= '\/';
         }
 
-        return $regex . ($completeMatch ? '$' : '');
+        return $regex.($completeMatch ? '$' : '');
     }
 
     /**
@@ -843,7 +843,7 @@ 
         $slash    = substr($name, 0, 1);
 
         if (in_array($slash, ['/', '-'])) {
-            $prefix = '\\' . $slash;
+            $prefix = '\\'.$slash;
             $name   = substr($name, 1);
             $slash  = substr($name, 0, 1);
         } else {
@@ -851,7 +851,7 @@ 
         }
 
         if ('<' != $slash) {
-            return $prefix . preg_quote($name, '/');
+            return $prefix.preg_quote($name, '/');
         }
 
         if (strpos($name, '?')) {
@@ -870,7 +870,7 @@ 
             $nameRule = $this->router->config('default_route_pattern');
         }
 
-        return '(' . $prefix . '(?<' . $name . $suffix . '>' . $nameRule . '))' . $optional;
+        return '('.$prefix.'(?<'.$name.$suffix.'>'.$nameRule.'))'.$optional;
     }
 
     /**