top-think / framework

src/think/facade/Console.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\facade;
 

src/think/cache/TagSet.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\cache;
 

src/think/route/Dispatch.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\route;
 

src/think/route/Rule.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\route;
 
@@ -602,7 +602,7 @@ 
     {
         if (is_string($route) && isset($option['prefix'])) {
             // 路由地址前缀
-            $route = $option['prefix'] . $route;
+            $route = $option['prefix'].$route;
         }
 
         // 替换路由地址中的变量
@@ -610,10 +610,10 @@ 
             $search = $replace = [];
 
             foreach ($matches as $key => $value) {
-                $search[]  = '<' . $key . '>';
+                $search[]  = '<'.$key.'>';
                 $replace[] = $value;
 
-                $search[]  = ':' . $key;
+                $search[]  = ':'.$key;
                 $replace[] = $value;
             }
 
@@ -718,7 +718,7 @@ 
         // AJAX PJAX 请求检查
         foreach (['ajax', 'pjax', 'json'] as $item) {
             if (isset($option[$item])) {
-                $call = 'is' . $item;
+                $call = 'is'.$item;
                 if ($option[$item] && !$request->$call() || !$option[$item] && $request->$call()) {
                     return false;
                 }
@@ -726,8 +726,8 @@ 
         }
 
         // 伪静态后缀检测
-        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|' . $option['ext'] . '|', '|' . $request->ext() . '|'))
-            || (isset($option['deny_ext']) && false !== stripos('|' . $option['deny_ext'] . '|', '|' . $request->ext() . '|')))) {
+        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|'.$option['ext'].'|', '|'.$request->ext().'|'))
+            || (isset($option['deny_ext']) && false !== stripos('|'.$option['deny_ext'].'|', '|'.$request->ext().'|')))) {
             return false;
         }
 
@@ -764,7 +764,7 @@ 
     protected function parseUrlParams(string $url, array &$var = []): void
     {
         if ($url) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, $url);
         }
@@ -826,7 +826,7 @@ 
             $regex .= '\/';
         }
 
