top-think / framework

library/think/route/RuleName.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
                     $val['domain'] = $ruleDomain;
 
                     foreach (['method', 'rule', 'name', 'route', 'pattern', 'option'] as $param) {
-                        $call        = 'get' . $param;
+                        $call        = 'get'.$param;
                         $val[$param] = $item->$call();
                     }
 

library/think/route/dispatch/Module.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
                     $module = $bindModule;
                 }
                 $available = true;
-            } elseif (!in_array($module, $this->rule->getConfig('deny_module_list')) && is_dir($this->app->getAppPath() . $module)) {
+            } elseif (!in_array($module, $this->rule->getConfig('deny_module_list')) && is_dir($this->app->getAppPath().$module)) {
                 $available = true;
             } elseif ($this->rule->getConfig('empty_module')) {
                 $module    = $this->rule->getConfig('empty_module');
@@ -59,7 +59,7 @@ 
                 $this->request->setModule($module);
                 $this->app->init($module);
             } else {
-                throw new HttpException(404, 'module not exists:' . $module);
+                throw new HttpException(404, 'module not exists:'.$module);
             }
         }
 
@@ -93,12 +93,12 @@ 
                 $this->rule->getConfig('controller_suffix'),
                 $this->rule->getConfig('empty_controller'));
         } catch (ClassNotFoundException $e) {
-            throw new HttpException(404, 'controller not exists:' . $e->getClass());
+            throw new HttpException(404, 'controller not exists:'.$e->getClass());
         }
 
-        $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->getConfig('action_suffix');
+            $action = $this->actionName.$this->rule->getConfig('action_suffix');
 
             if (is_callable([$instance, $action])) {
                 // 执行操作方法
@@ -123,7 +123,7 @@ 
                 $reflect = new ReflectionMethod($instance, '_empty');
             } else {
                 // 操作不存在
-                throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
+                throw new HttpException(404, 'method not exists:'.get_class($instance).'->'.$action.'()');
             }
 
             $this->app['hook']->listen('action_begin', $call);

library/think/route/dispatch/Url.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
         if (!empty($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);
         }
 
         list($path, $var) = $this->rule->parseUrlPath($url);
@@ -61,7 +61,7 @@ 
         }
 
         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);
         }
 
         // 解析操作
@@ -72,7 +72,7 @@ 
             if ($this->rule->getConfig('url_param_type')) {
                 $var += $path;
             } else {
-                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));
             }
@@ -92,7 +92,7 @@ 
         $route = [$module, $controller, $action];
 
         if ($this->hasDefinedRoute($route, $bind)) {
-            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+            throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url));
         }
 
         return $route;
@@ -110,12 +110,12 @@ 
         list($module, $controller, $action) = $route;
 
         // 检查地址是否被定义过路由
-        $name = strtolower($module . '/' . Loader::parseName($controller, 1) . '/' . $action);
+        $name = strtolower($module.'/'.Loader::parseName($controller, 1).'/'.$action);
 
         $name2 = '';
 
         if (empty($module) || $module == $bind) {
-            $name2 = strtolower(Loader::parseName($controller, 1) . '/' . $action);
+            $name2 = strtolower(Loader::parseName($controller, 1).'/'.$action);
         }
 
         $host = $this->request->host(true);
@@ -138,7 +138,7 @@ 
      */
     protected function autoFindController($module, &$path)
     {
-        $dir    = $this->app->getAppPath() . ($module ? $module . '/' : '') . $this->rule->getConfig('url_controller_layer');
+        $dir    = $this->app->getAppPath().($module ? $module.'/' : '').$this->rule->getConfig('url_controller_layer');
         $suffix = $this->app->getSuffix() || $this->rule->getConfig('controller_suffix') ? ucfirst($this->rule->getConfig('url_controller_layer')) : '';
 
         $item = [];
@@ -146,13 +146,13 @@ 
 
         foreach ($path as $val) {
             $item[] = $val;
-            $file   = $dir . '/' . str_replace('.', '/', $val) . $suffix . '.php';
-            $file   = pathinfo($file, PATHINFO_DIRNAME) . '/' . Loader::parseName(pathinfo($file, PATHINFO_FILENAME), 1) . '.php';
+            $file   = $dir.'/'.str_replace('.', '/', $val).$suffix.'.php';
+            $file   = pathinfo($file, PATHINFO_DIRNAME).'/'.Loader::parseName(pathinfo($file, PATHINFO_FILENAME), 1).'.php';
             if (is_file($file)) {
                 $find = true;
                 break;
             } else {
-                $dir .= '/' . Loader::parseName($val);
+                $dir .= '/'.Loader::parseName($val);
             }
         }
 

library/think/route/Rule.php

Spacing +12 added lines, -12 removed lines

@@ -726,7 +726,7 @@ 
     {
         if (is_string($route) && isset($option['prefix'])) {
             // 路由地址前缀
-            $route = $option['prefix'] . $route;
+            $route = $option['prefix'].$route;
         }
 
         // 替换路由地址中的变量
@@ -734,10 +734,10 @@ 
             $search = $replace = [];
 
             foreach ($matches as $key => $value) {
-                $search[]  = '<' . $key . '>';
+                $search[]  = '<'.$key.'>';
                 $replace[] = $value;
 
-                $search[]  = ':' . $key;
+                $search[]  = ':'.$key;
                 $replace[] = $value;
             }
 
@@ -866,7 +866,7 @@ 
         if ($this->getConfig('use_action_prefix') && $this->router->getMethodPrefix($method)) {
             $prefix = $this->router->getMethodPrefix($method);
             // 操作方法前缀支持
-            $action = 0 !== strpos($action, $prefix) ? $prefix . $action : $action;
+            $action = 0 !== strpos($action, $prefix) ? $prefix.$action : $action;
         }
 
         // 设置当前请求的路由变量
@@ -895,7 +895,7 @@ 
         // AJAX PJAX 请求检查
         foreach (['ajax', 'pjax', 'mobile'] as $item) {
             if (isset($option[$item])) {
-                $call = 'is' . $item;
+                $call = 'is'.$item;
                 if ($option[$item] && !$request->$call() || !$option[$item] && $request->$call()) {
                     return false;
                 }
@@ -903,8 +903,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;
         }
 
@@ -944,7 +944,7 @@ 
             if ($this->getConfig('url_param_type')) {
                 $var += explode('|', $url);
             } else {
-                preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+                preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                     $var[$match[1]] = strip_tags($match[2]);
                 }, $url);
             }
@@ -1017,7 +1017,7 @@ 
             $regex .= '\/';
         }
 
