top-think / framework

library/think/App.php

Spacing +52 added lines, -52 removed lines

@@ -126,7 +126,7 @@ 
 
     public function __construct($appPath = '')
     {
-        $this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
+        $this->thinkPath = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR;
         $this->path($appPath);
     }
 
@@ -150,7 +150,7 @@ 
      */
     public function path($path)
     {
-        $this->appPath = $path ? realpath($path) . DIRECTORY_SEPARATOR : $this->getAppPath();
+        $this->appPath = $path ? realpath($path).DIRECTORY_SEPARATOR : $this->getAppPath();
 
         return $this;
     }
@@ -170,24 +170,24 @@ 
         $this->beginTime   = microtime(true);
         $this->beginMem    = memory_get_usage();
 
-        $this->rootPath    = dirname($this->appPath) . DIRECTORY_SEPARATOR;
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
-        $this->routePath   = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;
-        $this->configPath  = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        $this->rootPath    = dirname($this->appPath).DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
+        $this->routePath   = $this->rootPath.'route'.DIRECTORY_SEPARATOR;
+        $this->configPath  = $this->rootPath.'config'.DIRECTORY_SEPARATOR;
 
         static::setInstance($this);
 
         $this->instance('app', $this);
 
         // 加载环境变量配置文件
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
+        if (is_file($this->rootPath.'.env')) {
+            $this->env->load($this->rootPath.'.env');
         }
 
         $this->configExt = $this->env->get('config_ext', '.php');
 
         // 加载惯例配置文件
-        $this->config->set(include $this->thinkPath . 'convention.php');
+        $this->config->set(include $this->thinkPath.'convention.php');
 
         // 设置路径环境变量
         $this->env->set([
@@ -197,8 +197,8 @@ 
             'config_path'  => $this->configPath,
             'route_path'   => $this->routePath,
             'runtime_path' => $this->runtimePath,
-            'extend_path'  => $this->rootPath . 'extend' . DIRECTORY_SEPARATOR,
-            'vendor_path'  => $this->rootPath . 'vendor' . DIRECTORY_SEPARATOR,
+            'extend_path'  => $this->rootPath.'extend'.DIRECTORY_SEPARATOR,
+            'vendor_path'  => $this->rootPath.'vendor'.DIRECTORY_SEPARATOR,
         ]);
 
         $this->namespace = $this->env->get('app_namespace', $this->namespace);
