From f4444fd46feb55b2f573e4ad0cb6e6df2419be60 Mon Sep 17 00:00:00 2001
From: yunwuxin <448901948@qq.com>
Date: Thu, 30 Jun 2016 16:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Loader=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Loader.php                      | 77 ++++++++++++++++---
 .../console/command/optimize/Autoload.php     |  2 +-
 2 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/library/think/Loader.php b/library/think/Loader.php
index a6332c70..7c7d6d68 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -142,35 +142,88 @@ class Loader
     {
         if (is_array($namespace)) {
             foreach ($namespace as $prefix => $paths) {
-                self::setPsr4($prefix . '\\', rtrim($paths, DS));
+                self::addPsr4($prefix . '\\', rtrim($paths, DS), true);
             }
         } else {
-            self::setPsr4($namespace . '\\', rtrim($path, DS));
+            self::addPsr4($namespace . '\\', rtrim($path, DS), true);
         }
     }
 
-    // 注册Psr0空间
-    private static function setPsr0($prefix, $paths)
+    // 添加Ps0空间
+    private function addPsr0($prefix, $paths, $prepend = false)
     {
         if (!$prefix) {
-            self::$fallbackDirsPsr0 = (array)$paths;
+            if ($prepend) {
+                self::$fallbackDirsPsr0 = array_merge(
+                    (array)$paths,
+                    self::$fallbackDirsPsr0
+                );
+            } else {
+                self::$fallbackDirsPsr0 = array_merge(
+                    self::$fallbackDirsPsr0,
+                    (array)$paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset(self::$prefixesPsr0[$first][$prefix])) {
+            self::$prefixesPsr0[$first][$prefix] = (array)$paths;
+
+            return;
+        }
+        if ($prepend) {
+            self::$prefixesPsr0[$first][$prefix] = array_merge(
+                (array)$paths,
+                self::$prefixesPsr0[$first][$prefix]
+            );
         } else {
-            self::$prefixesPsr0[$prefix[0]][$prefix] = (array)$paths;
+            self::$prefixesPsr0[$first][$prefix] = array_merge(
+                self::$prefixesPsr0[$first][$prefix],
+                (array)$paths
+            );
         }
     }
 
-    // 注册Psr4空间
-    private static function setPsr4($prefix, $paths)
+
+    // 添加Psr4空间
+    private static function addPsr4($prefix, $paths, $prepend = false)
     {
         if (!$prefix) {
-            self::$fallbackDirsPsr4 = (array)$paths;
-        } else {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                self::$fallbackDirsPsr4 = array_merge(
+                    (array)$paths,
+                    self::$fallbackDirsPsr4
+                );
+            } else {
+                self::$fallbackDirsPsr4 = array_merge(
+                    self::$fallbackDirsPsr4,
+                    (array)$paths
+                );
+            }
+        } elseif (!isset(self::$prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
             $length = strlen($prefix);
             if ('\\' !== $prefix[$length - 1]) {
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             self::$prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
             self::$prefixDirsPsr4[$prefix]                = (array)$paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            self::$prefixDirsPsr4[$prefix] = array_merge(
+                (array)$paths,
+                self::$prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            self::$prefixDirsPsr4[$prefix] = array_merge(
+                self::$prefixDirsPsr4[$prefix],
+                (array)$paths
+            );
         }
     }
 
@@ -216,14 +269,14 @@ class Loader
         if (is_file(VENDOR_PATH . 'composer/autoload_namespaces.php')) {
             $map = require VENDOR_PATH . 'composer/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
-                self::setPsr0($namespace, $path);
+                self::addPsr0($namespace, $path);
             }
         }
 
         if (is_file(VENDOR_PATH . 'composer/autoload_psr4.php')) {
             $map = require VENDOR_PATH . 'composer/autoload_psr4.php';
             foreach ($map as $namespace => $path) {
-                self::setPsr4($namespace, $path);
+                self::addPsr4($namespace, $path);
             }
         }
 
diff --git a/library/think/console/command/optimize/Autoload.php b/library/think/console/command/optimize/Autoload.php
index 453e8f7e..8079c1b4 100644
--- a/library/think/console/command/optimize/Autoload.php
+++ b/library/think/console/command/optimize/Autoload.php
@@ -79,7 +79,7 @@ EOF;
         foreach ($this->createMap($dir, $namespace) as $class => $path) {
 
             $pathCode = $this->getPathCode($path) . ",\n";
-            // dump($pathCode);
+            
             if (!isset($classMap[$class])) {
                 $classMap[$class] = $pathCode;
             } elseif ($classMap[$class] !== $pathCode && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($classMap[$class] . ' ' . $path, '\\', '/'))) {