top-think / framework

src/think/session/Store.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
      */
     public function setId($id = null): void
     {
-        $this->id = is_string($id) && strlen($id) === 32 ? $id : md5(microtime(true) . uniqid());
+        $this->id = is_string($id) && strlen($id) === 32 ? $id : md5(microtime(true).uniqid());
     }
 
     /**

src/helper.php

Spacing +13 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 //------------------------
 // ThinkPHP 助手函数
@@ -190,12 +190,12 @@ 
         $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
 
         if (PHP_SAPI == 'cli') {
-            $output = PHP_EOL . $output . PHP_EOL;
+            $output = PHP_EOL.$output.PHP_EOL;
         } else {
             if (!extension_loaded('xdebug')) {
                 $output = htmlspecialchars($output, ENT_SUBSTITUTE);
             }
-            $output = '<pre>' . $output . '</pre>';
+            $output = '<pre>'.$output.'</pre>';
         }
 
         echo $output;
@@ -274,8 +274,7 @@ 
         }
 
         return isset($has) ?
-        request()->has($key, $method) :
-        request()->$method($key, $default, $filter);
+        request()->has($key, $method) : request()->$method($key, $default, $filter);
     }
 }
 
@@ -352,7 +351,7 @@ 
     function parse_name(string $name, int $type = 0, bool $ucfirst = true): string
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
 
@@ -459,7 +458,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 
@@ -474,7 +473,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<meta name="csrf-token" content="' . $token . '">';
+        return '<meta name="csrf-token" content="'.$token.'">';
     }
 }
 
@@ -599,7 +598,7 @@ 
      */
     function app_path($path = '')
     {
-        return app()->getAppPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getAppPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -612,7 +611,7 @@ 
      */
     function base_path($path = '')
     {
-        return app()->getBasePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getBasePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -625,7 +624,7 @@ 
      */
     function config_path($path = '')
     {
-        return app()->getConfigPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getConfigPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -638,7 +637,7 @@ 
      */
     function public_path($path = '')
     {
-        return app()->getRootPath() . ($path ? ltrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path);
+        return app()->getRootPath().($path ? ltrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -651,7 +650,7 @@ 
      */
     function runtime_path($path = '')
     {
-        return app()->getRuntimePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getRuntimePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -664,6 +663,6 @@ 
      */
     function root_path($path = '')
     {
-        return app()->getRootPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getRootPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }

tests/MiddlewareTest.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
 
         $this->middleware->add('foo');
         $this->assertEquals(4, count($this->middleware->all()));
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
         $this->assertEquals(5, count($this->middleware->all()));
     }
@@ -83,10 +83,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;
         });
@@ -97,13 +97,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/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/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);
                         }, $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);
                         }, $val['except']))) {
                         continue;
@@ -158,14 +158,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/Pipeline.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
         $pipeline = array_reduce(
             array_reverse($this->pipes),
             $this->carry(),
-            function ($passable) use ($destination) {
+            function($passable) use ($destination) {
                 try {
                     return $destination($passable);
                 } catch (Throwable | Exception $e) {
@@ -78,8 +78,8 @@ 
 
     protected function carry()
     {
-        return function ($stack, $pipe) {
-            return function ($passable) use ($stack, $pipe) {
+        return function($stack, $pipe) {
+            return function($passable) use ($stack, $pipe) {
                 try {
                     return $pipe($passable, $stack);
                 } catch (Throwable | Exception $e) {

src/think/Db.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;
 
@@ -68,7 +68,7 @@ 
     public function getConfig(string $name = '', $default = null)
     {
         if ('' !== $name) {
-            return $this->config->get('database.' . $name, $default);
+            return $this->config->get('database.'.$name, $default);
         }
 
         return $this->config->get('database', []);
@@ -93,7 +93,7 @@ 
     public function event(string $event, callable $callback): void
     {
         if ($this->event) {
-            $this->event->listen('db.' . $event, $callback);
+            $this->event->listen('db.'.$event, $callback);
         }
     }
 
@@ -108,7 +108,7 @@ 
     public function trigger(string $event, $params = null, bool $once = false)
     {
         if ($this->event) {
-            return $this->event->trigger('db.' . $event, $params, $once);
+            return $this->event->trigger('db.'.$event, $params, $once);
         }
     }
 }

tests/DbTest.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $config->shouldReceive('get')->with('database', [])->andReturn([]);
         $this->assertEquals([], $db->getConfig());
 
-        $callback = function () {
+        $callback = function() {
         };
         $event->shouldReceive('listen')->with('db.some', $callback);
         $db->event('some', $callback);

src/think/Validate.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;
 
@@ -367,7 +367,7 @@ 
      */
     public function hasScene(string $name): bool
     {
-        return isset($this->scene[$name]) || method_exists($this, 'scene' . $name);
+        return isset($this->scene[$name]) || method_exists($this, 'scene'.$name);
     }
 
     /**
@@ -719,7 +719,7 @@ 
             if (strpos($field, '_confirm')) {
                 $rule = strstr($field, '_confirm', true);
             } else {
-                $rule = $field . '_confirm';
+                $rule = $field.'_confirm';
             }
         }
 
@@ -870,9 +870,9 @@ 
                 if (isset($this->type[$rule])) {
                     // 注册的验证规则
                     $result = call_user_func_array($this->type[$rule], [$value]);
-                } elseif (function_exists('ctype_' . $rule)) {
+                } elseif (function_exists('ctype_'.$rule)) {
                     // ctype验证规则
-                    $ctypeFun = 'ctype_' . $rule;
+                    $ctypeFun = 'ctype_'.$rule;
                     $result   = $ctypeFun($value);
                 } elseif (isset($this->filter[$rule])) {
                     // Filter_var验证规则
@@ -1510,7 +1510,7 @@ 
 
         if (is_string($rule) && 0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
             // 不是正则表达式则两端补上/
-            $rule = '/^' . $rule . '$/';
+            $rule = '/^'.$rule.'$/';
         }
 
         return is_scalar($value) && 1 === preg_match($rule, (string) $value);
@@ -1560,8 +1560,8 @@ 
      */
     protected function getRuleMsg(string $attribute, string $title, string $type, $rule)
     {
-        if (isset($this->message[$attribute . '.' . $type])) {
-            $msg = $this->message[$attribute . '.' . $type];
+        if (isset($this->message[$attribute.'.'.$type])) {
+            $msg = $this->message[$attribute.'.'.$type];
         } elseif (isset($this->message[$attribute][$type])) {
             $msg = $this->message[$attribute][$type];
         } elseif (isset($this->message[$attribute])) {
@@ -1571,7 +1571,7 @@ 
         } elseif (0 === strpos($type, 'require')) {
             $msg = $this->typeMsg['require'];
         } else {
-            $msg = $title . $this->lang->get('not conform to the rules');
+            $msg = $title.$this->lang->get('not conform to the rules');
         }
 
         if (is_array($msg)) {
@@ -1633,8 +1633,8 @@ 
     {
         $this->only = $this->append = $this->remove = [];
 
-        if (method_exists($this, 'scene' . $scene)) {
-            call_user_func([$this, 'scene' . $scene]);
+        if (method_exists($this, 'scene'.$scene)) {
+            call_user_func([$this, 'scene'.$scene]);
         } elseif (isset($this->scene[$scene])) {
             // 如果设置了验证适用场景
             $this->only = $this->scene[$scene];