Use factory binder for Horde_Routes_Mapper, though I don't see this used anywhere...

diff --git a/framework/Core/lib/Horde/Core/Binder/Mapper.php b/framework/Core/lib/Horde/Core/Binder/Mapper.php
deleted file mode 100644 (file)
index 107a81d..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Mapper.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Mapper implements Horde_Injector_Binder
-{
-    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/Core/Factory/Mapper.php b/framework/Core/lib/Horde/Core/Factory/Mapper.php
new file mode 100644 (file)
index 0000000..66d3a50
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Factory/Mapper.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @category Horde
+ * @package  Core
+ */
+class Horde_Core_Factory_Mapper
+{
+    public function create(Horde_Injector $injector)
+    {
+        return new Horde_Routes_Mapper();
+    }
+
+}

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 3316504..14036d0 100644 (file)
--- 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 9441c2a..cf51a9e 100644 (file)
--- 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" />