-        return $regex . ($completeMatch ? '$' : '');
+        return $regex.($completeMatch ? '$' : '');
     }
 
     /**
@@ -843,7 +843,7 @@ 
         $slash    = substr($name, 0, 1);
 
         if (in_array($slash, ['/', '-'])) {
-            $prefix = '\\' . $slash;
+            $prefix = '\\'.$slash;
             $name   = substr($name, 1);
             $slash  = substr($name, 0, 1);
         } else {
@@ -851,7 +851,7 @@ 
         }
 
         if ('<' != $slash) {
-            return $prefix . preg_quote($name, '/');
+            return $prefix.preg_quote($name, '/');
         }
 
         if (strpos($name, '?')) {
@@ -870,7 +870,7 @@ 
             $nameRule = $this->router->config('default_route_pattern');
         }
 
-        return '(' . $prefix . '(?<' . $name . $suffix . '>' . $nameRule . '))' . $optional;
+        return '('.$prefix.'(?<'.$name.$suffix.'>'.$nameRule.'))'.$optional;
     }
 
     /**

src/think/route/RuleName.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\route;
 
@@ -132,7 +132,7 @@ 
                 $val = [];
 
                 foreach (['method', 'rule', 'name', 'route', 'domain', 'pattern', 'option'] as $param) {
-                    $call        = 'get' . $param;
+                    $call        = 'get'.$param;
                     $val[$param] = $item->$call();
                 }
 

src/think/service/PaginatorService.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\service;
 
@@ -30,15 +30,15 @@ 
 
     public function boot()
     {
-        Paginator::maker(function (...$args) {
+        Paginator::maker(function(...$args) {
             return $this->app->make(Paginator::class, $args, true);
         });
 
-        Paginator::currentPathResolver(function () {
+        Paginator::currentPathResolver(function() {
             return $this->app->request->baseUrl();
         });
 
-        Paginator::currentPageResolver(function ($varPage = 'page') {
+        Paginator::currentPageResolver(function($varPage = 'page') {
 
             $page = $this->app->request->param($varPage);
 

src/think/service/ValidateService.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\service;
 
@@ -22,7 +22,7 @@ 
 {
     public function boot()
     {
-        Validate::maker(function (Validate $validate) {
+        Validate::maker(function(Validate $validate) {
             $validate->setLang($this->app->lang);
             $validate->setDb($this->app->db);
             $validate->setRequest($this->app->request);

src/think/console/output/driver/Console.php

Spacing +4 added lines, -4 removed lines

@@ -231,7 +231,7 @@ 
             proc_close($process);
 
             if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return $matches[2] . 'x' . $matches[1];
+                return $matches[2].'x'.$matches[1];
             }
         }
         return;
@@ -264,7 +264,7 @@ 
         $lines      = [];
         $line       = '';
         foreach (preg_split('//u', $utf8String) as $char) {
-            if (mb_strwidth($line . $char, 'utf8') <= $width) {
+            if (mb_strwidth($line.$char, 'utf8') <= $width) {
                 $line .= $char;
                 continue;
             }
@@ -340,7 +340,7 @@ 
         if (null === $stream) {
             $stream = $this->stdout;
         }
-        if (false === @fwrite($stream, $message . ($newline ? PHP_EOL : ''))) {
+        if (false === @fwrite($stream, $message.($newline ? PHP_EOL : ''))) {
             throw new \RuntimeException('Unable to write output.');
         }
 
@@ -356,7 +356,7 @@ 
     {
         if (DIRECTORY_SEPARATOR === '\\') {
             return
-            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
+            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
             || false !== getenv('ANSICON')
             || 'ON' === getenv('ConEmuANSI')
             || 'xterm' === getenv('TERM');

src/think/console/output/Descriptor.php

Spacing +7 added lines, -7 removed lines

@@ -86,7 +86,7 @@ 
         $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
 
         $this->writeText(sprintf("  <info>%s</info>%s%s%s", $argument->getName(), str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*\R\s*/', PHP_EOL . str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
+            preg_replace('/\s*\R\s*/', PHP_EOL.str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
     }
 
     /**
@@ -108,10 +108,10 @@ 
 
         $value = '';
         if ($option->acceptValue()) {
-            $value = '=' . strtoupper($option->getName());
+            $value = '='.strtoupper($option->getName());
 
             if ($option->isValueOptional()) {
-                $value = '[' . $value . ']';
+                $value = '['.$value.']';
             }
         }
 
@@ -121,7 +121,7 @@ 
         $spacingWidth = $totalWidth - strlen($synopsis) + 2;
 
         $this->writeText(sprintf("  <info>%s</info>%s%s%s%s", $synopsis, str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*\R\s*/', "\n" . str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
+            preg_replace('/\s*\R\s*/', "\n".str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
     }
 
     /**
@@ -184,7 +184,7 @@ 
         $this->writeText('<comment>Usage:</comment>', $options);
         foreach (array_merge([$command->getSynopsis(true)], $command->getAliases(), $command->getUsages()) as $usage) {
             $this->writeText("\n");
-            $this->writeText('  ' . $usage, $options);
+            $this->writeText('  '.$usage, $options);
         }
         $this->writeText("\n");
 
@@ -199,7 +199,7 @@ 
             $this->writeText("\n");
             $this->writeText('<comment>Help:</comment>', $options);
             $this->writeText("\n");
-            $this->writeText(' ' . str_replace("\n", "\n ", $help), $options);
+            $this->writeText(' '.str_replace("\n", "\n ", $help), $options);
             $this->writeText("\n");
         }
     }
@@ -247,7 +247,7 @@ 
             foreach ($description->getNamespaces() as $namespace) {
                 if (!$describedNamespace && ConsoleDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
                     $this->writeText("\n");
-                    $this->writeText(' <comment>' . $namespace['id'] . '</comment>', $options);
+                    $this->writeText(' <comment>'.$namespace['id'].'</comment>', $options);
                 }
 
                 foreach ($namespace['commands'] as $name) {