top-think / framework

library/think/Url.php

Spacing +22 added lines, -22 removed lines

@@ -42,9 +42,9 @@ 
         $this->app    = $app;
         $this->config = $config;
 
-        if (is_file($app->getRuntimePath() . 'route.php')) {
+        if (is_file($app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $app['route']->setName(include $app->getRuntimePath() . 'route.php');
+            $app['route']->setName(include $app->getRuntimePath().'route.php');
         }
     }
 
@@ -79,7 +79,7 @@ 
         if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
             // [name] 表示使用路由命名标识生成URL
             $name = substr($url, 1, $pos - 1);
-            $url  = 'name' . substr($url, $pos + 1);
+            $url  = 'name'.substr($url, $pos + 1);
         }
 
         if (false === strpos($url, '://') && 0 !== strpos($url, '/')) {
@@ -112,7 +112,7 @@ 
         }
 
         if ($url) {
-            $checkName   = isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : '');
+            $checkName   = isset($name) ? $name : $url.(isset($info['query']) ? '?'.$info['query'] : '');
             $checkDomain = $domain && is_string($domain) ? $domain : null;
 
             $rule = $this->app['route']->getName($checkName, $checkDomain);
@@ -138,7 +138,7 @@ 
                 $suffix = $match[2];
             }
         } elseif (!empty($rule) && isset($name)) {
-            throw new \InvalidArgumentException('route name not exists:' . $name);
+            throw new \InvalidArgumentException('route name not exists:'.$name);
         } else {
             // 检查别名路由
             $alias      = $this->app['route']->getAlias();
@@ -150,7 +150,7 @@ 
                     $val = $item->getRoute();
 
                     if (0 === strpos($url, $val)) {
-                        $url        = $key . substr($url, strlen($val));
+                        $url        = $key.substr($url, strlen($val));
                         $matchAlias = true;
                         break;
                     }
@@ -200,38 +200,38 @@ 
         }
 
         // 锚点
-        $anchor = !empty($anchor) ? '#' . $anchor : '';
+        $anchor = !empty($anchor) ? '#'.$anchor : '';
 
         // 参数组装
         if (!empty($vars)) {
             // 添加参数
             if ($this->config['url_common_param']) {
                 $vars = http_build_query($vars);
-                $url .= $suffix . '?' . $vars . $anchor;
+                $url .= $suffix.'?'.$vars.$anchor;
             } else {
                 $paramType = $this->config['url_param_type'];
 
                 foreach ($vars as $var => $val) {
                     if ('' !== trim($val)) {
                         if ($paramType) {
-                            $url .= $depr . urlencode($val);
+                            $url .= $depr.urlencode($val);
                         } else {
-                            $url .= $depr . $var . $depr . urlencode($val);
+                            $url .= $depr.$var.$depr.urlencode($val);
                         }
                     }
                 }
 
-                $url .= $suffix . $anchor;
+                $url .= $suffix.$anchor;
             }
         } else {
-            $url .= $suffix . $anchor;
+            $url .= $suffix.$anchor;
         }
 
         // 检测域名
         $domain = $this->parseDomain($url, $domain);
 
         // URL组装
-        $url = $domain . rtrim($this->root ?: $this->app['request']->root(), '/') . '/' . ltrim($url, '/');
+        $url = $domain.rtrim($this->root ?: $this->app['request']->root(), '/').'/'.ltrim($url, '/');
 
         $this->bindCheck = false;
 
@@ -255,7 +255,7 @@ 
         } else {
             // 解析到 模块/控制器/操作
             $module     = $request->module();
-            $module     = $module ? $module . '/' : '';
+            $module     = $module ? $module.'/' : '';
             $controller = $request->controller();
 
             if ('' == $url) {
@@ -264,7 +264,7 @@ 
                 $path       = explode('/', $url);
                 $action     = array_pop($path);
                 $controller = empty($path) ? $controller : array_pop($path);
-                $module     = empty($path) ? $module : array_pop($path) . '/';
+                $module     = empty($path) ? $module : array_pop($path).'/';
             }
 
             if ($this->config['url_convert']) {
@@ -272,7 +272,7 @@ 
                 $controller = Loader::parseName($controller);
             }
 
-            $url = $module . $controller . '/' . $action;
+            $url = $module.$controller.'/'.$action;
         }
 
         return $url;
@@ -319,7 +319,7 @@ 
                 }
             }
         } elseif (0 !== strpos($domain, $rootDomain) && false === strpos($domain, '.')) {
-            $domain .= '.' . $rootDomain;
+            $domain .= '.'.$rootDomain;
         }
 
         if (false !== strpos($domain, '://')) {
@@ -329,7 +329,7 @@ 
 
         }
 
