From f52d2262c7b88761b600d7cca07c6ffdb6ea10b8 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 12:31:26 -0400
Subject: [PATCH] Use a factory binder for History

---
 framework/Core/lib/Horde/Core/{Binder => Factory}/History.php | 6 +-----
 framework/Core/lib/Horde/Registry.php                         | 5 ++++-
 framework/Core/package.xml                                    | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename framework/Core/lib/Horde/Core/{Binder => Factory}/History.php (75%)

diff --git a/framework/Core/lib/Horde/Core/Binder/History.php b/framework/Core/lib/Horde/Core/Factory/History.php
similarity index 75%
rename from framework/Core/lib/Horde/Core/Binder/History.php
rename to framework/Core/lib/Horde/Core/Factory/History.php
index 2bc8a0934..4f456dc73 100644
--- a/framework/Core/lib/Horde/Core/Binder/History.php
+++ b/framework/Core/lib/Horde/Core/Factory/History.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_History implements Horde_Injector_Binder
+class Horde_Core_Factory
 {
     public function create(Horde_Injector $injector)
     {
@@ -18,8 +18,4 @@ class Horde_Core_Binder_History implements Horde_Injector_Binder
         return $ob;
     }
 
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
 }
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index fd08b005f..95db7fe3b 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -265,7 +265,6 @@ class Horde_Registry
         $binders = array(
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
-            'Horde_History' => new Horde_Core_Binder_History(),
             'Horde_Http_Client' => new Horde_Core_Binder_HttpClient(),
             'Horde_Log_Logger' => new Horde_Core_Binder_Logger(),
             'Horde_Mail' => new Horde_Core_Binder_Mail(),
@@ -312,6 +311,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Group',
                 'create',
             ),
+            'Horde_History' => array(
+                'Horde_Core_Factory_History',
+                'create',
+            ),
             'Horde_Service_Facebook' => array(
                 'Horde_Core_Factory_Facebook',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index bddbe13b4..732920602 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="History.php" role="php" />
        <file name="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
        <file name="Logger.php" role="php" />
@@ -146,6 +145,7 @@ Application Framework.</description>
        <file name="Editor.php" role="php" />
        <file name="Facebook.php" role="php" />
        <file name="Group.php" role="php" />
+       <file name="History.php" role="php" />
        <file name="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
        <file name="Imple.php" role="php" />
@@ -427,7 +427,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/History.php" name="lib/Horde/Core/Binder/History.php" />
    <install as="Horde/Core/Binder/HttpClient.php" name="lib/Horde/Core/Binder/HttpClient.php" />
    <install as="Horde/Core/Binder/Identity.php" name="lib/Horde/Core/Binder/Identity.php" />
    <install as="Horde/Core/Binder/Logger.php" name="lib/Horde/Core/Binder/Logger.php" />
@@ -457,6 +456,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/Facebook.php" name="lib/Horde/Core/Factory/Facebook.php" />
    <install as="Horde/Core/Factory/Group.php" name="lib/Horde/Core/Factory/Group.php" />
    <install as="Horde/Core/Factory/HttpClient.php" name="lib/Horde/Core/Factory/HttpClient.php" />
+   <install as="Horde/Core/Factory/History.php" name="lib/Horde/Core/Factory/History.php" />
    <install as="Horde/Core/Factory/Identity.php" name="lib/Horde/Core/Factory/Identity.php" />
    <install as="Horde/Core/Factory/Imple.php" name="lib/Horde/Core/Factory/Imple.php" />
    <install as="Horde/Core/Factory/KolabServer.php" name="lib/Horde/Core/Factory/KolabServer.php" />
-- 
2.11.0