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;
     }
 
     // 匹配路由地址
@@ -358,7 +358,7 @@ 
             }
 
             if ($port && !in_array($port, [80, 443])) {
-                $domain .= ':' . $port;
+                $domain .= ':'.$port;
             }
 
             if (empty($pattern)) {
@@ -370,12 +370,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);
                     $keys[] = $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 {