From d58ac8ffdcc05511d9cf6f804de428d91174266a Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 13:09:19 -0400
Subject: [PATCH] Use a factory binder for Horde_Mail, not a binder

---
 framework/Core/lib/Horde/Core/{Binder => Factory}/Mail.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}/Mail.php (85%)

diff --git a/framework/Core/lib/Horde/Core/Binder/Mail.php b/framework/Core/lib/Horde/Core/Factory/Mail.php
similarity index 85%
rename from framework/Core/lib/Horde/Core/Binder/Mail.php
rename to framework/Core/lib/Horde/Core/Factory/Mail.php
index 94fa3ab46..a755c0200 100644
--- a/framework/Core/lib/Horde/Core/Binder/Mail.php
+++ b/framework/Core/lib/Horde/Core/Factory/Mail.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_Mail implements Horde_Injector_Binder
+class Horde_Core_Factory_Mail
 {
     public function create(Horde_Injector $injector)
     {
@@ -28,8 +28,4 @@ class Horde_Core_Binder_Mail implements Horde_Injector_Binder
         throw new Horde_Exception('Unable to find class for transport ' . $transport);
     }
 
-    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 658469c37..33165044f 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_Mail' => new Horde_Core_Binder_Mail(),
             'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
             'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
@@ -336,6 +335,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Lock',
                 'create',
             ),
+            'Horde_Mail' => array(
+                'Horde_Core_Factory_Mail',
+                'create',
+            ),
             'Horde_Memcache' => array(
                 'Horde_Core_Factory_Memcache',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 868ffbef2..9441c2a88 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="Mail.php" role="php" />
        <file name="Mapper.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="ShareFactory.php" role="php" />
@@ -153,6 +152,7 @@ Application Framework.</description>
        <file name="Lock.php" role="php" />
        <file name="Logger.php" role="php" />
        <file name="LoginTasks.php" role="php" />
+       <file name="Mail.php" role="php" />
        <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="Notification.php" role="php" />
@@ -425,7 +425,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/Mail.php" name="lib/Horde/Core/Binder/Mail.php" />
    <install as="Horde/Core/Binder/Mapper.php" name="lib/Horde/Core/Binder/Mapper.php" />
    <install as="Horde/Core/Binder/MimeViewer.php" name="lib/Horde/Core/Binder/MimeViewer.php" />
    <install as="Horde/Core/Binder/ShareFactory.php" name="lib/Horde/Core/Binder/ShareFactory.php" />
@@ -461,6 +460,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/Lock.php" name="lib/Horde/Core/Factory/Lock.php" />
    <install as="Horde/Core/Factory/Logger.php" name="lib/Horde/Core/Factory/Logger.php" />
    <install as="Horde/Core/Factory/LoginTasks.php" name="lib/Horde/Core/Factory/LoginTasks.php" />
+   <install as="Horde/Core/Factory/Mail.php" name="lib/Horde/Core/Factory/Mail.php" />
    <install as="Horde/Core/Factory/Memcache.php" name="lib/Horde/Core/Factory/Memcache.php" />
    <install as="Horde/Core/Factory/MimeViewer.php" name="lib/Horde/Core/Factory/MimeViewer.php" />
    <install as="Horde/Core/Factory/Notification.php" name="lib/Horde/Core/Factory/Notification.php" />
-- 
2.11.0