top-think / framework

src/think/middleware/TraceDebug.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\middleware;
 
@@ -61,7 +61,7 @@ 
         // 注册日志监听
         if ($debug) {
             $this->log = [];
-            $this->app->event->listen(LogWrite::class, function ($event) {
+            $this->app->event->listen(LogWrite::class, function($event) {
                 if (empty($this->config['channel']) || $this->config['channel'] == $event->channel) {
                     $this->log = array_merge_recursive($this->log, $event->log);
                 }
@@ -99,9 +99,9 @@ 
                 // trace调试信息注入
                 $pos = strripos($content, '</body>');
                 if (false !== $pos) {
-                    $content = substr($content, 0, $pos) . $output . substr($content, $pos);
+                    $content = substr($content, 0, $pos).$output.substr($content, $pos);
                 } else {
-                    $content = $content . $output;
+                    $content = $content.$output;
                 }
             }
         }

src/think/Container.php

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -131,7 +131,7 @@ 
             return $this->make($abstract);
         }
 
-        throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract);
+        throw new ClassNotFoundException('class not exists: '.$abstract, $abstract);
     }
 
     /**
@@ -301,7 +301,7 @@ 
             } else {
                 $function .= '()';
             }
-            throw new Exception('function not exists: ' . $function, 0, $e);
+            throw new Exception('function not exists: '.$function, 0, $e);
         }
     }
 
@@ -334,12 +334,12 @@ 
         } catch (ReflectionException $e) {
             if (is_array($method)) {
                 $class    = is_object($method[0]) ? get_class($method[0]) : $method[0];
-                $callback = $class . '::' . $method[1];
+                $callback = $class.'::'.$method[1];
             } else {
                 $callback = $method;
             }
 
-            throw new Exception('method not exists: ' . $callback . '()', 0, $e);
+            throw new Exception('method not exists: '.$callback.'()', 0, $e);
         }
     }
 
@@ -406,7 +406,7 @@ 
 
             return $object;
         } catch (ReflectionException $e) {
-            throw new ClassNotFoundException('class not exists: ' . $class, $class, $e);
+            throw new ClassNotFoundException('class not exists: '.$class, $class, $e);
         }
     }
 
@@ -467,7 +467,7 @@ 
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $param->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('method param miss:' . $name);
+                throw new InvalidArgumentException('method param miss:'.$name);
             }
         }
 
@@ -485,13 +485,13 @@ 
      */
     public static function factory(string $name, string $namespace = '', ...$args)
     {
-        $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name);
+        $class = false !== strpos($name, '\\') ? $name : $namespace.ucwords($name);
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, $args);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 
     /**

src/think/route/dispatch/Url.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route\dispatch;
 
@@ -47,7 +47,7 @@ 
         if ($bind && preg_match('/^[a-z]/is', $bind)) {
             $bind = str_replace('/', $depr, $bind);
             // 如果有模块/控制器绑定
-            $url = $bind . ('.' != substr($bind, -1) ? $depr : '') . ltrim($url, $depr);
+            $url = $bind.('.' != substr($bind, -1) ? $depr : '').ltrim($url, $depr);
         }
 
         $path = $this->rule->parseUrlPath($url);
@@ -59,7 +59,7 @@ 
         $controller = !empty($path) ? array_shift($path) : null;
 
         if ($controller && !preg_match('/^[A-Za-z][\w|\.]*$/', $controller)) {
-            throw new HttpException(404, 'controller not exists:' . $controller);
+            throw new HttpException(404, 'controller not exists:'.$controller);
         }
 
         // 解析操作
@@ -68,7 +68,7 @@ 
 
         // 解析额外参数
         if ($path) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, implode('|', $path));
         }
@@ -86,7 +86,7 @@ 
         $route = [$controller, $action];
 
         if ($this->hasDefinedRoute($route)) {
-            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+            throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url));
         }
 
         return $route;
@@ -103,7 +103,7 @@ 
         list($controller, $action) = $route;
 
         // 检查地址是否被定义过路由
-        $name = strtolower(Str::studly($controller) . '/' . $action);
+        $name = strtolower(Str::studly($controller).'/'.$action);
 
         $host   = $this->request->host(true);
         $method = $this->request->method();

src/think/console/command/optimize/Route.php

Spacing +6 added lines, -6 removed lines

@@ -34,9 +34,9 @@ 
             return false;
         }
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -51,21 +51,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($app ? $app.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/RouteList.php

Spacing +7 added lines, -7 removed lines

@@ -48,9 +48,9 @@ 
         }
 
         if ($app) {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR . 'route_list_' . $app . '.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR.'route_list_'.$app.'.php';
         } else {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'route_list.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'route_list.php';
         }
 
         if (is_file($filename)) {
@@ -60,7 +60,7 @@ 
         }
 
         $content = $this->getRouteList($app);
-        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+        file_put_contents($filename, 'Route List'.PHP_EOL.$content);
     }
 
     protected function getRouteList(string $app = null): string
@@ -69,16 +69,16 @@ 
         $this->app->route->clear();
 
         if ($app) {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.$app.DIRECTORY_SEPARATOR;
         } else {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
         }
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
@@ -117,7 +117,7 @@ 
                 $sort = $this->sortBy[$sort];
             }
 
-            uasort($rows, function ($a, $b) use ($sort) {
+            uasort($rows, function($a, $b) use ($sort) {
                 $itemA = $a[$sort] ?? null;
                 $itemB = $b[$sort] ?? null;
 

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;
 
@@ -404,7 +404,7 @@ 
         ];
         $replacements = [
             $name,
-            $_SERVER['PHP_SELF'] . ' ' . $name,
+            $_SERVER['PHP_SELF'].' '.$name,
         ];
 
         return str_replace($placeholders, $replacements, $this->getHelp());
@@ -508,6 +508,6 @@ 
     protected function isMultiApp(): bool
     {
         $autoMulti = $this->app->config->get('app.auto_multi_app', false);
-        return $autoMulti || !is_dir($this->app->getBasePath() . 'controller');
+        return $autoMulti || !is_dir($this->app->getBasePath().'controller');
     }
 }

src/think/Http.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -57,7 +57,7 @@ 
     public function __construct(App $app)
     {
         $this->app   = $app;
-        $this->multi = is_dir($this->app->getBasePath() . 'controller') ? false : true;
+        $this->multi = is_dir($this->app->getBasePath().'controller') ? false : true;
     }
 
     /**
@@ -193,7 +193,7 @@ 
 
     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;
 
@@ -205,8 +205,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');
         }
     }
 
@@ -221,7 +221,7 @@ 
         $routePath = $this->getRoutePath();
 
         if (is_dir($routePath)) {
-            $files = glob($routePath . '*.php');
+            $files = glob($routePath.'*.php');
             foreach ($files as $file) {
                 include $file;
             }
@@ -237,11 +237,11 @@ 
      */
     protected function getRoutePath(): string
     {
-        if ($this->isMulti() && is_dir($this->app->getAppPath() . 'route')) {
-            return $this->app->getAppPath() . 'route' . DIRECTORY_SEPARATOR;
+        if ($this->isMulti() && is_dir($this->app->getAppPath().'route')) {
+            return $this->app->getAppPath().'route'.DIRECTORY_SEPARATOR;
         }
 
-        return $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($this->isMulti() ? $this->getName() . DIRECTORY_SEPARATOR : '');
+        return $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($this->isMulti() ? $this->getName().DIRECTORY_SEPARATOR : '');
     }
 
     /**
@@ -328,7 +328,7 @@ 
                         $appName = $map[$name];
                     }
                 } elseif ($name && (false !== array_search($name, $map) || in_array($name, $deny))) {
-                    throw new HttpException(404, 'app not exists:' . $name);
+                    throw new HttpException(404, 'app not exists:'.$name);
                 } elseif ($name && isset($map['*'])) {
                     $appName = $map['*'];
                 } else {
@@ -336,7 +336,7 @@ 
                 }
 
                 if ($name) {
-                    $this->app->request->setRoot('/' . $name);
+                    $this->app->request->setRoot('/'.$name);
                     $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : '');
                 }
             }
@@ -355,11 +355,11 @@ 
     {
         $this->name = $appName;
         $this->app->request->setApp($appName);
-        $this->app->setAppPath($this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR);
-        $this->app->setRuntimePath($this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR);
+        $this->app->setAppPath($this->path ?: $this->app->getBasePath().$appName.DIRECTORY_SEPARATOR);
+        $this->app->setRuntimePath($this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$appName.DIRECTORY_SEPARATOR);
 
         // 设置应用命名空间
-        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\' . $appName);
+        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\'.$appName);
 
         //加载应用
         $this->loadApp($appName);
@@ -376,34 +376,34 @@ 
         if (is_dir($this->app->getAppPath())) {
             $appPath = $this->app->getAppPath();
 
-            if (is_file($appPath . 'common.php')) {
-                include_once $appPath . 'common.php';
+            if (is_file($appPath.'common.php')) {
+                include_once $appPath.'common.php';
             }
 
             $configPath = $this->app->getConfigPath();
 
             $files = [];
 
-            if (is_dir($configPath . $appName)) {
-                $files = array_merge($files, glob($configPath . $appName . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
-            } elseif (is_dir($appPath . 'config')) {
-                $files = array_merge($files, glob($appPath . 'config' . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
+            if (is_dir($configPath.$appName)) {
+                $files = array_merge($files, glob($configPath.$appName.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
+            } elseif (is_dir($appPath.'config')) {
+                $files = array_merge($files, glob($appPath.'config'.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
             }
 
             foreach ($files as $file) {
                 $this->app->config->load($file, pathinfo($file, PATHINFO_FILENAME));
             }
 
-            if (is_file($appPath . 'event.php')) {
-                $this->app->loadEvent(include $appPath . 'event.php');
+            if (is_file($appPath.'event.php')) {
+                $this->app->loadEvent(include $appPath.'event.php');
             }
 
-            if (is_file($appPath . 'middleware.php')) {
-                $this->app->middleware->import(include $appPath . 'middleware.php');
+            if (is_file($appPath.'middleware.php')) {
+                $this->app->middleware->import(include $appPath.'middleware.php');
             }
 
-            if (is_file($appPath . 'provider.php')) {
-                $this->app->bind(include $appPath . 'provider.php');
+            if (is_file($appPath.'provider.php')) {
+                $this->app->bind(include $appPath.'provider.php');
             }
         }
 

src/think/console/command/optimize/Schema.php

Spacing +13 added lines, -13 removed lines

@@ -49,21 +49,21 @@ 
             $tables = $this->app->db->getConnection()->getTables($dbName);
         } else {
             if ($app) {
-                $appPath   = $this->app->getBasePath() . $app . DIRECTORY_SEPARATOR;
-                $namespace = 'app\\' . $app;
+                $appPath   = $this->app->getBasePath().$app.DIRECTORY_SEPARATOR;
+                $namespace = 'app\\'.$app;
             } else {
                 $appPath   = $this->app->getBasePath();
                 $namespace = 'app';
             }
 
-            $path = $appPath . 'model';
+            $path = $appPath.'model';
             $list = is_dir($path) ? scandir($path) : [];
 
             foreach ($list as $file) {
                 if (0 === strpos($file, '.')) {
                     continue;
                 }
-                $class = '\\' . $namespace . '\\model\\' . pathinfo($file, PATHINFO_FILENAME);
+                $class = '\\'.$namespace.'\\model\\'.pathinfo($file, PATHINFO_FILENAME);
                 $this->buildModelSchema($class);
             }
 
@@ -71,7 +71,7 @@ 
             return;
         }
 
-        $db = isset($dbName) ? $dbName . '.' : '';
+        $db = isset($dbName) ? $dbName.'.' : '';
         $this->buildDataBaseSchema($schemaPath, $tables, $db);
 
         $output->writeln('<info>Succeed!</info>');
@@ -90,27 +90,27 @@ 
             if (!is_dir($path)) {
                 mkdir($path, 0755, true);
             }
-            $content = '<?php ' . PHP_EOL . 'return ';
+            $content = '<?php '.PHP_EOL.'return ';
             $info    = $model->db()->getConnection()->getTableFieldsInfo($table);
-            $content .= var_export($info, true) . ';';
+            $content .= var_export($info, true).';';
 
-            file_put_contents($path . $dbName . '.' . $table . '.php', $content);
+            file_put_contents($path.$dbName.'.'.$table.'.php', $content);
         }
     }
 
     protected function buildDataBaseSchema(string $path, array $tables, string $db): void
     {
         if ('' == $db) {
-            $dbName = $this->app->db->getConnection()->getConfig('database') . '.';
+            $dbName = $this->app->db->getConnection()->getConfig('database').'.';
         } else {
             $dbName = $db;
         }
 
         foreach ($tables as $table) {
-            $content = '<?php ' . PHP_EOL . 'return ';
-            $info    = $this->app->db->getConnection()->getTableFieldsInfo($db . $table);
-            $content .= var_export($info, true) . ';';
-            file_put_contents($path . $dbName . $table . '.php', $content);
+            $content = '<?php '.PHP_EOL.'return ';
+            $info    = $this->app->db->getConnection()->getTableFieldsInfo($db.$table);
+            $content .= var_export($info, true).';';
+            file_put_contents($path.$dbName.$table.'.php', $content);
         }
     }
 }

src/think/route/RuleItem.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;
 
@@ -134,7 +134,7 @@ 
         $rule = '/' != $rule ? ltrim($rule, '/') : '';
 
         if ($this->parent && $prefix = $this->parent->getFullName()) {
-            $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : '');
+            $rule = $prefix.($rule ? '/'.ltrim($rule, '/') : '');
         }
 
         if (false !== strpos($rule, ':')) {
@@ -237,7 +237,7 @@ 
 
         if (isset($option['ext'])) {
             // 路由ext参数 优先于系统配置的URL伪静态后缀参数
-            $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url);
+            $url = preg_replace('/\.('.$request->ext().')$/i', '', $url);
         }
 
         return $url;
@@ -261,38 +261,38 @@ 
         $pattern = array_merge($this->parent->getPattern(), $this->pattern);
 
         // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . ($completeMatch ? '$' : '') . '/', str_replace('|', $depr, $url))) {
+        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^'.$pattern['__url__'].($completeMatch ? '$' : '').'/', str_replace('|', $depr, $url))) {
             return false;
         }
 
         $var  = [];
-        $url  = $depr . str_replace('|', $depr, $url);
-        $rule = $depr . str_replace('/', $depr, $this->rule);
+        $url  = $depr.str_replace('|', $depr, $url);
+        $rule = $depr.str_replace('/', $depr, $this->rule);
 
         if ($depr == $rule && $depr != $url) {
             return false;
         }
 
         if (false === strpos($rule, '<')) {
-            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
+            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule.$depr, $url.$depr, strlen($rule.$depr)))) {
                 return $var;
             }
             return false;
         }
 
-        $slash = preg_quote('/-' . $depr, '/');
+        $slash = preg_quote('/-'.$depr, '/');
 
-        if ($matchRule = preg_split('/[' . $slash . ']?<\w+\??>/', $rule, 2)) {
+        if ($matchRule = preg_split('/['.$slash.']?<\w+\??>/', $rule, 2)) {
             if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                 return false;
             }
         }
 
-        if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+        if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
             $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
 
             try {
-                if (!preg_match('/^' . $regex . '/u', $url, $match)) {
+                if (!preg_match('/^'.$regex.'/u', $url, $match)) {
                     return false;
                 }
             } catch (\Exception $e) {