Use bindFactory() and the existing Cache factory rather than using an unnecessary...

diff --git a/framework/Core/lib/Horde/Core/Factory/Cache.php b/framework/Core/lib/Horde/Core/Factory/Cache.php
index 518bb5c..64baccf 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Cache.php
+++ b/framework/Core/lib/Horde/Core/Factory/Cache.php
@@ -121,5 +121,4 @@ class Horde_Core_Factory_Cache
 
         return $this->_instances[$driver];
     }
-
 }

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index c981ef5..99354eb 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -269,7 +269,6 @@ class Horde_Registry
             'Horde_Alarm' => 'Horde_Core_Binder_Alarm',
             'Horde_Auth' => 'Horde_Core_Binder_Auth',
             // 'Horde_Browser' - initialized below
-            'Horde_Cache' => 'Horde_Core_Binder_Cache',
             'Horde_Cache_Factory' => 'Horde_Core_Binder_CacheFactory',
             'Horde_Core_Auth_Signup' => 'Horde_Core_Binder_AuthSignup',
             'Horde_Crypt' => 'Horde_Core_Binder_Crypt',
@@ -308,6 +307,10 @@ class Horde_Registry
 
         /* Define factories. */
         $factories = array(
+            'Horde_Cache' => array(
+                'Horde_Core_Factory_Cache',
+                'getCache',
+            ),
             'Horde_Controller_Request' => array(
                 'Horde_Core_Factory_Request',
                 'create',

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 7116120..13c051f 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Alarm.php" role="php" />
        <file name="Auth.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="Cache.php" role="php" />
        <file name="CacheFactory.php" role="php" />
        <file name="Crypt.php" role="php" />
        <file name="Data.php" role="php" />
@@ -439,7 +438,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Alarm.php" name="lib/Horde/Core/Binder/Alarm.php" />
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/Cache.php" name="lib/Horde/Core/Binder/Cache.php" />
    <install as="Horde/Core/Binder/CacheFactory.php" name="lib/Horde/Core/Binder/CacheFactory.php" />
    <install as="Horde/Core/Binder/Crypt.php" name="lib/Horde/Core/Binder/Crypt.php" />
    <install as="Horde/Core/Binder/Data.php" name="lib/Horde/Core/Binder/Data.php" />