top-think / framework

src/think/console/command/optimize/Route.php

Spacing +6 added lines, -6 removed lines

@@ -29,9 +29,9 @@ 
     {
         $dir = $input->getArgument('dir') ?: '';
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -46,21 +46,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '');
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
         //触发路由载入完成事件
         $this->app->event->trigger(RouteLoaded::class);
 
-        $content = '<?php ' . PHP_EOL . 'return ';
-        $content .= '\Opis\Closure\unserialize(\'' . \Opis\Closure\serialize($this->app->route->getName()) . '\');';
+        $content = '<?php '.PHP_EOL.'return ';
+        $content .= '\Opis\Closure\unserialize(\''.\Opis\Closure\serialize($this->app->route->getName()).'\');';
         return $content;
     }
 

src/think/console/command/RouteList.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
     {
         $dir = $input->getArgument('dir') ?: '';
 
-        $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '') . 'route_list.php';
+        $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '').'route_list.php';
 
         if (is_file($filename)) {
             unlink($filename);
@@ -51,7 +51,7 @@ 
         }
 
         $content = $this->getRouteList($dir);
-        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+        file_put_contents($filename, 'Route List'.PHP_EOL.$content);
     }
 
     protected function getRouteList(string $dir = null): string
@@ -60,16 +60,16 @@ 
         $this->app->route->clear();
 
         if ($dir) {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
         } else {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
         }
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
@@ -108,7 +108,7 @@ 
                 $sort = $this->sortBy[$sort];
             }
 
