From e292a4e09cbf0e6dffdd3a6151dd7f3a853e6cb9 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 10:33:01 -0400
Subject: [PATCH] Horde_Core_Binder_Token -> Horde_Core_Factory_Token

---
 framework/Core/lib/Horde/Core/{Binder => Factory}/Token.php | 12 ++++++------
 framework/Core/lib/Horde/Registry.php                       |  5 ++++-
 framework/Core/package.xml                                  |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)
 rename framework/Core/lib/Horde/Core/{Binder => Factory}/Token.php (73%)

diff --git a/framework/Core/lib/Horde/Core/Binder/Token.php b/framework/Core/lib/Horde/Core/Factory/Token.php
similarity index 73%
rename from framework/Core/lib/Horde/Core/Binder/Token.php
rename to framework/Core/lib/Horde/Core/Factory/Token.php
index 9d84cce1f..8b1357750 100644
--- a/framework/Core/lib/Horde/Core/Binder/Token.php
+++ b/framework/Core/lib/Horde/Core/Factory/Token.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Binder_Token implements Horde_Injector_Binder
+class Horde_Core_Factory_Token
 {
     public function create(Horde_Injector $injector)
     {
@@ -22,12 +22,12 @@ class Horde_Core_Binder_Token implements Horde_Injector_Binder
 
         $params['logger'] = $injector->getInstance('Horde_Log_Logger');
 
-        return Horde_Token::factory($driver, $params);
-    }
+        $class = 'Horde_Token_' . ucfirst($driver);
+        if (class_exists($class)) {
+            return new $class($params);
+        }
 
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
+        throw new Horde_Token_Exception('Driver ' . $driver . ' not found.');
     }
 
 }
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index d6a926c15..b9e8bce51 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -280,7 +280,6 @@ class Horde_Registry
             'Horde_Template' => new Horde_Core_Binder_Template(),
             'Horde_Text_Filter' => new Horde_Core_Binder_TextFilter(),
             'Horde_Tree' => new Horde_Core_Binder_Tree(),
-            'Horde_Token' => new Horde_Core_Binder_Token(),
             'Horde_Vfs' => new Horde_Core_Binder_Vfs(),
         );
 
@@ -350,6 +349,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Twitter',
                 'create',
             ),
+            'Horde_Token' => array(
+                'Horde_Core_Factory_Token',
+                'create',
+            ),
             'Horde_View' => array(
                 'Horde_Core_Factory_View',
                 'create',
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 18ff901e8..aee0c891a 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -129,7 +129,6 @@ Application Framework.</description>
        <file name="ShareFactory.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" />
        <file name="Vfs.php" role="php" />
       </dir> <!-- /lib/Horde/Core/Binder -->
@@ -170,6 +169,7 @@ Application Framework.</description>
        <file name="SessionHandler.php" role="php" />
        <file name="Share.php" role="php" />
        <file name="TextFilter.php" role="php" />
+       <file name="Token.php" role="php" />
        <file name="Tree.php" role="php" />
        <file name="Twitter.php" role="php" />
        <file name="Vfs.php" role="php" />
@@ -447,7 +447,6 @@ Application Framework.</description>
    <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" />
    <install as="Horde/Core/Binder/TextFilter.php" name="lib/Horde/Core/Binder/TextFilter.php" />
-   <install as="Horde/Core/Binder/Token.php" name="lib/Horde/Core/Binder/Token.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" />
    <install as="Horde/Core/Controller/NotFound.php" name="lib/Horde/Core/Controller/NotFound.php" />
@@ -484,6 +483,7 @@ Application Framework.</description>
    <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/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" />
    <install as="Horde/Core/Factory/Twitter.php" name="lib/Horde/Core/Factory/Twitter.php" />
    <install as="Horde/Core/Factory/Vfs.php" name="lib/Horde/Core/Factory/Vfs.php" />
-- 
2.11.0