-        return $regex . ($completeMatch ? '$' : '');
+        return $regex.($completeMatch ? '$' : '');
     }
 
     /**
@@ -1034,7 +1034,7 @@ 
         $slash    = substr($name, 0, 1);
 
         if (in_array($slash, ['/', '-'])) {
-            $prefix = '\\' . $slash;
+            $prefix = '\\'.$slash;
             $name   = substr($name, 1);
             $slash  = substr($name, 0, 1);
         } else {
@@ -1042,7 +1042,7 @@ 
         }
 
         if ('<' != $slash) {
-            return $prefix . preg_quote($name, '/');
+            return $prefix.preg_quote($name, '/');
         }
 
         if (strpos($name, '?')) {
@@ -1061,7 +1061,7 @@ 
             $nameRule = $this->getConfig('default_route_pattern');
         }
 
-        return '(' . $prefix . '(?<' . $name . $suffix . '>' . $nameRule . '))' . $optional;
+        return '('.$prefix.'(?<'.$name.$suffix.'>'.$nameRule.'))'.$optional;
     }
 
     /**

library/think/route/Dispatch.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
         // 指定Header数据
         if (!empty($option['header'])) {
             $header = $option['header'];
-            $this->app['hook']->add('response_send', function ($response) use ($header) {
+            $this->app['hook']->add('response_send', function($response) use ($header) {
                 $response->header($header);
             });
         }

library/think/route/Domain.php

Spacing +4 added lines, -4 removed lines

@@ -119,7 +119,7 @@ 
             $this->parseBindAppendParam($bind);
 
             // 记录绑定信息
-            Container::get('app')->log('[ BIND ] ' . var_export($bind, true));
+            Container::get('app')->log('[ BIND ] '.var_export($bind, true));
 
             // 如果有URL绑定 则进行绑定检测
             $type = substr($bind, 0, 1);
@@ -188,7 +188,7 @@ 
             $this->parseUrlParams($request, $array[2], $param);
         }
 
-        return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method], $param);
+        return new CallbackDispatch($request, $this, [$namespace.'\\'.Loader::parseName($class, 1), $method], $param);
     }
 
     /**
@@ -209,7 +209,7 @@ 
             $this->parseUrlParams($request, $array[1], $param);
         }
 
-        return new ControllerDispatch($request, $this, $controller . '/' . $action, $param);
+        return new ControllerDispatch($request, $this, $controller.'/'.$action, $param);
     }
 
     /**
@@ -230,7 +230,7 @@ 
             $this->parseUrlParams($request, $array[1], $param);
         }
 
-        return new ModuleDispatch($request, $this, $controller . '/' . $action, $param);
+        return new ModuleDispatch($request, $this, $controller.'/'.$action, $param);
     }
 
 }

library/think/console/output/question/Choice.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
         $multiselect  = $this->multiselect;
         $isAssoc      = $this->isAssoc($choices);
 
-        return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {
+        return function($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {
             // Collapse all spaces.
             $selectedChoices = str_replace(' ', '', $selected);
 

library/think/console/output/question/Confirmation.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $default = $this->getDefault();
         $regex   = $this->trueAnswerRegex;
 
-        return function ($answer) use ($default, $regex) {
+        return function($answer) use ($default, $regex) {
             if (is_bool($answer)) {
                 return $answer;
             }

library/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');