-            uasort($rows, function ($a, $b) use ($sort) {
+            uasort($rows, function($a, $b) use ($sort) {
                 $itemA = $a[$sort] ?? null;
                 $itemB = $b[$sort] ?? null;
 

tests/MiddlewareTest.php

Spacing +6 added lines, -6 removed lines

@@ -64,9 +64,9 @@ 
 
         $this->middleware->add('foo');
         $this->assertEquals(3, count($this->middleware->all()));
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
         $this->assertEquals(5, count($this->middleware->all()));
     }
@@ -85,10 +85,10 @@ 
         $handle->shouldReceive('report')->with($e)->andReturnNull();
         $handle->shouldReceive('render')->with($request, $e)->andReturn($response);
 
-        $foo->shouldReceive('handle')->once()->andReturnUsing(function ($request, $next) {
+        $foo->shouldReceive('handle')->once()->andReturnUsing(function($request, $next) {
             return $next($request);
         });
-        $bar->shouldReceive('handle')->once()->andReturnUsing(function ($request, $next) use ($e) {
+        $bar->shouldReceive('handle')->once()->andReturnUsing(function($request, $next) use ($e) {
             $next($request);
             throw  $e;
         });
@@ -99,13 +99,13 @@ 
 
         $this->config->shouldReceive('get')->once()->with('middleware.priority', [])->andReturn(['FooMiddleware', 'BarMiddleware']);
 
-        $this->middleware->import([function ($request, $next) {
+        $this->middleware->import([function($request, $next) {
             return $next($request);
         }, 'BarMiddleware', 'FooMiddleware']);
 
         $this->assertInstanceOf(Pipeline::class, $pipeline = $this->middleware->pipeline());
 
-        $pipeline->send($request)->then(function ($request) use ($e, $response) {
+        $pipeline->send($request)->then(function($request) use ($e, $response) {
             throw $e;
         });
 

src/think/exception/Handle.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\exception;
 
@@ -73,7 +73,7 @@ 
             }
 
             if ($this->app->config->get('log.record_trace')) {
-                $log .= PHP_EOL . $exception->getTraceAsString();
+                $log .= PHP_EOL.$exception->getTraceAsString();
             }
 
             $this->app->log->record($log, 'error');
@@ -213,7 +213,7 @@ 
         ob_start();
         $data = $this->convertExceptionToArray($exception);
         extract($data);
-        include $this->app->config->get('app.exception_tmpl') ?: __DIR__ . '/../../tpl/think_exception.tpl';
+        include $this->app->config->get('app.exception_tmpl') ?: __DIR__.'/../../tpl/think_exception.tpl';
 
         return ob_get_clean();
     }
@@ -255,10 +255,10 @@ 
 
         if (strpos($message, ':')) {
             $name    = strstr($message, ':', true);
-            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+            $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message;
         } elseif (strpos($message, ',')) {
             $name    = strstr($message, ',', true);
-            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+            $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message;
         } elseif ($lang->has($message)) {
             $message = $lang->get($message);
         }

src/think/session/driver/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\session\driver;
 
@@ -39,7 +39,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;
         }
@@ -76,7 +76,7 @@ 
         $lifetime = $this->config['expire'];
         $now      = time();
 
-        $files = $this->findFiles($this->config['path'], function (SplFileInfo $item) use ($lifetime, $now) {
+        $files = $this->findFiles($this->config['path'], function(SplFileInfo $item) use ($lifetime, $now) {
             return $now - $lifetime > $item->getMTime();
         });
 
@@ -118,12 +118,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;
+        $filename = $this->config['path'].$name;
         $dir      = dirname($filename);
 
         if ($auto && !is_dir($dir)) {

src/think/Container.php

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -129,7 +129,7 @@ 
             return $this->make($abstract);
         }
 
-        throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract);
+        throw new ClassNotFoundException('class not exists: '.$abstract, $abstract);
     }
 
     /**
@@ -298,7 +298,7 @@ 
             } else {
                 $function .= '()';
             }
-            throw new Exception('function not exists: ' . $function, 0, $e);
+            throw new Exception('function not exists: '.$function, 0, $e);
         }
     }
 
@@ -331,12 +331,12 @@ 
         } catch (ReflectionException $e) {
             if (is_array($method)) {
                 $class    = is_object($method[0]) ? get_class($method[0]) : $method[0];
-                $callback = $class . '::' . $method[1];
+                $callback = $class.'::'.$method[1];
             } else {
                 $callback = $method;
             }
 
-            throw new Exception('method not exists: ' . $callback . '()', 0, $e);
+            throw new Exception('method not exists: '.$callback.'()', 0, $e);
         }
     }
 
@@ -382,7 +382,7 @@ 
     public function invokeClass(string $class, array $vars = [])
     {
         if (!class_exists($class)) {
-            throw new ClassNotFoundException('class not exists: ' . $class, $class);
+            throw new ClassNotFoundException('class not exists: '.$class, $class);
         }
 
         $reflect = new ReflectionClass($class);
@@ -464,7 +464,7 @@ 
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $param->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('method param miss:' . $name);
+                throw new InvalidArgumentException('method param miss:'.$name);
             }
         }
 
@@ -482,13 +482,13 @@ 
      */
     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);
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, $args);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 
     /**

src/think/route/dispatch/Controller.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route\dispatch;
 
@@ -53,7 +53,7 @@ 
 
         if (strpos($controller, '.')) {
             $pos              = strrpos($controller, '.');
-            $this->controller = substr($controller, 0, $pos) . '.' . Str::studly(substr($controller, $pos + 1));
+            $this->controller = substr($controller, 0, $pos).'.'.Str::studly(substr($controller, $pos + 1));
         } else {
             $this->controller = Str::studly($controller);
         }
@@ -73,7 +73,7 @@ 
             // 实例化控制器
             $instance = $this->controller($this->controller);
         } catch (ClassNotFoundException $e) {
-            throw new HttpException(404, 'controller not exists:' . $e->getClass());
+            throw new HttpException(404, 'controller not exists:'.$e->getClass());
         }
 
         // 注册控制器中间件
@@ -81,9 +81,9 @@ 
 
         return $this->app->middleware->pipeline('controller')
             ->send($this->request)
-            ->then(function () use ($instance) {
+            ->then(function() use ($instance) {
                 // 获取当前操作名
-                $action = $this->actionName . $this->rule->config('action_suffix');
+                $action = $this->actionName.$this->rule->config('action_suffix');
 
                 if (is_callable([$instance, $action])) {
                     $vars = $this->request->param();
@@ -99,7 +99,7 @@ 
                     }
                 } else {
                     // 操作不存在
-                    throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
+                    throw new HttpException(404, 'method not exists:'.get_class($instance).'->'.$action.'()');
                 }
 
                 $data = $this->app->invokeReflectMethod($instance, $reflect, $vars);
@@ -126,11 +126,11 @@ 
 
             foreach ($middlewares as $key => $val) {
                 if (!is_int($key)) {
-                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function ($item) {
+                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function($item) {
                             return strtolower($item);
                         }, is_string($val['only']) ? explode(",", $val['only']) : $val['only']))) {
                         continue;
-                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function ($item) {
+                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function($item) {
                             return strtolower($item);
                         }, is_string($val['except']) ? explode(',', $val['except']) : $val['except']))) {
                         continue;
@@ -162,14 +162,14 @@ 
         $controllerLayer = $this->rule->config('controller_layer') ?: 'controller';
         $emptyController = $this->rule->config('empty_controller') ?: 'Error';
 
-        $class = $this->app->parseClass($controllerLayer, $name . $suffix);
+        $class = $this->app->parseClass($controllerLayer, $name.$suffix);
 
         if (class_exists($class)) {
             return $this->app->make($class, [], true);
-        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController . $suffix))) {
+        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController.$suffix))) {
             return $this->app->make($emptyClass, [], true);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 }

src/think/Route.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;
 
@@ -170,9 +170,9 @@ 
         $this->ruleName = new RuleName();
         $this->setDefaultDomain();
 
-        if (is_file($this->app->getRuntimePath() . 'route.php')) {
+        if (is_file($this->app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $this->import(include $this->app->getRuntimePath() . 'route.php');
+            $this->import(include $this->app->getRuntimePath().'route.php');
         }
     }
 
@@ -406,14 +406,14 @@ 
         if (is_null($domain)) {
             $domain = $this->host;
         } elseif (false === strpos($domain, '.') && $this->request) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         if ($this->request) {
             $subDomain = $this->request->subDomain();
 
             if (strpos($subDomain, '.')) {
-                $name = '*' . strstr($subDomain, '.');
+                $name = '*'.strstr($subDomain, '.');
             }
         }
 
@@ -746,7 +746,7 @@ 
         $this->init();
 
         if ($withRoute) {
-            $checkCallback = function () use ($withRoute) {
+            $checkCallback = function() use ($withRoute) {
                 //加载路由
                 $withRoute();
                 return $this->check();
@@ -767,7 +767,7 @@ 
 
         return $this->app->middleware->pipeline('route')
             ->send($request)
-            ->then(function () use ($dispatch) {
+            ->then(function() use ($dispatch) {
                 return $dispatch->run();
             });
     }
@@ -784,7 +784,7 @@ 
             $closure  = $this->config['route_check_cache_key'];
             $routeKey = $closure($request);
         } else {
-            $routeKey = md5($request->baseUrl(true) . ':' . $request->method());
+            $routeKey = md5($request->baseUrl(true).':'.$request->method());
         }
 
         return $routeKey;
@@ -834,10 +834,10 @@ 
             $path = $pathinfo;
         } elseif ($suffix) {
             // 去除正常的URL后缀
-            $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+            $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
         } else {
             // 允许任何后缀访问
-            $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo);
+            $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo);
         }
 
         return $path;
@@ -880,9 +880,9 @@ 
                 $item = $this->domains[$this->host];
             } elseif (isset($this->domains[$subDomain])) {
                 $item = $this->domains[$subDomain];
-            } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) {
+            } elseif (isset($this->domains['*.'.$domain2]) && !empty($domain3)) {
                 // 泛三级域名
-                $item      = $this->domains['*.' . $domain2];
+                $item      = $this->domains['*.'.$domain2];
                 $panDomain = $domain3;
             } elseif (isset($this->domains['*']) && !empty($domain2)) {
                 // 泛二级域名

src/think/route/Url.php

Spacing +19 added lines, -19 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;
     }
 
     /**
@@ -248,7 +248,7 @@ 
             $action     = array_pop($path);
             $controller = empty($path) ? $controller : array_pop($path);
 
-            $url = $controller . '/' . $action;
+            $url = $controller.'/'.$action;
         }
 
         return $url;
@@ -295,7 +295,7 @@ 
     {
         $request = $this->app->request;
         if (is_string($allowDomain) && false === strpos($allowDomain, '.')) {
-            $allowDomain .= '.' . $request->rootDomain();
+            $allowDomain .= '.'.$request->rootDomain();
         }
         $port = $request->port();
 
@@ -314,7 +314,7 @@ 
             }
 
             if ($port && !in_array($port, [80, 443])) {
-                $domain .= ':' . $port;
+                $domain .= ':'.$port;
             }
 
             if (empty($pattern)) {
@@ -325,12 +325,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 {
@@ -358,7 +358,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, '/')) {
@@ -385,7 +385,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);
@@ -411,7 +411,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);
@@ -449,7 +449,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -459,33 +459,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()