top-think / framework

src/think/Response.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -102,7 +102,7 @@ 
      */
     public static function create($data = '', string $type = 'html', int $code = 200): Response
     {
-        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type));
+        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\'.ucfirst(strtolower($type));
 
         return Container::getInstance()->invokeClass($class, [$data, $code]);
     }
@@ -135,7 +135,7 @@ 
             http_response_code($this->code);
             // 发送头部信息
             foreach ($this->header as $name => $val) {
-                header($name . (!is_null($val) ? ':' . $val : ''));
+                header($name.(!is_null($val) ? ':'.$val : ''));
             }
         }
         if ($this->cookie) {
@@ -344,7 +344,7 @@ 
      */
     public function contentType(string $contentType, string $charset = 'utf-8')
     {
-        $this->header['Content-Type'] = $contentType . '; charset=' . $charset;
+        $this->header['Content-Type'] = $contentType.'; charset='.$charset;
 
         return $this;
     }

src/think/cache/driver/Redis.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\cache\driver;
 
@@ -58,7 +58,7 @@ 
             $this->handler = new \Redis;
 
             if ($this->options['persistent']) {
-                $this->handler->pconnect($this->options['host'], (int) $this->options['port'], (int) $this->options['timeout'], 'persistent_id_' . $this->options['select']);
+                $this->handler->pconnect($this->options['host'], (int) $this->options['port'], (int) $this->options['timeout'], 'persistent_id_'.$this->options['select']);
             } else {
                 $this->handler->connect($this->options['host'], (int) $this->options['port'], (int) $this->options['timeout']);
             }

src/think/cache/driver/Memcache.php

Spacing +3 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\cache\driver;
 
@@ -64,8 +64,7 @@ 
         foreach ($hosts as $i => $host) {
             $port = $ports[$i] ?? $ports[0];
             $this->options['timeout'] > 0 ?
-            $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1, (int) $this->options['timeout']) :
-            $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1);
+            $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1, (int) $this->options['timeout']) : $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1);
         }
     }
 
@@ -177,8 +176,7 @@ 
         $key = $this->getCacheKey($name);
 
         return false === $ttl ?
-        $this->handler->delete($key) :
-        $this->handler->delete($key, $ttl);
+        $this->handler->delete($key) : $this->handler->delete($key, $ttl);
     }
 
     /**

src/think/Container.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;
 
@@ -130,7 +130,7 @@ 
             return $this->make($abstract);
         }
 
-        throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract);
+        throw new ClassNotFoundException('class not exists: '.$abstract, $abstract);
     }
 
     /**
@@ -315,7 +315,7 @@ 
             $reflect = new ReflectionMethod($class, $method);
         } catch (ReflectionException $e) {
             $class = is_object($class) ? get_class($class) : $class;
-            throw new FuncNotFoundException('method not exists: ' . $class . '::' . $method . '()', "{$class}::{$method}", $e);
+            throw new FuncNotFoundException('method not exists: '.$class.'::'.$method.'()', "{$class}::{$method}", $e);
         }
 
         $args = $this->bindParams($reflect, $vars);
@@ -373,7 +373,7 @@ 
         try {
             $reflect = new ReflectionClass($class);
         } catch (ReflectionException $e) {
-            throw new ClassNotFoundException('class not exists: ' . $class, $class, $e);
+            throw new ClassNotFoundException('class not exists: '.$class, $class, $e);
         }
 
         if ($reflect->hasMethod('__make')) {
@@ -452,7 +452,7 @@ 
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $param->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('method param miss:' . $name);
+                throw new InvalidArgumentException('method param miss:'.$name);
             }
         }
 
@@ -470,7 +470,7 @@ 
      */
     public static function factory(string $name, string $namespace = '', ...$args)
     {
-        $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name);
+        $class = false !== strpos($name, '\\') ? $name : $namespace.ucwords($name);
 
         return Container::getInstance()->invokeClass($class, $args);
     }

src/think/route/dispatch/Url.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\route\dispatch;
 
@@ -47,7 +47,7 @@ 
         if ($bind && preg_match('/^[a-z]/is', $bind)) {
             $bind = str_replace('/', $depr, $bind);
             // 如果有域名绑定
-            $url = $bind . ('.' != substr($bind, -1) ? $depr : '') . ltrim($url, $depr);
+            $url = $bind.('.' != substr($bind, -1) ? $depr : '').ltrim($url, $depr);
         }
 
         $path = $this->rule->parseUrlPath($url);
