From 5c7618f2faf94b907e35d0a0506ab6807c7f39d6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 20 Jun 2016 19:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BComposer=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84=E5=88=A4=E6=96=AD=E6=9C=BA=E5=88=B6?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20vendor=E7=9B=AE=E5=BD=95=E4=B8=8B?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84think=5Fautoload=E6=96=87=E4=BB=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Controller.php |  2 +-
 library/think/Loader.php     | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/library/think/Controller.php b/library/think/Controller.php
index 1c6b9312..a759ebc7 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -40,7 +40,7 @@ class Controller
 
     /**
      * 架构函数
-     * @param \think\Request    $request     Request对象
+     * @param Request    $request     Request对象
      * @access public
      */
     public function __construct(Request $request = null)
diff --git a/library/think/Loader.php b/library/think/Loader.php
index 68f63288..eaa2a7fb 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -33,13 +33,7 @@ class Loader
     // PSR-0
     private static $prefixesPsr0 = [];
     // Composer自动加载
-    private static $composerLoader = true;
-
-    // 自动加载Composer
-    public static function composerAutoLoader($auto)
-    {
-        self::$composerLoader = $auto;
-    }
+    private static $composerLoader = false;
 
     // 自动加载
     public static function autoload($class)
@@ -126,9 +120,17 @@ class Loader
     {
         // 注册系统自动加载
         spl_autoload_register($autoload ?: 'think\\Loader::autoload');
-        // 注册composer自动加载
-        if (self::$composerLoader) {
+        
+        if (is_dir(VENDOR_PATH . 'composer')) {
+            // 注册Composer自动加载
             self::registerComposerLoader();
+            self::$composerLoader  = true;
+        } elseif(is_file(VENDOR_PATH . 'think_autoload.php')) {
+            // 读取Composer自动加载文件
+            $autoload = include VENDOR_PATH . 'think_autoload.php';
+            if (is_array($autoload)) {
+                self::addMap($autoload);
+            }
         }
     }