From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 24 Jun 2009 20:35:04 +0000 (-0600)
Subject: Fixes to autoloader.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d4a97e6cab5db3fc6866bb63776ef6cb39af61ba;p=horde.git

Fixes to autoloader.

Load Horde libs case-insensitive.
Fix detection of duplicate include paths by keeping a local cache array
and by passing all paths through realpath().
---

diff --git a/framework/Autoloader/lib/Horde/Autoloader.php b/framework/Autoloader/lib/Horde/Autoloader.php
index 955a8d97d..5be7252bc 100644
--- a/framework/Autoloader/lib/Horde/Autoloader.php
+++ b/framework/Autoloader/lib/Horde/Autoloader.php
@@ -6,11 +6,6 @@
  * @package  Horde_Autoloader
  * @license  http://www.gnu.org/copyleft/lesser.html
  */
-
-/**
- * @category Horde
- * @package  Horde_Autoloader
- */
 class Horde_Autoloader
 {
     /**
@@ -19,10 +14,17 @@ class Horde_Autoloader
      * @var array
      */
     protected static $_classPatterns = array(
-        array('/^Horde_/', 'Horde/'),
+        array('/^Horde_/i', 'Horde/'),
     );
 
     /**
+     * The include path cache.
+     *
+     * @var array
+     */
+    protected static $_includeCache = null;
+
+    /**
      * Autoload implementation automatically registered with
      * spl_autoload_register.
      *
@@ -71,19 +73,24 @@ class Horde_Autoloader
      */
     public static function addClassPath($path, $prepend = true)
     {
-        $include_path = get_include_path();
-        if ($include_path == $path
-            || strpos($include_path, PATH_SEPARATOR . $path)
-            || strpos($include_path, $path . PATH_SEPARATOR) !== false) {
+        if (is_null(self::$_includeCache)) {
+            self::$_includeCache = array_keys(array_flip(array_map('realpath', explode(PATH_SEPARATOR, get_include_path()))));
+        }
+
+        $path = realpath($path);
+
+        if (in_array($path, self::$_includeCache)) {
             // The path is already present in our stack; don't re-add it.
-            return $include_path;
+            return implode(PATH_SEPARATOR, self::$_includeCache);
         }
 
         if ($prepend) {
-            $include_path = $path . PATH_SEPARATOR . $include_path;
+            array_unshift(self::$_includeCache, $path);
         } else {
-            $include_path .= PATH_SEPARATOR . $path;
+            self::$_includeCache[] = $path;
         }
+
+        $include_path = implode(PATH_SEPARATOR, self::$_includeCache);
         set_include_path($include_path);
 
         return $include_path;