@@ -59,7 +59,7 @@ 
         $controller = !empty($path) ? array_shift($path) : null;
 
         if ($controller && !preg_match('/^[A-Za-z0-9][\w|\.]*$/', $controller)) {
-            throw new HttpException(404, 'controller not exists:' . $controller);
+            throw new HttpException(404, 'controller not exists:'.$controller);
         }
 
         // 解析操作
@@ -68,7 +68,7 @@ 
 
         // 解析额外参数
         if ($path) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, implode('|', $path));
         }
@@ -86,7 +86,7 @@ 
         $route = [$controller, $action];
 
         if ($this->hasDefinedRoute($route)) {
-            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+            throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url));
         }
 
         return $route;
@@ -103,7 +103,7 @@ 
         [$controller, $action] = $route;
 
         // 检查地址是否被定义过路由
-        $name = strtolower(Str::studly($controller) . '/' . $action);
+        $name = strtolower(Str::studly($controller).'/'.$action);
 
         $host   = $this->request->host(true);
         $method = $this->request->method();

tests/CacheTest.php

Spacing +3 added lines, -3 removed lines

@@ -126,10 +126,10 @@
         $redis->shouldReceive("del")->once()->with('baz')->andReturnTrue();
         $redis->shouldReceive("flushDB")->once()->andReturnTrue();
         $redis->shouldReceive("set")->once()->with('bar', serialize('foobar'))->andReturnTrue();
-        $redis->shouldReceive("sAdd")->once()->with('tag:' . md5('foo'), 'bar')->andReturnTrue();
-        $redis->shouldReceive("sMembers")->once()->with('tag:' . md5('foo'))->andReturn(['bar']);
+        $redis->shouldReceive("sAdd")->once()->with('tag:'.md5('foo'), 'bar')->andReturnTrue();
+        $redis->shouldReceive("sMembers")->once()->with('tag:'.md5('foo'))->andReturn(['bar']);
         $redis->shouldReceive("del")->once()->with(['bar'])->andReturnTrue();
-        $redis->shouldReceive("del")->once()->with('tag:' . md5('foo'))->andReturnTrue();
+        $redis->shouldReceive("del")->once()->with('tag:'.md5('foo'))->andReturnTrue();
 
         $this->cache->set('foo', 5);
         $this->cache->inc('foo');

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;
 
@@ -78,7 +78,7 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new RuntimeException('template not exists:' . $template);
+            throw new RuntimeException('template not exists:'.$template);
         }
 
         $this->template = $template;
@@ -100,7 +100,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -125,10 +125,10 @@ 
             $appName = isset($app) ? $app : $this->app->http->getName();
             $view    = $this->config['view_dir_name'];
 
-            if (is_dir($this->app->getAppPath() . $view)) {
-                $path = isset($app) ? $this->app->getBasePath() . ($appName ? $appName . DIRECTORY_SEPARATOR : '') . $view . DIRECTORY_SEPARATOR : $this->app->getAppPath() . $view . DIRECTORY_SEPARATOR;
+            if (is_dir($this->app->getAppPath().$view)) {
+                $path = isset($app) ? $this->app->getBasePath().($appName ? $appName.DIRECTORY_SEPARATOR : '').$view.DIRECTORY_SEPARATOR : $this->app->getAppPath().$view.DIRECTORY_SEPARATOR;
             } else {
-                $path = $this->app->getRootPath() . $view . DIRECTORY_SEPARATOR . ($appName ? $appName . DIRECTORY_SEPARATOR : '');
+                $path = $this->app->getRootPath().$view.DIRECTORY_SEPARATOR.($appName ? $appName.DIRECTORY_SEPARATOR : '');
             }
         }
 
@@ -139,7 +139,7 @@ 
             $controller = $request->controller();
             if (strpos($controller, '.')) {
                 $pos        = strrpos($controller, '.');
-                $controller = substr($controller, 0, $pos) . '.' . Str::snake(substr($controller, $pos + 1));
+                $controller = substr($controller, 0, $pos).'.'.Str::snake(substr($controller, $pos + 1));
             } else {
                 $controller = Str::snake($controller);
             }
@@ -155,16 +155,16 @@ 
                         $template = Str::snake($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/route/Url.php

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -190,7 +190,7 @@ 
                 }
             }
         } elseif (false === strpos($domain, '.') && 0 !== strpos($domain, $rootDomain)) {
-            $domain .= '.' . $rootDomain;
+            $domain .= '.'.$rootDomain;
         }
 
         if (false !== strpos($domain, '://')) {
@@ -199,7 +199,7 @@ 
             $scheme = $this->https || $request->isSsl() ? 'https://' : 'http://';
         }
 