@@ -268,61 +268,61 @@ 
     public function init($module = '')
     {
         // 定位模块目录
-        $module = $module ? $module . DIRECTORY_SEPARATOR : '';
-        $path   = $this->appPath . $module;
+        $module = $module ? $module.DIRECTORY_SEPARATOR : '';
+        $path   = $this->appPath.$module;
 
         // 加载初始化文件
-        if (is_file($path . 'init.php')) {
-            include $path . 'init.php';
-        } elseif (is_file($this->runtimePath . $module . 'init.php')) {
-            include $this->runtimePath . $module . 'init.php';
+        if (is_file($path.'init.php')) {
+            include $path.'init.php';
+        } elseif (is_file($this->runtimePath.$module.'init.php')) {
+            include $this->runtimePath.$module.'init.php';
         } else {
             // 加载行为扩展文件
-            if (is_file($path . 'tags.php')) {
-                $tags = include $path . 'tags.php';
+            if (is_file($path.'tags.php')) {
+                $tags = include $path.'tags.php';
                 if (is_array($tags)) {
                     $this->hook->import($tags);
                 }
             }
 
             // 加载公共文件
-            if (is_file($path . 'common.php')) {
-                include_once $path . 'common.php';
+            if (is_file($path.'common.php')) {
+                include_once $path.'common.php';
             }
 
             if ('' == $module) {
                 // 加载系统助手函数
-                include $this->thinkPath . 'helper.php';
+                include $this->thinkPath.'helper.php';
             }
 
             // 加载中间件
-            if (is_file($path . 'middleware.php')) {
-                $middleware = include $path . 'middleware.php';
+            if (is_file($path.'middleware.php')) {
+                $middleware = include $path.'middleware.php';
                 if (is_array($middleware)) {
                     $this->middleware->import($middleware);
                 }
             }
 
             // 注册服务的容器对象实例
-            if (is_file($path . 'provider.php')) {
-                $provider = include $path . 'provider.php';
+            if (is_file($path.'provider.php')) {
+                $provider = include $path.'provider.php';
                 if (is_array($provider)) {
                     $this->bindTo($provider);
                 }
             }
 
             // 自动读取配置文件
-            if (is_dir($path . 'config')) {
-                $dir = $path . 'config' . DIRECTORY_SEPARATOR;
-            } elseif (is_dir($this->configPath . $module)) {
-                $dir = $this->configPath . $module;
+            if (is_dir($path.'config')) {
+                $dir = $path.'config'.DIRECTORY_SEPARATOR;
+            } elseif (is_dir($this->configPath.$module)) {
+                $dir = $this->configPath.$module;
             }
 
             $files = isset($dir) ? scandir($dir) : [];
 
             foreach ($files as $file) {
-                if ('.' . pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {
-                    $this->config->load($dir . $file, pathinfo($file, PATHINFO_FILENAME));
+                if ('.'.pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {
+                    $this->config->load($dir.$file, pathinfo($file, PATHINFO_FILENAME));
                 }
             }
         }
@@ -356,7 +356,7 @@ 
         $this->cache->init($config['cache'], true);
 
         // 加载当前模块语言包
-        $this->lang->load($this->appPath . $module . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php');
+        $this->lang->load($this->appPath.$module.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php');
 
         // 模块请求缓存检查
         $this->checkRequestCache(
@@ -387,7 +387,7 @@ 
             } elseif ($this->config('app.auto_bind_module')) {
                 // 入口自动绑定
                 $name = pathinfo($this->request->baseFile(), PATHINFO_FILENAME);
-                if ($name && 'index' != $name && is_dir($this->appPath . $name)) {
+                if ($name && 'index' != $name && is_dir($this->appPath.$name)) {
                     $this->route->bind($name);
                 }
             }
@@ -407,9 +407,9 @@ 
 
             // 记录路由和请求信息
             if ($this->appDebug) {
-                $this->log('[ ROUTE ] ' . var_export($this->request->routeInfo(), true));
-                $this->log('[ HEADER ] ' . var_export($this->request->header(), true));
-                $this->log('[ PARAM ] ' . var_export($this->request->param(), true));
+                $this->log('[ ROUTE ] '.var_export($this->request->routeInfo(), true));
+                $this->log('[ HEADER ] '.var_export($this->request->header(), true));
+                $this->log('[ PARAM ] '.var_export($this->request->param(), true));
             }
 
             // 监听app_begin
@@ -428,7 +428,7 @@ 
             $data     = $exception->getResponse();
         }
 
-        $this->middleware->add(function (Request $request, $next) use ($dispatch, $data) {
+        $this->middleware->add(function(Request $request, $next) use ($dispatch, $data) {
             return is_null($data) ? $dispatch->run() : $data;
         });
 
@@ -446,7 +446,7 @@ 
             $closure  = $this->config->get('route_check_cache_key');
             $routeKey = $closure($this->request);
         } else {
-            $routeKey = md5($this->request->baseUrl(true) . ':' . $this->request->method());
+            $routeKey = md5($this->request->baseUrl(true).':'.$this->request->method());
         }
 
         return $routeKey;
@@ -466,8 +466,8 @@ 
 
         // 加载系统语言包
         $this->lang->load([
-            $this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',
-            $this->appPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',
+            $this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php',
+            $this->appPath.'lang'.DIRECTORY_SEPARATOR.$this->request->langset().'.php',
         ]);
     }
 
@@ -549,7 +549,7 @@ 
     {
         // 路由检测
         if (is_dir($this->routePath)) {
-            $files = glob($this->routePath . '*.php');
+            $files = glob($this->routePath.'*.php');
             foreach ($files as $file) {
                 $rules = include $file;
                 if (is_array($rules)) {
@@ -565,7 +565,7 @@ 
                 $this->build->buildRoute($suffix);
             }
 
-            $filename = $this->runtimePath . 'build_route.php';
+            $filename = $this->runtimePath.'build_route.php';
 
             if (is_file($filename)) {
                 include $filename;
@@ -666,7 +666,7 @@ 
      */
     public function create($name, $layer, $appendSuffix = false, $common = 'common')
     {
-        $guid = $name . $layer;
+        $guid = $name.$layer;
 
         if ($this->__isset($guid)) {
             return $this->__get($guid);
@@ -677,11 +677,11 @@ 
         if (class_exists($class)) {
             $object = $this->__get($class);
         } else {
-            $class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class);
+            $class = str_replace('\\'.$module.'\\', '\\'.$common.'\\', $class);
             if (class_exists($class)) {
                 $object = $this->__get($class);
             } else {
-                throw new ClassNotFoundException('class not exists:' . $class, $class);
+                throw new ClassNotFoundException('class not exists:'.$class, $class);
             }
         }
 
@@ -725,7 +725,7 @@ 
             return $this->make($emptyClass, true);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 
     /**
@@ -786,7 +786,7 @@ 
             }
         }
 
-        return $this->invokeMethod([$class, $action . $this->config('action_suffix')], $vars);
+        return $this->invokeMethod([$class, $action.$this->config('action_suffix')], $vars);
     }
 
     /**
@@ -802,10 +802,10 @@ 
     {
         $name  = str_replace(['/', '.'], '\\', $name);
         $array = explode('\\', $name);
-        $class = Loader::parseName(array_pop($array), 1) . ($this->suffix || $appendSuffix ? ucfirst($layer) : '');
-        $path  = $array ? implode('\\', $array) . '\\' : '';
+        $class = Loader::parseName(array_pop($array), 1).($this->suffix || $appendSuffix ? ucfirst($layer) : '');
+        $path  = $array ? implode('\\', $array).'\\' : '';
 
-        return $this->namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $path . $class;
+        return $this->namespace.'\\'.($module ? $module.'\\' : '').$layer.'\\'.$path.$class;
     }
 
     /**
@@ -868,7 +868,7 @@ 
     public function getAppPath()
     {
         if (is_null($this->appPath)) {
-            $this->appPath = Loader::getRootPath() . 'application' . DIRECTORY_SEPARATOR;
+            $this->appPath = Loader::getRootPath().'application'.DIRECTORY_SEPARATOR;
         }
 
         return $this->appPath;