From 767cd07ab7e572617600ca7b6a58cf3af649274d Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Sat, 2 Oct 2010 22:33:21 -0400
Subject: [PATCH] Rebuild factory for Horde_Services_Twitter

---
 framework/Core/lib/Horde/Core/Factory/Perms.php               | 6 ------
 framework/Core/lib/Horde/Core/{Binder => Factory}/Twitter.php | 7 +------
 framework/Core/lib/Horde/Registry.php                         | 5 ++++-
 3 files changed, 5 insertions(+), 13 deletions(-)
 rename framework/Core/lib/Horde/Core/{Binder => Factory}/Twitter.php (91%)

diff --git a/framework/Core/lib/Horde/Core/Factory/Perms.php b/framework/Core/lib/Horde/Core/Factory/Perms.php
index 937948732..69c7317c3 100644
--- a/framework/Core/lib/Horde/Core/Factory/Perms.php
+++ b/framework/Core/lib/Horde/Core/Factory/Perms.php
@@ -39,10 +39,4 @@ class Horde_Core_Factory_Perms
 
         throw new Horde_Perms_Exception('Unknown driver: ' . $driver);
     }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-
 }
diff --git a/framework/Core/lib/Horde/Core/Binder/Twitter.php b/framework/Core/lib/Horde/Core/Factory/Twitter.php
similarity index 91%
rename from framework/Core/lib/Horde/Core/Binder/Twitter.php
rename to framework/Core/lib/Horde/Core/Factory/Twitter.php
index 55a2d4774..15b87a926 100644
--- a/framework/Core/lib/Horde/Core/Binder/Twitter.php
+++ b/framework/Core/lib/Horde/Core/Factory/Twitter.php
@@ -6,7 +6,7 @@
  * @category Horde
  * @package Core
  */
-class Horde_Core_Binder_Twitter implements Horde_Injector_Binder
+class Horde_Core_Factory_Twitter
 {
     public function create(Horde_Injector $injector)
     {
@@ -42,9 +42,4 @@ class Horde_Core_Binder_Twitter implements Horde_Injector_Binder
             throw new Horde_Service_Twitter_Exception(_("No OAuth Key or Secret found for the Twitter API"));
         }
     }
-
-    public function equals (Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index fe0d07e26..cb752b724 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -287,7 +287,6 @@ class Horde_Registry
             // 'Horde_Registry' - initialized below
             'Horde_Secret' => 'Horde_Core_Binder_Secret',
             'Horde_Service_Facebook' => 'Horde_Core_Binder_Facebook',
-            'Horde_Service_Twitter' => 'Horde_Core_Binder_Twitter',
             'Horde_SessionHandler' => 'Horde_Core_Binder_SessionHandler',
             'Horde_Share_Factory' => 'Horde_Core_Binder_ShareFactory',
             'Horde_Template' => 'Horde_Core_Binder_Template',
@@ -341,6 +340,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Perms',
                 'create',
             ),
+            'Horde_Service_Twitter' => array(
+                'Horde_Core_Factory_Twitter',
+                'create',
+            ),
             'Horde_View' => array(
                 'Horde_Core_Factory_View',
                 'create',
-- 
2.11.0