Replace Horde_Core_Autoloader with Horde_Autoloader_Default

diff --git a/framework/Core/lib/Horde/Core/Autoloader.php b/framework/Core/lib/Horde/Core/Autoloader.php
deleted file mode 100644 (file)
index 39ffe0a..0000000
--- a/framework/Core/lib/Horde/Core/Autoloader.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require_once 'Horde/Autoloader.php';
-require_once 'Horde/Autoloader/ClassPathMapper.php';
-require_once 'Horde/Autoloader/ClassPathMapper/Default.php';
-
-class Horde_Core_Autoloader extends Horde_Autoloader
-{
-    public function __construct()
-    {
-        foreach (array_reverse(explode(PATH_SEPARATOR, get_include_path())) as $path) {
-            if ($path == '.') { continue; }
-            $path = realpath($path);
-            if ($path) {
-                $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Default($path));
-            }
-        }
-    }
-}
-
-$__autoloader = new Horde_Core_Autoloader();
-$__autoloader->registerAutoloader();

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 74a8ec1..eb0f3c8 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -215,7 +215,6 @@ Application Framework.</description>
        <file name="VarRenderer.php" role="php" />
        <file name="Widget.php" role="php" />
       </dir> <!-- /lib/Horde/Core/Ui -->
-      <file name="Autoloader.php" role="php" />
      </dir> <!-- /lib/Horde/Core -->
      <dir name="Exception">
       <file name="HookNotSet.php" role="php" />
@@ -394,7 +393,6 @@ Application Framework.</description>
    <install as="Horde/Core/Auth/Signup/Null.php" name="lib/Horde/Core/Auth/Signup/Null.php" />
    <install as="Horde/Core/Auth/Signup/Sql.php" name="lib/Horde/Core/Auth/Signup/Sql.php" />
    <install as="Horde/Core/Auth/Signup/SqlObject.php" name="lib/Horde/Core/Auth/Signup/SqlObject.php" />
-   <install as="Horde/Core/Autoloader.php" name="lib/Horde/Core/Autoloader.php" />
    <install as="Horde/Core/Autoloader/Callback/Mime.php" name="lib/Horde/Core/Autoloader/Callback/Mime.php" />
    <install as="Horde/Core/Autoloader/Callback/Nls.php" name="lib/Horde/Core/Autoloader/Callback/Nls.php" />
    <install as="Horde/Core/Binder/Ajax.php" name="lib/Horde/Core/Binder/Ajax.php" />

diff --git a/framework/Date_Parser/examples/Horde/Date/Parser/parse.php b/framework/Date_Parser/examples/Horde/Date/Parser/parse.php
index 6814a4a..4ea211e 100644 (file)
--- a/framework/Date_Parser/examples/Horde/Date/Parser/parse.php
+++ b/framework/Date_Parser/examples/Horde/Date/Parser/parse.php
@@ -1,7 +1,7 @@
 <?php
 
 set_include_path(dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/lib:' . get_include_path());
-require 'Horde/Core/Autoloader.php';
+require 'Horde/Autoloader/Default.php';
 
 $t = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'this fortnight';
 $opts = count($_SERVER['argv']) > 1 ? array() : array('now' => new Horde_Date('2006-08-16 14:00:00'));

diff --git a/framework/bin/test_framework b/framework/bin/test_framework
index 66d156e..b056ea5 100755 (executable)
--- a/framework/bin/test_framework
+++ b/framework/bin/test_framework
@@ -13,7 +13,7 @@
 require_once 'PHPUnit/Util/Filter.php';
 require_once 'PHPUnit/TextUI/Command.php';
 set_include_path(dirname(dirname(dirname(__FILE__))) . '/lib:' . get_include_path());
-require 'Horde/Core/Autoloader.php';
+require 'Horde/Autoloader/Default.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
 

diff --git a/horde/lib/core.php b/horde/lib/core.php
index 9d110af..b1d42a1 100644 (file)
--- a/horde/lib/core.php
+++ b/horde/lib/core.php
@@ -37,7 +37,7 @@ if (file_exists(HORDE_BASE . '/config/horde.local.php')) {
 /* Set up autoload paths for core Horde libs (located in lib/). This can't
  * be defined in Horde_Autoloader since the current directory path can not be
  * determined there. */
-require_once 'Horde/Core/Autoloader.php';
+require_once 'Horde/Autoloader/Default.php';
 $__autoloader->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Horde(?:$|_)/i', $dirname));
 
 /* Default exception handler for uncaught exceptions. The default fatal

diff --git a/ingo/lib/tests/AllTests.php b/ingo/lib/tests/AllTests.php
index d42545d..db064f5 100644 (file)
--- a/ingo/lib/tests/AllTests.php
+++ b/ingo/lib/tests/AllTests.php
@@ -18,7 +18,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  * Prepare the test setup.
  */
 @define('INGO_BASE', dirname(__FILE__) . '/../..');
-require_once 'Horde/Core/Autoloader.php';
+require_once 'Horde/Autoloader/Default.php';
 date_default_timezone_set('Europe/Berlin');
 
 /**

diff --git a/koward/script/Koward/koward.php b/koward/script/Koward/koward.php
index c68cde9..bb68e23 100644 (file)
--- a/koward/script/Koward/koward.php
+++ b/koward/script/Koward/koward.php
@@ -3,7 +3,7 @@
 /**
  * The Autoloader allows us to omit "require/include" statements.
  */
-require_once 'Horde/Core/Autoloader.php';
+require_once 'Horde/Autoloader/Default.php';
 
 /**
  * FIXME START

diff --git a/koward/test/Koward/TestInit.php b/koward/test/Koward/TestInit.php
index ac6ec3a..e5dc251 100644 (file)
--- a/koward/test/Koward/TestInit.php
+++ b/koward/test/Koward/TestInit.php
@@ -14,7 +14,7 @@
 /**
  * The Autoloader allows us to omit "require/include" statements.
  */
-require_once 'Horde/Core/Autoloader.php';
+require_once 'Horde/Autoloader/Default.php';
 
 if (!defined('KOWARD_BASE')) {
     define('KOWARD_BASE', dirname(__FILE__) . '/../');

diff --git a/koward/www/htdocs/koward/koward.php b/koward/www/htdocs/koward/koward.php
index fced4e3..2b4b2a7 100644 (file)
--- a/koward/www/htdocs/koward/koward.php
+++ b/koward/www/htdocs/koward/koward.php
@@ -7,7 +7,7 @@ require_once dirname(__FILE__) . '/../../koward/config/base.php';
 /**
  * The Autoloader allows us to omit "require/include" statements.
  */
-require_once 'Horde/Core/Autoloader.php';
+require_once 'Horde/Autoloader/Default.php';
 
 /* Configure the Autoloader to handle the "Koward" pattern */
 $__autoloader->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Koward_/', 'Koward/'));