top-think / framework

src/think/exception/ValidateException.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\exception;
 

src/think/exception/HttpResponseException.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\exception;
 

src/think/exception/HttpException.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\exception;
 

src/think/response/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\response;
 

src/think/response/Json.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\response;
 

src/think/route/Url.php

Spacing +21 added lines, -21 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;
     }
 
     /**
@@ -255,7 +255,7 @@ 
                 $app        = empty($path) ? $app : array_pop($path);
             }
 
-            $url = $controller . '/' . $action;
+            $url = $controller.'/'.$action;
 
             if ($app && $this->app->config->get('app.auto_multi_app')) {
                 $bind = $this->app->config->get('app.domain_bind', []);
@@ -265,9 +265,9 @@ 
                     $map = $this->app->config->get('app.app_map', []);
 
                     if ($key = array_search($app, $map)) {
-                        $url = $key . '/' . $url;
+                        $url = $key.'/'.$url;
                     } else {
-                        $url = $app . '/' . $url;
+                        $url = $app.'/'.$url;
                     }
                 }
             }
@@ -332,7 +332,7 @@ 
             }
 
             if (!in_array($request->port(), [80, 443])) {
-                $domain .= ':' . $request->port();
+                $domain .= ':'.$request->port();
             }
 
             if (empty($pattern)) {
@@ -343,12 +343,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);
                     unset($vars[$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 {
@@ -376,7 +376,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, '/')) {
@@ -403,7 +403,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);
@@ -430,10 +430,10 @@ 
             }
 
             if ($request->app() && $this->app->config->get('app.auto_multi_app') && !$this->app->http->isBindDomain()) {
-                $url = $request->app() . '/' . $url;
+                $url = $request->app().'/'.$url;
             }
         } 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);
@@ -471,7 +471,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -481,32 +481,32 @@ 
         }
 
         // 锚点
-        $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) {
                     if ('' !== $val) {
-                        $url .= $depr . $var . $depr . urlencode((string) $val);
+                        $url .= $depr.$var.$depr.urlencode((string) $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/cache/Driver.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\cache;
 
@@ -84,7 +84,7 @@ 
      */
     public function getCacheKey(string $name): string
     {
-        return $this->options['prefix'] . $name;
+        return $this->options['prefix'].$name;
     }
 
     /**
@@ -145,14 +145,14 @@ 
 
         $time = time();
 
-        while ($time + 5 > time() && $this->has($name . '_lock')) {
+        while ($time + 5 > time() && $this->has($name.'_lock')) {
             // 存在锁定则等待
             usleep(200000);
         }
 
         try {
             // 锁定
-            $this->set($name . '_lock', true);
+            $this->set($name.'_lock', true);
 
             if ($value instanceof Closure) {
                 // 获取缓存数据
@@ -163,9 +163,9 @@ 
             $this->set($name, $value, $expire);
 
             // 解锁
-            $this->delete($name . '_lock');
+            $this->delete($name.'_lock');
         } catch (Exception | throwable $e) {
-            $this->delete($name . '_lock');
+            $this->delete($name.'_lock');
             throw $e;
         }
 
@@ -184,7 +184,7 @@ 
         $key  = implode('-', $name);
 
         if (!isset($this->tag[$key])) {
-            $name = array_map(function ($val) {
+            $name = array_map(function($val) {
                 return $this->getTagKey($val);
             }, $name);
             $this->tag[$key] = new TagSet($name, $this);
@@ -212,7 +212,7 @@ 
      */
     public function getTagKey(string $tag): string
     {
-        return $this->options['tag_prefix'] . md5($tag);
+        return $this->options['tag_prefix'].md5($tag);
     }
 
     /**

src/think/Console.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: zhangyajun <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -461,10 +461,10 @@ 
     public function findNamespace(string $namespace): string
     {
         $allNamespaces = $this->getNamespaces();
-        $expr          = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr          = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $namespace);
-        $namespaces    = preg_grep('{^' . $expr . '}', $allNamespaces);
+        $namespaces    = preg_grep('{^'.$expr.'}', $allNamespaces);
 
         if (empty($namespaces)) {
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@@ -501,13 +501,13 @@ 
     {
         $allCommands = array_keys($this->commands);
 
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $name);
 
-        $commands = preg_grep('{^' . $expr . '}', $allCommands);
+        $commands = preg_grep('{^'.$expr.'}', $allCommands);
 
-        if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
+        if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) {
             if (false !== $pos = strrpos($name, ':')) {
                 $this->findNamespace(substr($name, 0, $pos));
             }
@@ -701,7 +701,7 @@ 
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
+        $alternatives = array_filter($alternatives, function($lev) use ($threshold) {
             return $lev < 2 * $threshold;
         });
         asort($alternatives);
@@ -722,7 +722,7 @@ 
 
         foreach ($parts as $part) {
             if (count($namespaces)) {
-                $namespaces[] = end($namespaces) . ':' . $part;
+                $namespaces[] = end($namespaces).':'.$part;
             } else {
                 $namespaces[] = $part;
             }

tests/ContainerTest.php

Spacing +10 added lines, -10 removed lines

@@ -57,7 +57,7 @@ 
 
         Container::setInstance($container);
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -74,7 +74,7 @@ 
         $this->expectExceptionMessage('class not exists: name');
         $container->get('name');
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -85,7 +85,7 @@ 
     {
         $container = new Container;
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -100,7 +100,7 @@ 
     {
         $container = new Container;
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -192,7 +192,7 @@ 
 
         $this->assertSame($object, Container::getInstance());
 
-        Container::setInstance(function () {
+        Container::setInstance(function() {
             return $this;
         });
 
@@ -212,7 +212,7 @@ 
         $this->expectException(Exception::class);
         $this->expectExceptionMessageRegExp('/function not exists: {Closure}@.+#L\d+-\d+/');
         $container = new Container;
-        $container->invokeFunction(function () {
+        $container->invokeFunction(function() {
             throw new \ReflectionException('test exception');
         });
     }
@@ -231,17 +231,17 @@ 
 
         $container->invokeMethod([$stub, 'some']);
 
-        $this->assertSame($container, $container->invokeMethod(Taylor::class . '::test'));
+        $this->assertSame($container, $container->invokeMethod(Taylor::class.'::test'));
 
         $reflect = new ReflectionMethod($container, 'exists');
 
         $this->assertTrue($container->invokeReflectMethod($container, $reflect, [Container::class]));
 
-        $this->assertSame($container, $container->invoke(function (Container $container) {
+        $this->assertSame($container, $container->invoke(function(Container $container) {
             return $container;
         }));
 
-        $this->assertSame($container, $container->invoke(Taylor::class . '::test'));
+        $this->assertSame($container, $container->invoke(Taylor::class.'::test'));
 
         $object = $container->invokeClass(SomeClass::class);
         $this->assertInstanceOf(SomeClass::class, $object);
@@ -249,7 +249,7 @@ 
 
         $stdClass = new stdClass();
 
-        $container->invoke(function (Container $container, stdClass $stdObject, $key1, $lowKey, $key2 = 'default') use ($stdClass) {
+        $container->invoke(function(Container $container, stdClass $stdObject, $key1, $lowKey, $key2 = 'default') use ($stdClass) {
             $this->assertEquals('value1', $key1);
             $this->assertEquals('default', $key2);
             $this->assertEquals('value2', $lowKey);