top-think / framework

src/think/route/dispatch/Controller.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route\dispatch;
 
@@ -70,15 +70,15 @@ 
             // 实例化控制器
             $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());
         }
 
         // 注册控制器中间件
         $this->registerControllerMiddleware($instance);
 
-        $this->app->middleware->controller(function (Request $request, $next) use ($instance) {
+        $this->app->middleware->controller(function(Request $request, $next) use ($instance) {
             // 获取当前操作名
-            $action = $this->actionName . $this->rule->config('action_suffix');
+            $action = $this->actionName.$this->rule->config('action_suffix');
 
             if (is_callable([$instance, $action])) {
                 // 自动获取请求变量
@@ -96,7 +96,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);
@@ -125,11 +125,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;
@@ -157,14 +157,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/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/service/ModelService.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()
     {
-        Model::maker(function (Model $model) {
+        Model::maker(function(Model $model) {
             $db     = $this->app->db;
             $config = $this->app->config;
             $model->setDb($db);

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) {

src/think/console/output/Ask.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 
         $that = $this;
 
-        $interviewer = function () use ($that) {
+        $interviewer = function() use ($that) {
             return $that->doAsk();
         };
 
@@ -192,7 +192,7 @@ 
     protected function getHiddenResponse($inputStream)
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
-            $exe = __DIR__ . '/../bin/hiddeninput.exe';
+            $exe = __DIR__.'/../bin/hiddeninput.exe';
 
             $value = rtrim(shell_exec($exe));
             $this->output->writeln('');

src/think/console/Command.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -28,7 +28,7 @@ 
     private $console;
     private $name;
     private $processTitle;
-    private $aliases                         = [];
+    private $aliases = [];
     private $definition;
     private $help;
     private $description;
@@ -404,7 +404,7 @@ 
         ];
         $replacements = [
             $name,
-            $_SERVER['PHP_SELF'] . ' ' . $name,
+            $_SERVER['PHP_SELF'].' '.$name,
         ];
 
         return str_replace($placeholders, $replacements, $this->getHelp());

src/think/console/input/Definition.php

Spacing +3 added lines, -3 removed lines

@@ -356,11 +356,11 @@
         }
 
         foreach ($this->getArguments() as $argument) {
-            $element = '<' . $argument->getName() . '>';
+            $element = '<'.$argument->getName().'>';
             if (!$argument->isRequired()) {
-                $element = '[' . $element . ']';
+                $element = '['.$element.']';
             } elseif ($argument->isArray()) {
-                $element .= ' (' . $element . ')';
+                $element .= ' ('.$element.')';
             }
 
             if ($argument->isArray()) {