Use a factory binder for Horde_Template

diff --git a/framework/Core/lib/Horde/Core/Binder/Template.php b/framework/Core/lib/Horde/Core/Binder/Template.php
deleted file mode 100644 (file)
index 5ddb6ce..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Template.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Template implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Template(array(
-            'cacheob' => $injector->getInstance('Horde_Cache'),
-            'logger' => $injector->getInstance('Horde_Log_Logger')
-        ));
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Template.php b/framework/Core/lib/Horde/Core/Factory/Template.php
new file mode 100644 (file)
index 0000000..32ce22e
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Factory/Template.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @category Horde
+ * @package  Core
+ */
+class Horde_Core_Factory_Template
+{
+    public function create(Horde_Injector $injector)
+    {
+        return new Horde_Template(array(
+            'cacheob' => $injector->getInstance('Horde_Cache'),
+            'logger' => $injector->getInstance('Horde_Log_Logger')
+        ));
+    }
+
+}

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 56c93c3..7ca2127 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -348,6 +348,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Twitter',
                 'create',
             ),
+            'Horde_Template' => array(
+                'Horde_Core_Factory_Template',
+                'create',
+            ),
             'Horde_Token' => array(
                 'Horde_Core_Factory_Token',
                 'create',

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 94315af..ac1786a 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="Template.php" role="php" />
        <file name="TextFilter.php" role="php" />
        <file name="Tree.php" role="php" />
        <file name="Vfs.php" role="php" />
@@ -160,6 +159,7 @@ Application Framework.</description>
        <file name="Secret.php" role="php" />
        <file name="SessionHandler.php" role="php" />
        <file name="Share.php" role="php" />
+       <file name="Template.php" role="php" />
        <file name="TextFilter.php" role="php" />
        <file name="Token.php" role="php" />
        <file name="Tree.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/Template.php" name="lib/Horde/Core/Binder/Template.php" />
    <install as="Horde/Core/Binder/TextFilter.php" name="lib/Horde/Core/Binder/TextFilter.php" />
    <install as="Horde/Core/Binder/Tree.php" name="lib/Horde/Core/Binder/Tree.php" />
    <install as="Horde/Core/Binder/Vfs.php" name="lib/Horde/Core/Binder/Vfs.php" />
@@ -468,6 +467,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/Secret.php" name="lib/Horde/Core/Factory/Secret.php" />
    <install as="Horde/Core/Factory/SessionHandler.php" name="lib/Horde/Core/Factory/SessionHandler.php" />
    <install as="Horde/Core/Factory/Share.php" name="lib/Horde/Core/Factory/Share.php" />
+   <install as="Horde/Core/Factory/Template.php" name="lib/Horde/Core/Factory/Template.php" />
    <install as="Horde/Core/Factory/TextFilter.php" name="lib/Horde/Core/Factory/TextFilter.php" />
    <install as="Horde/Core/Factory/Token.php" name="lib/Horde/Core/Factory/Token.php" />
    <install as="Horde/Core/Factory/Tree.php" name="lib/Horde/Core/Factory/Tree.php" />