-        return $scheme . $domain;
+        return $scheme.$domain;
     }
 
     /**
@@ -218,7 +218,7 @@ 
             }
         }
 
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.' . $suffix;
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.'.$suffix;
     }
 
     /**
@@ -242,7 +242,7 @@ 
             // 解析到控制器
             $url = substr($url, 1);
         } elseif ('' === $url) {
-            $url = $request->controller() . '/' . $request->action();
+            $url = $request->controller().'/'.$request->action();
         } else {
             $controller = $request->controller();
 
@@ -250,7 +250,7 @@ 
             $action     = array_pop($path);
             $controller = empty($path) ? $controller : array_pop($path);
 
-            $url = $controller . '/' . $action;
+            $url = $controller.'/'.$action;
         }
 
         return $url;
@@ -297,7 +297,7 @@ 
     {
         $request = $this->app->request;
         if (is_string($allowDomain) && false === strpos($allowDomain, '.')) {
-            $allowDomain .= '.' . $request->rootDomain();
+            $allowDomain .= '.'.$request->rootDomain();
         }
         $port = $request->port();
 
@@ -316,7 +316,7 @@ 
             }
 
             if ($port && !in_array($port, [80, 443])) {
-                $domain .= ':' . $port;
+                $domain .= ':'.$port;
             }
 
             if (empty($pattern)) {
@@ -328,12 +328,12 @@ 
 
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
-                    $url    = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode((string) $vars[$key]), $url);
+                    $url    = str_replace(['[:'.$key.']', '<'.$key.'?>', ':'.$key, '<'.$key.'>'], $type ? $vars[$key] : urlencode((string) $vars[$key]), $url);
                     $keys[] = $key;
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } elseif (2 == $val) {
-                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $url    = str_replace(['/[:'.$key.']', '[:'.$key.']', '<'.$key.'?>'], '', $url);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } else {
@@ -365,7 +365,7 @@ 
         if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
             // [name] 表示使用路由命名标识生成URL
             $name = substr($url, 1, $pos - 1);
-            $url  = 'name' . substr($url, $pos + 1);
+            $url  = 'name'.substr($url, $pos + 1);
         }
 
         if (false === strpos($url, '://') && 0 !== strpos($url, '/')) {
@@ -392,7 +392,7 @@ 
         }
 
         if ($url) {
-            $checkName   = isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : '');
+            $checkName   = isset($name) ? $name : $url.(isset($info['query']) ? '?'.$info['query'] : '');
             $checkDomain = $domain && is_string($domain) ? $domain : null;
 
             $rule = $this->route->getName($checkName, $checkDomain);
@@ -418,7 +418,7 @@ 
                 $suffix = $match[2];
             }
         } elseif (!empty($rule) && isset($name)) {
-            throw new \InvalidArgumentException('route name not exists:' . $name);
+            throw new \InvalidArgumentException('route name not exists:'.$name);
         } else {
             // 检测URL绑定
             $bind = $this->route->getDomainBind($domain && is_string($domain) ? $domain : null);
@@ -456,7 +456,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -466,33 +466,33 @@ 
         }
 
         // 锚点
-        $anchor = !empty($anchor) ? '#' . $anchor : '';
+        $anchor = !empty($anchor) ? '#'.$anchor : '';
 
         // 参数组装
         if (!empty($vars)) {
             // 添加参数
             if ($this->route->config('url_common_param')) {
                 $vars = http_build_query($vars);
-                $url .= $suffix . '?' . $vars . $anchor;
+                $url .= $suffix.'?'.$vars.$anchor;
             } else {
                 foreach ($vars as $var => $val) {
                     $val = (string) $val;
                     if ('' !== $val) {
-                        $url .= $depr . $var . $depr . urlencode($val);
+                        $url .= $depr.$var.$depr.urlencode($val);
                     }
                 }
 
-                $url .= $suffix . $anchor;
+                $url .= $suffix.$anchor;
             }
         } else {
-            $url .= $suffix . $anchor;
+            $url .= $suffix.$anchor;
         }
 
         // 检测域名
         $domain = $this->parseDomain($url, $domain);
 
         // URL组装
-        return $domain . rtrim($this->root, '/') . '/' . ltrim($url, '/');
+        return $domain.rtrim($this->root, '/').'/'.ltrim($url, '/');
     }
 
     public function __toString()

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;
 
@@ -97,7 +97,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(), (string) $target);
@@ -127,7 +127,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);
     }
@@ -170,18 +170,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();
     }
 }