From 12c2893b7bbb3660666d89e7da9af9b7c6a3e1e3 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 13:18:42 -0400
Subject: [PATCH] Use factory binder for Horde_Routes_Mapper, though I don't
 see this used anywhere in code yet.

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

diff --git a/framework/Core/lib/Horde/Core/Binder/Mapper.php b/framework/Core/lib/Horde/Core/Factory/Mapper.php
similarity index 51%
rename from framework/Core/lib/Horde/Core/Binder/Mapper.php
rename to framework/Core/lib/Horde/Core/Factory/Mapper.php
index 107a81d7d..66d3a507f 100644
--- a/framework/Core/lib/Horde/Core/Binder/Mapper.php
+++ b/framework/Core/lib/Horde/Core/Factory/Mapper.php
@@ -3,15 +3,11 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_Mapper implements Horde_Injector_Binder
+class Horde_Core_Factory_Mapper
 {
     public function create(Horde_Injector $injector)
     {
         return new Horde_Routes_Mapper();
     }
 
-    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 33165044f..14036d0a4 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -351,6 +351,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Perms',
                 'create',
             ),
+            'Horde_Routes_Mapper' => array(
+                'Horde_Core_Factory_Mapper',
+                'create',
+            ),
             'Horde_Secret' => array(
                 'Horde_Core_Factory_Secret',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 9441c2a88..cf51a9eb0 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="Mapper.php" role="php" />
        <file name="MimeViewer.php" role="php" />
        <file name="ShareFactory.php" role="php" />
        <file name="Template.php" role="php" />
@@ -153,6 +152,7 @@ Application Framework.</description>
        <file name="Logger.php" role="php" />
        <file name="LoginTasks.php" role="php" />
        <file name="Mail.php" role="php" />
+       <file name="Mapper.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/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" />
    <install as="Horde/Core/Binder/Template.php" name="lib/Horde/Core/Binder/Template.php" />
@@ -461,6 +460,7 @@ Application Framework.</description>
    <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/Mapper.php" name="lib/Horde/Core/Factory/Mapper.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