top-think / framework

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-z0-9][\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);
             }
         }