From a8cd946ac67b6e7722d056266c5cbab836ed24a5 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 21 Jun 2016 17:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BLoader=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Loader.php | 41 ++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/library/think/Loader.php b/library/think/Loader.php
index b7b23cdb..7926770a 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -151,26 +151,31 @@ class Loader
                     }
                 }
             } else {
-                // 自动扫描下载Composer安装类库
-                $dirs      = scandir(VENDOR_PATH, 1);
-                $namespace = [];
-                foreach ($dirs as $dir) {
-                    if ('.' != $dir && '..' != $dir && is_file(VENDOR_PATH . $dir . DS . 'composer.json')) {
-                        // 解析 package的composer.json 文件
-                        $namespace = array_merge($namespace, self::parseComposerPackage(VENDOR_PATH . $dir . DS));
-                    }
-                }
-                if (!empty($namespace)) {
-                    self::addNamespace($namespace);
-                    // 生成缓存
-                    file_put_contents(RUNTIME_PATH . 'class_namespace.php', "<?php\nreturn " . var_export($namespace, true) . ';');
-                }
-                if (!empty(self::$load)) {
-                    // 生成缓存
-                    file_put_contents(RUNTIME_PATH . 'load_files.php', "<?php\nreturn " . var_export(self::$load, true) . ';');
-                }
+                self::scanComposerPackage();
             }
+        }
+    }
 
+    // 扫描composer package
+    private static function scanComposerPackage()
+    {
+        // 自动扫描下载Composer安装类库
+        $dirs      = scandir(VENDOR_PATH, 1);
+        $namespace = [];
+        foreach ($dirs as $dir) {
+            if ('.' != $dir && '..' != $dir && is_file(VENDOR_PATH . $dir . DS . 'composer.json')) {
+                // 解析 package的composer.json 文件
+                $namespace = array_merge($namespace, self::parseComposerPackage(VENDOR_PATH . $dir . DS));
+            }
+        }
+        if (!empty($namespace)) {
+            self::addNamespace($namespace);
+            // 生成缓存
+            file_put_contents(RUNTIME_PATH . 'class_namespace.php', "<?php\nreturn " . var_export($namespace, true) . ';');
+        }
+        if (!empty(self::$load)) {
+            // 生成缓存
+            file_put_contents(RUNTIME_PATH . 'load_files.php', "<?php\nreturn " . var_export(self::$load, true) . ';');
         }
     }