Completed
Pull Request — 6.0 (#1913)
by yun
09:37 queued 04:47
created
src/think/Console.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 // +----------------------------------------------------------------------
7 7
 // | Author: zhangyajun <[email protected]>
8 8
 // +----------------------------------------------------------------------
9
-declare (strict_types = 1);
9
+declare(strict_types=1);
10 10
 
11 11
 namespace think;
12 12
 
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 
265 265
         $command = $this->find($name);
266 266
 
267
-        $this->app->log->info('run: php think ' . $input);
267
+        $this->app->log->info('run: php think '.$input);
268 268
 
269 269
         return $this->doRunCommand($command, $input, $output);
270 270
     }
@@ -469,10 +469,10 @@  discard block
 block discarded – undo
469 469
     public function findNamespace(string $namespace): string
470 470
     {
471 471
         $allNamespaces = $this->getNamespaces();
472
-        $expr          = preg_replace_callback('{([^:]+|)}', function ($matches) {
473
-            return preg_quote($matches[1]) . '[^:]*';
472
+        $expr          = preg_replace_callback('{([^:]+|)}', function($matches) {
473
+            return preg_quote($matches[1]).'[^:]*';
474 474
         }, $namespace);
475
-        $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
475
+        $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
476 476
 
477 477
         if (empty($namespaces)) {
478 478
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@@ -509,13 +509,13 @@  discard block
 block discarded – undo
509 509
     {
510 510
         $allCommands = array_keys($this->commands);
511 511
 
512
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
513
-            return preg_quote($matches[1]) . '[^:]*';
512
+        $expr = preg_replace_callback('{([^:]+|)}', function($matches) {
513
+            return preg_quote($matches[1]).'[^:]*';
514 514
         }, $name);
515 515
 
516
-        $commands = preg_grep('{^' . $expr . '}', $allCommands);
516
+        $commands = preg_grep('{^'.$expr.'}', $allCommands);
517 517
 
518
-        if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
518
+        if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) {
519 519
             if (false !== $pos = strrpos($name, ':')) {
520 520
                 $this->findNamespace(substr($name, 0, $pos));
521 521
             }
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
             }
710 710
         }
711 711
 
712
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
712
+        $alternatives = array_filter($alternatives, function($lev) use ($threshold) {
713 713
             return $lev < 2 * $threshold;
714 714
         });
715 715
         asort($alternatives);
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 
731 731
         foreach ($parts as $part) {
732 732
             if (count($namespaces)) {
733
-                $namespaces[] = end($namespaces) . ':' . $part;
733
+                $namespaces[] = end($namespaces).':'.$part;
734 734
             } else {
735 735
                 $namespaces[] = $part;
736 736
             }
Please login to merge, or discard this patch.
src/think/view/driver/Php.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\view\driver;
14 14
 
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
77 77
 
78 78
         // 模板不存在 抛出异常
79 79
         if (!is_file($template)) {
80
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
80
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
81 81
         }
82 82
 
83 83
         $this->template = $template;
84 84
 
85 85
         // 记录视图信息
86 86
         $this->app->log
87
-            ->record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
87
+            ->record('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
88 88
 
89 89
         extract($data, EXTR_OVERWRITE);
90 90
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         $this->content = $content;
104 104
 
105 105
         extract($data, EXTR_OVERWRITE);
106
-        eval('?>' . $this->content);
106
+        eval('?>'.$this->content);
107 107
     }
108 108
 
109 109
     /**
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
     private function parseTemplate(string $template): string
116 116
     {
117 117
         if (empty($this->config['view_base'])) {
118
-            $this->config['view_base'] = $this->app->getRootPath() . 'view' . DIRECTORY_SEPARATOR;
118
+            $this->config['view_base'] = $this->app->getRootPath().'view'.DIRECTORY_SEPARATOR;
119 119
         }
120 120
 
121 121
         $request = $this->app->request;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         } else {
132 132
             $app = isset($app) ? $app : $request->app();
133 133
             // 基础视图目录
134
-            $path = $this->config['view_base'] . ($app ? $app . DIRECTORY_SEPARATOR : '');
134
+            $path = $this->config['view_base'].($app ? $app.DIRECTORY_SEPARATOR : '');
135 135
         }
136 136
 
137 137
         $depr = $this->config['view_depr'];
@@ -151,16 +151,16 @@  discard block
 block discarded – undo
151 151
                         $template = App::parseName($request->action());
152 152
                     }
153 153
 
154
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
154
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
155 155
                 } elseif (false === strpos($template, $depr)) {
156
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
156
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
157 157
                 }
158 158
             }
159 159
         } else {
160 160
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
161 161
         }
162 162
 
163
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
163
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
164 164
     }
165 165
 
166 166
     /**
Please login to merge, or discard this patch.
src/think/App.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think;
14 14
 
@@ -155,13 +155,13 @@  discard block
 block discarded – undo
155 155
      */
156 156
     public function __construct(string $rootPath = '')
157 157
     {
158
-        $this->thinkPath   = dirname(__DIR__) . DIRECTORY_SEPARATOR;
159
-        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
160
-        $this->appPath     = $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
161
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
158
+        $this->thinkPath   = dirname(__DIR__).DIRECTORY_SEPARATOR;
159
+        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
160
+        $this->appPath     = $this->rootPath.'app'.DIRECTORY_SEPARATOR;
161
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
162 162
 
163
-        if (is_file($this->appPath . 'provider.php')) {
164
-            $this->bind(include $this->appPath . 'provider.php');
163
+        if (is_file($this->appPath.'provider.php')) {
164
+            $this->bind(include $this->appPath.'provider.php');
165 165
         }
166 166
 
167 167
         static::setInstance($this);
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
     public function getService($service)
222 222
     {
223 223
         $name = is_string($service) ? $service : get_class($service);
224
-        return array_values(array_filter($this->services, function ($value) use ($name) {
224
+        return array_values(array_filter($this->services, function($value) use ($name) {
225 225
             return $value instanceof $name;
226 226
         }, ARRAY_FILTER_USE_BOTH))[0] ?? null;
227 227
     }
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
      */
298 298
     public function getBasePath(): string
299 299
     {
300
-        return $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
300
+        return $this->rootPath.'app'.DIRECTORY_SEPARATOR;
301 301
     }
302 302
 
303 303
     /**
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
      */
356 356
     public function getConfigPath(): string
357 357
     {
358
-        return $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
358
+        return $this->rootPath.'config'.DIRECTORY_SEPARATOR;
359 359
     }
360 360
 
361 361
     /**
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
         $this->beginMem  = memory_get_usage();
402 402
 
403 403
         // 加载环境变量
404
-        if (is_file($this->rootPath . '.env')) {
405
-            $this->env->load($this->rootPath . '.env');
404
+        if (is_file($this->rootPath.'.env')) {
405
+            $this->env->load($this->rootPath.'.env');
406 406
         }
407 407
 
408 408
         $this->configExt = $this->env->get('config_ext', '.php');
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
         // 加载框架默认语言包
416 416
         $langSet = $this->lang->defaultLangSet();
417 417
 
418
-        $this->lang->load($this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $langSet . '.php');
418
+        $this->lang->load($this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$langSet.'.php');
419 419
 
420 420
         // 加载应用默认语言包
421 421
         $this->loadLangPack($langSet);
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
         }
455 455
 
456 456
         // 加载系统语言包
457
-        $files = glob($this->appPath . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
457
+        $files = glob($this->appPath.'lang'.DIRECTORY_SEPARATOR.$langset.'.*');
458 458
         $this->lang->load($files);
459 459
 
460 460
         // 加载扩展(自定义)语言包
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
      */
473 473
     public function boot(): void
474 474
     {
475
-        array_walk($this->services, function ($service) {
475
+        array_walk($this->services, function($service) {
476 476
             $this->bootService($service);
477 477
         });
478 478
     }
@@ -486,30 +486,30 @@  discard block
 block discarded – undo
486 486
     {
487 487
         $appPath = $this->getAppPath();
488 488
 
489
-        if (is_file($appPath . 'common.php')) {
490
-            include_once $appPath . 'common.php';
489
+        if (is_file($appPath.'common.php')) {
490
+            include_once $appPath.'common.php';
491 491
         }
492 492
 
493
-        include_once $this->thinkPath . 'helper.php';
493
+        include_once $this->thinkPath.'helper.php';
494 494
 
495 495
         $configPath = $this->getConfigPath();
496 496
 
497 497
         $files = [];
498 498
 
499 499
         if (is_dir($configPath)) {
500
-            $files = glob($configPath . '*' . $this->configExt);
500
+            $files = glob($configPath.'*'.$this->configExt);
501 501
         }
502 502
 
503 503
         foreach ($files as $file) {
504 504
             $this->config->load($file, pathinfo($file, PATHINFO_FILENAME));
505 505
         }
506 506
 
507
-        if (is_file($appPath . 'event.php')) {
508
-            $this->loadEvent(include $appPath . 'event.php');
507
+        if (is_file($appPath.'event.php')) {
508
+            $this->loadEvent(include $appPath.'event.php');
509 509
         }
510 510
 
511
-        if (is_file($appPath . 'service.php')) {
512
-            $services = include $appPath . 'service.php';
511
+        if (is_file($appPath.'service.php')) {
512
+            $services = include $appPath.'service.php';
513 513
             foreach ($services as $service) {
514 514
                 $this->register($service);
515 515
             }
@@ -574,9 +574,9 @@  discard block
 block discarded – undo
574 574
         $name  = str_replace(['/', '.'], '\\', $name);
575 575
         $array = explode('\\', $name);
576 576
         $class = self::parseName(array_pop($array), 1);
577
-        $path  = $array ? implode('\\', $array) . '\\' : '';
577
+        $path  = $array ? implode('\\', $array).'\\' : '';
578 578
 
579
-        return $this->namespace . '\\' . $layer . '\\' . $path . $class;
579
+        return $this->namespace.'\\'.$layer.'\\'.$path.$class;
580 580
     }
581 581
 
582 582
     /**
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
     {
598 598
         $path = dirname(dirname(dirname(dirname($this->thinkPath))));
599 599
 
600
-        return $path . DIRECTORY_SEPARATOR;
600
+        return $path.DIRECTORY_SEPARATOR;
601 601
     }
602 602
 
603 603
     /**
Please login to merge, or discard this patch.
src/think/Db.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think;
14 14
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
     public function event(string $event, callable $callback): void
83 83
     {
84 84
         if ($this->event) {
85
-            $this->event->listen('db.' . $event, $callback);
85
+            $this->event->listen('db.'.$event, $callback);
86 86
         }
87 87
     }
88 88
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     public function trigger(string $event, $params = null, bool $once = false)
98 98
     {
99 99
         if ($this->event) {
100
-            return $this->event->trigger('db.' . $event, $params, $once);
100
+            return $this->event->trigger('db.'.$event, $params, $once);
101 101
         }
102 102
     }
103 103
 }
Please login to merge, or discard this patch.
src/helper.php 1 patch
Spacing   +13 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 //------------------------
14 14
 // ThinkPHP 助手函数
@@ -227,12 +227,12 @@  discard block
 block discarded – undo
227 227
         $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
228 228
 
229 229
         if (PHP_SAPI == 'cli') {
230
-            $output = PHP_EOL . $output . PHP_EOL;
230
+            $output = PHP_EOL.$output.PHP_EOL;
231 231
         } else {
232 232
             if (!extension_loaded('xdebug')) {
233 233
                 $output = htmlspecialchars($output, ENT_SUBSTITUTE);
234 234
             }
235
-            $output = '<pre>' . $output . '</pre>';
235
+            $output = '<pre>'.$output.'</pre>';
236 236
         }
237 237
 
238 238
         echo $output;
@@ -311,8 +311,7 @@  discard block
 block discarded – undo
311 311
         }
312 312
 
313 313
         return isset($has) ?
314
-            request()->has($key, $method) :
315
-            request()->$method($key, $default, $filter);
314
+            request()->has($key, $method) : request()->$method($key, $default, $filter);
316 315
     }
317 316
 }
318 317
 
@@ -389,7 +388,7 @@  discard block
 block discarded – undo
389 388
     function parse_name(string $name, int $type = 0, bool $ucfirst = true): string
390 389
     {
391 390
         if ($type) {
392
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
391
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
393 392
                 return strtoupper($match[1]);
394 393
             }, $name);
395 394
 
@@ -494,7 +493,7 @@  discard block
 block discarded – undo
494 493
     {
495 494
         $token = Request::buildToken($name, $type);
496 495
 
497
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
496
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
498 497
     }
499 498
 }
500 499
 
@@ -509,7 +508,7 @@  discard block
 block discarded – undo
509 508
     {
510 509
         $token = Request::buildToken($name, $type);
511 510
 
512
-        return '<meta name="csrf-token" content="' . $token . '">';
511
+        return '<meta name="csrf-token" content="'.$token.'">';
513 512
     }
514 513
 }
515 514
 
@@ -651,7 +650,7 @@  discard block
 block discarded – undo
651 650
      */
652 651
     function app_path($path = '')
653 652
     {
654
-        return app()->getAppPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
653
+        return app()->getAppPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
655 654
     }
656 655
 }
657 656
 
@@ -664,7 +663,7 @@  discard block
 block discarded – undo
664 663
      */
665 664
     function base_path($path = '')
666 665
     {
667
-        return app()->getBasePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
666
+        return app()->getBasePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
668 667
     }
669 668
 }
670 669
 
@@ -677,7 +676,7 @@  discard block
 block discarded – undo
677 676
      */
678 677
     function config_path($path = '')
679 678
     {
680
-        return app()->getConfigPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
679
+        return app()->getConfigPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
681 680
     }
682 681
 }
683 682
 
@@ -690,7 +689,7 @@  discard block
 block discarded – undo
690 689
      */
691 690
     function public_path($path = '')
692 691
     {
693
-        return app()->getRootPath() . ($path ? ltrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path);
692
+        return app()->getRootPath().($path ? ltrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $path);
694 693
     }
695 694
 }
696 695
 
@@ -703,7 +702,7 @@  discard block
 block discarded – undo
703 702
      */
704 703
     function runtime_path($path = '')
705 704
     {
706
-        return app()->getRuntimePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
705
+        return app()->getRuntimePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
707 706
     }
708 707
 }
709 708
 
@@ -716,6 +715,6 @@  discard block
 block discarded – undo
716 715
      */
717 716
     function root_path($path = '')
718 717
     {
719
-        return app()->getRootPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
718
+        return app()->getRootPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
720 719
     }
721 720
 }
Please login to merge, or discard this patch.
src/think/route/dispatch/Controller.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\route\dispatch;
14 14
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
         if (strpos($controller, '.')) {
55 55
             $pos              = strrpos($controller, '.');
56
-            $this->controller = substr($controller, 0, $pos) . App::parseName(substr($controller, $pos), 1);
56
+            $this->controller = substr($controller, 0, $pos).App::parseName(substr($controller, $pos), 1);
57 57
         } else {
58 58
             $this->controller = App::parseName($controller, 1);
59 59
         }
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
             // 实例化控制器
74 74
             $instance = $this->controller($this->controller);
75 75
         } catch (ClassNotFoundException $e) {
76
-            throw new HttpException(404, 'controller not exists:' . $e->getClass());
76
+            throw new HttpException(404, 'controller not exists:'.$e->getClass());
77 77
         }
78 78
 
79 79
         // 注册控制器中间件
80 80
         $this->registerControllerMiddleware($instance);
81 81
 
82
-        $this->app->middleware->controller(function (Request $request, $next) use ($instance) {
82
+        $this->app->middleware->controller(function(Request $request, $next) use ($instance) {
83 83
             // 获取当前操作名
84
-            $action = $this->actionName . $this->rule->config('action_suffix');
84
+            $action = $this->actionName.$this->rule->config('action_suffix');
85 85
 
86 86
             if (is_callable([$instance, $action])) {
87 87
                 $vars = $this->request->param();
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                 }
98 98
             } else {
99 99
                 // 操作不存在
100
-                throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
100
+                throw new HttpException(404, 'method not exists:'.get_class($instance).'->'.$action.'()');
101 101
             }
102 102
 
103 103
             $data = $this->app->invokeReflectMethod($instance, $reflect, $vars);
@@ -126,11 +126,11 @@  discard block
 block discarded – undo
126 126
 
127 127
             foreach ($middlewares as $key => $val) {
128 128
                 if (!is_int($key)) {
129
-                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function ($item) {
129
+                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function($item) {
130 130
                         return strtolower($item);
131 131
                     }, $val['only']))) {
132 132
                         continue;
133
-                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function ($item) {
133
+                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function($item) {
134 134
                         return strtolower($item);
135 135
                     }, $val['except']))) {
136 136
                         continue;
@@ -158,14 +158,14 @@  discard block
 block discarded – undo
158 158
         $controllerLayer = $this->rule->config('controller_layer') ?: 'controller';
159 159
         $emptyController = $this->rule->config('empty_controller') ?: 'Error';
160 160
 
161
-        $class = $this->app->parseClass($controllerLayer, $name . $suffix);
161
+        $class = $this->app->parseClass($controllerLayer, $name.$suffix);
162 162
 
163 163
         if (class_exists($class)) {
164 164
             return $this->app->make($class, [], true);
165
-        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController . $suffix))) {
165
+        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController.$suffix))) {
166 166
             return $this->app->make($emptyClass, [], true);
167 167
         }
168 168
 
169
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
169
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
170 170
     }
171 171
 }
Please login to merge, or discard this patch.
src/think/exception/InvalidArgumentException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 namespace think\exception;
13 13
 
14 14
 use Psr\Cache\InvalidArgumentException as Psr6CacheInvalidArgumentInterface;
Please login to merge, or discard this patch.
src/think/cache/Driver.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\cache;
14 14
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      */
83 83
     public function getCacheKey(string $name): string
84 84
     {
85
-        return $this->options['prefix'] . $name;
85
+        return $this->options['prefix'].$name;
86 86
     }
87 87
 
88 88
     /**
@@ -143,14 +143,14 @@  discard block
 block discarded – undo
143 143
 
144 144
         $time = time();
145 145
 
146
-        while ($time + 5 > time() && $this->has($name . '_lock')) {
146
+        while ($time + 5 > time() && $this->has($name.'_lock')) {
147 147
             // 存在锁定则等待
148 148
             usleep(200000);
149 149
         }
150 150
 
151 151
         try {
152 152
             // 锁定
153
-            $this->set($name . '_lock', true);
153
+            $this->set($name.'_lock', true);
154 154
 
155 155
             if ($value instanceof \Closure) {
156 156
                 // 获取缓存数据
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
             $this->set($name, $value, $expire);
162 162
 
163 163
             // 解锁
164
-            $this->delete($name . '_lock');
164
+            $this->delete($name.'_lock');
165 165
         } catch (\Exception | \throwable $e) {
166
-            $this->delete($name . '_lock');
166
+            $this->delete($name.'_lock');
167 167
             throw $e;
168 168
         }
169 169
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         $key  = implode('-', $name);
183 183
 
184 184
         if (!isset($this->tag[$key])) {
185
-            $name = array_map(function ($val) {
185
+            $name = array_map(function($val) {
186 186
                 return $this->getTagKey($val);
187 187
             }, $name);
188 188
             $this->tag[$key] = new TagSet($name, $this);
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
      */
212 212
     public function getTagKey(string $tag): string
213 213
     {
214
-        return $this->options['tag_prefix'] . md5($tag);
214
+        return $this->options['tag_prefix'].md5($tag);
215 215
     }
216 216
 
217 217
     /**
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
      */
223 223
     protected function serialize($data): string
224 224
     {
225
-        $serialize = $this->options['serialize'][0] ?? function ($data) {
225
+        $serialize = $this->options['serialize'][0] ?? function($data) {
226 226
             SerializableClosure::enterContext();
227 227
             SerializableClosure::wrapClosures($data);
228 228
             $data = \serialize($data);
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
      */
242 242
     protected function unserialize(string $data)
243 243
     {
244
-        $unserialize = $this->options['serialize'][1] ?? function ($data) {
244
+        $unserialize = $this->options['serialize'][1] ?? function($data) {
245 245
             SerializableClosure::enterContext();
246 246
             $data = \unserialize($data);
247 247
             SerializableClosure::unwrapClosures($data);
Please login to merge, or discard this patch.
src/think/cache/driver/File.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\cache\driver;
14 14
 
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
 
68 68
         if ($this->options['cache_subdir']) {
69 69
             // 使用子目录
70
-            $name = substr($name, 0, 2) . DIRECTORY_SEPARATOR . substr($name, 2);
70
+            $name = substr($name, 0, 2).DIRECTORY_SEPARATOR.substr($name, 2);
71 71
         }
72 72
 
73 73
         if ($this->options['prefix']) {
74
-            $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name;
74
+            $name = $this->options['prefix'].DIRECTORY_SEPARATOR.$name;
75 75
         }
76 76
 
77
-        return $this->options['path'] . $name . '.php';
77
+        return $this->options['path'].$name.'.php';
78 78
     }
79 79
 
80 80
     /**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             $data = gzcompress($data, 3);
166 166
         }
167 167
 
168
-        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
168
+        $data   = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data;
169 169
         $result = file_put_contents($filename, $data);
170 170
 
171 171
         if ($result) {
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
242 242
     {
243 243
         $this->writeTimes++;
244 244
 
245
-        $files = (array) glob($this->options['path'] . ($this->options['prefix'] ? $this->options['prefix'] . DIRECTORY_SEPARATOR : '') . '*');
245
+        $files = (array) glob($this->options['path'].($this->options['prefix'] ? $this->options['prefix'].DIRECTORY_SEPARATOR : '').'*');
246 246
 
247 247
         foreach ($files as $path) {
248 248
             if (is_dir($path)) {
249
-                $matches = glob($path . DIRECTORY_SEPARATOR . '*.php');
249
+                $matches = glob($path.DIRECTORY_SEPARATOR.'*.php');
250 250
                 if (is_array($matches)) {
251 251
                     array_map('unlink', $matches);
252 252
                 }
Please login to merge, or discard this patch.