top-think / framework

src/think/Console.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: zhangyajun <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -458,10 +458,10 @@ 
     public function findNamespace(string $namespace): string
     {
         $allNamespaces = $this->getNamespaces();
-        $expr          = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr          = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $namespace);
-        $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
+        $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
 
         if (empty($namespaces)) {
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@@ -498,13 +498,13 @@ 
     {
         $allCommands = array_keys($this->commands);
 
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $name);
 
-        $commands = preg_grep('{^' . $expr . '}', $allCommands);
+        $commands = preg_grep('{^'.$expr.'}', $allCommands);
 
-        if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
+        if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) {
             if (false !== $pos = strrpos($name, ':')) {
                 $this->findNamespace(substr($name, 0, $pos));
             }
@@ -698,7 +698,7 @@ 
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
+        $alternatives = array_filter($alternatives, function($lev) use ($threshold) {
             return $lev < 2 * $threshold;
         });
         asort($alternatives);
@@ -719,7 +719,7 @@ 
 
         foreach ($parts as $part) {
             if (count($namespaces)) {
-                $namespaces[] = end($namespaces) . ':' . $part;
+                $namespaces[] = end($namespaces).':'.$part;
             } else {
                 $namespaces[] = $part;
             }

src/think/Http.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -52,7 +52,7 @@ 
     {
         $this->app = $app;
 
-        $this->routePath = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+        $this->routePath = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -196,14 +196,14 @@ 
 
         return $this->app->middleware->pipeline()
             ->send($request)
-            ->then(function ($request) {
+            ->then(function($request) {
                 return $this->dispatchToRoute($request);
             });
     }
 
     protected function dispatchToRoute($request)
     {
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         }
         : null;
@@ -216,8 +216,8 @@ 
      */
     protected function loadMiddleware(): void
     {
-        if (is_file($this->app->getBasePath() . 'middleware.php')) {
-            $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php');
+        if (is_file($this->app->getBasePath().'middleware.php')) {
+            $this->app->middleware->import(include $this->app->getBasePath().'middleware.php');
         }
     }
 
@@ -232,7 +232,7 @@ 
         $routePath = $this->getRoutePath();
 
         if (is_dir($routePath)) {
-            $files = glob($routePath . '*.php');
+            $files = glob($routePath.'*.php');
             foreach ($files as $file) {
                 include $file;
             }

src/think/console/Command.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\console;
 
@@ -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.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\console;
 
@@ -266,7 +266,7 @@ 
 
         foreach ($this->tokens as $token) {
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value . '=')) {
+                if ($token === $value || 0 === strpos($token, $value.'=')) {
                     return true;
                 }
             }
@@ -290,7 +290,7 @@ 
             $token = array_shift($tokens);
 
             foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value . '=')) {
+                if ($token === $value || 0 === strpos($token, $value.'=')) {
                     if (false !== $pos = strpos($token, '=')) {
                         return substr($token, $pos + 1);
                     }
@@ -447,9 +447,9 @@ 
      */
     public function __toString()
     {
-        $tokens = array_map(function ($token) {
+        $tokens = array_map(function($token) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1] . $this->escapeToken($match[2]);
+                return $match[1].$this->escapeToken($match[2]);
             }
 
             if ($token && '-' !== $token[0]) {

src/think/console/Table.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -207,7 +207,7 @@ 
             $array[] = str_repeat($style[1], $width + 2);
         }
 
-        return $style[0] . implode($style[2], $array) . $style[3] . PHP_EOL;
+        return $style[0].implode($style[2], $array).$style[3].PHP_EOL;
     }
 
     /**
@@ -221,11 +221,11 @@ 
         $content = $this->renderSeparator('top');
 
         foreach ($this->header as $key => $header) {
-            $array[] = ' ' . str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign);
+            $array[] = ' '.str_pad($header, $this->colWidth[$key], $style[1], $this->headerAlign);
         }
 
         if (!empty($array)) {
-            $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL;
+            $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL;
 
             if (!empty($this->rows)) {
                 $content .= $this->renderSeparator('middle');
@@ -268,12 +268,12 @@ 
                     $content .= $this->renderSeparator('middle');
                 } elseif (is_scalar($row)) {
                     $content .= $this->renderSeparator('cross-top');
-                    $width = 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function ($a, $b) {
+                    $width = 3 * (count($this->colWidth) - 1) + array_reduce($this->colWidth, function($a, $b) {
                         return $a + $b;
                     });
                     $array = str_pad($row, $width);
 
-                    $content .= $style[0] . ' ' . $array . ' ' . $style[3] . PHP_EOL;
+                    $content .= $style[0].' '.$array.' '.$style[3].PHP_EOL;
                     $content .= $this->renderSeparator('cross-bottom');
                 } else {
                     $array = [];
@@ -285,10 +285,10 @@ 
                         if (false !== $encoding = mb_detect_encoding((string) $val, null, true)) {
                             $width += strlen((string) $val) - mb_strwidth((string) $val, $encoding);
                         }
-                        $array[] = ' ' . str_pad((string) $val, $width, ' ', $this->cellAlign);
+                        $array[] = ' '.str_pad((string) $val, $width, ' ', $this->cellAlign);
                     }
 
-                    $content .= $style[0] . implode(' ' . $style[2], $array) . ' ' . $style[3] . PHP_EOL;
+                    $content .= $style[0].implode(' '.$style[2], $array).' '.$style[3].PHP_EOL;
                 }
             }
         }

src/think/console/Output.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;
 
@@ -74,7 +74,7 @@ 
 
     public function __construct($driver = 'console')
     {
-        $class = '\\think\\console\\output\\driver\\' . ucwords($driver);
+        $class = '\\think\\console\\output\\driver\\'.ucwords($driver);
 
         $this->handle = new $class($this);
     }
@@ -225,7 +225,7 @@ 
         if ($this->handle && method_exists($this->handle, $method)) {
             return call_user_func_array([$this->handle, $method], $args);
         } else {
-            throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+            throw new Exception('method not exists:'.__CLASS__.'->'.$method);
         }
     }
 }

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() . ($dir ? 'app' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR : '') . 'route' . DIRECTORY_SEPARATOR ;
+        $path = $this->app->getRootPath().($dir ? 'app'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR : '').'route'.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/Version.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\console\command;
 
@@ -27,6 +27,6 @@ 
 
     protected function execute(Input $input, Output $output)
     {
-        $output->writeln('v' . $this->app->version());
+        $output->writeln('v'.$this->app->version());
     }
 }

src/think/console/command/ServiceDiscover.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\console\command;
 
@@ -26,7 +26,7 @@ 
 
     public function execute(Input $input, Output $output)
     {
-        if (is_file($path = $this->app->getRootPath() . 'vendor/composer/installed.json')) {
+        if (is_file($path = $this->app->getRootPath().'vendor/composer/installed.json')) {
             $packages = json_decode(@file_get_contents($path), true);
 
             $services = [];
@@ -36,11 +36,11 @@ 
                 }
             }
 
-            $header = '// This file is automatically generated at:' . date('Y-m-d H:i:s') . PHP_EOL . 'declare (strict_types = 1);' . PHP_EOL;
+            $header = '// This file is automatically generated at:'.date('Y-m-d H:i:s').PHP_EOL.'declare (strict_types = 1);'.PHP_EOL;
 
-            $content = '<?php ' . PHP_EOL . $header . "return " . var_export($services, true) . ';';
+            $content = '<?php '.PHP_EOL.$header."return ".var_export($services, true).';';
 
-            file_put_contents($this->app->getRootPath() . 'vendor/services.php', $content);
+            file_put_contents($this->app->getRootPath().'vendor/services.php', $content);
 
             $output->writeln('<info>Succeed!</info>');
         }