-        return $scheme . $domain;
+        return $scheme.$domain;
     }
 
     // 解析URL后缀
@@ -343,7 +343,7 @@ 
             }
         }
 
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.'.$suffix;
     }
 
     // 匹配路由地址
@@ -357,7 +357,7 @@ 
             }
 
             if (!in_array($this->app['request']->port(), [80, 443])) {
-                $domain .= ':' . $this->app['request']->port();
+                $domain .= ':'.$this->app['request']->port();
             }
 
             if (empty($pattern)) {
@@ -368,12 +368,12 @@ 
 
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
-                    $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
+                    $url = str_replace(['[:'.$key.']', '<'.$key.'?>', ':'.$key, '<'.$key.'>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
                     unset($vars[$key]);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } elseif (2 == $val) {
-                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $url    = str_replace(['/[:'.$key.']', '[:'.$key.']', '<'.$key.'?>'], '', $url);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } else {

library/think/Controller.php

Spacing +5 added lines, -6 removed lines

@@ -72,8 +72,7 @@ 
         // 前置操作方法 即将废弃
         foreach ((array) $this->beforeActionList as $method => $options) {
             is_numeric($method) ?
-            $this->beforeAction($options) :
-            $this->beforeAction($method, $options);
+            $this->beforeAction($options) : $this->beforeAction($method, $options);
         }
     }
 
@@ -89,11 +88,11 @@ 
                 $only = $except = null;
 
                 if (isset($val['only'])) {
-                    $only = array_map(function ($item) {
+                    $only = array_map(function($item) {
                         return strtolower($item);
                     }, $val['only']);
                 } elseif (isset($val['except'])) {
-                    $except = array_map(function ($item) {
+                    $except = array_map(function($item) {
                         return strtolower($item);
                     }, $val['except']);
                 }
@@ -124,7 +123,7 @@ 
                 $options['only'] = explode(',', $options['only']);
             }
 
-            $only = array_map(function ($val) {
+            $only = array_map(function($val) {
                 return strtolower($val);
             }, $options['only']);
 
@@ -136,7 +135,7 @@ 
                 $options['except'] = explode(',', $options['except']);
             }
 
-            $except = array_map(function ($val) {
+            $except = array_map(function($val) {
                 return strtolower($val);
             }, $options['except']);
 

library/think/view/driver/Think.php

Spacing +8 added lines, -8 removed lines

@@ -44,7 +44,7 @@ 
         $this->config = array_merge($this->config, (array) $config);
 
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $app->getModulePath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $this->template = new Template($app, $this->config);
@@ -83,12 +83,12 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         // 记录视图信息
         $this->app
-            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->log('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         $this->template->fetch($template, $data, $config);
     }
@@ -126,9 +126,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $module = isset($module) ? $module : $request->module();
-            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -140,16 +140,16 @@ 
             if ($controller) {
                 if ('' == $template) {
                     // 如果模板文件名为空 按照默认规则定位
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$this->getActionTemplate($request);
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     protected function getActionTemplate($request)

library/think/view/driver/Php.php

Spacing +9 added lines, -9 removed lines

@@ -73,14 +73,14 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         $this->template = $template;
 
         // 记录视图信息
         $this->app
-            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->log('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         extract($data, EXTR_OVERWRITE);
         include $this->template;
@@ -98,7 +98,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -110,7 +110,7 @@ 
     private function parseTemplate($template)
     {
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $this->app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $this->app->getModulePath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $request = $this->app['request'];
@@ -124,9 +124,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $module = isset($module) ? $module : $request->module();
-            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -138,16 +138,16 @@ 
             if ($controller) {
                 if ('' == $template) {
                     // 如果模板文件名为空 按照默认规则定位
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$this->getActionTemplate($request);
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     protected function getActionTemplate($request)

library/think/Hook.php

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
             }
 
             $call  = [$class, $method];
-            $class = $class . '->' . $method;
+            $class = $class.'->'.$method;
         }
 
         $result = $this->app->invoke($call, [$params]);

helper.php

Spacing +2 added lines, -2 removed lines

@@ -483,7 +483,7 @@ 
     function parse_name($name, $type = 0, $ucfirst = true)
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
 
@@ -594,7 +594,7 @@ 
     {
         $token = Request::token($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 

library/think/process/exception/Failed.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
         }
 
-        $error = sprintf('The command "%s" failed.' . "\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
+        $error = sprintf('The command "%s" failed.'."\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
 
         if (!$process->isOutputDisabled()) {
             $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s", $process->getOutput(), $process->getErrorOutput());