Ask for Horde_Core_Factory_Crypt directly, change factory method to create()

I can't remember from our discussions if we are still using factory methods
in the individual libraries (assuming no horde-specific config in them). For
now, retain the use of Horde_Crypt::factory().

diff --git a/framework/Core/lib/Horde/Core/Binder/Crypt.php b/framework/Core/lib/Horde/Core/Binder/Crypt.php
deleted file mode 100644 (file)
index 608f9db..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Crypt.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Crypt implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Crypt($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Crypt.php b/framework/Core/lib/Horde/Core/Factory/Crypt.php
index d61317f..76fb6e9 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Crypt.php
+++ b/framework/Core/lib/Horde/Core/Factory/Crypt.php
@@ -53,7 +53,7 @@ class Horde_Core_Factory_Crypt
      * @return Horde_Crypt  The instance.
      * @throws Horde_Exception
      */
-    public function getCrypt($driver, $params = array())
+    public function create($driver, $params = array())
     {
         global $registry;
 

diff --git a/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
index a400828..b6afc37 100644 (file)
--- a/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
+++ b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
@@ -1329,7 +1329,7 @@ EOT;
             return '';
         }
         return '<pre>' .
-            $GLOBALS['injector']->getInstance('Horde_Crypt')->getCrypt('Pgp', $var->type->getPGPParams())->pgpPrettyKey($key) .
+            $GLOBALS['injector']->getInstance('Horde_Core_Factory_Crypt')->create('Pgp', $var->type->getPGPParams())->pgpPrettyKey($key) .
             '</pre>';
     }
 
@@ -1339,7 +1339,7 @@ EOT;
         if (empty($cert)) {
             return '';
         }
-        return $GLOBALS['injector']->getInstance('Horde_Crypt')->getCrypt('Smime', $var->type->getSMIMEParams())->certToHTML($cert);
+        return $GLOBALS['injector']->getInstance('Horde_Core_Factory_Crypt')->create('Smime', $var->type->getSMIMEParams())->certToHTML($cert);
     }
 
     protected function _renderVarDisplay_country($form, &$var, &$vars)

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index b9e8bce..4b095fb 100644 (file)
--- 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_Crypt' => new Horde_Core_Binder_Crypt(),
             'Horde_Data' => new Horde_Core_Binder_Data(),
             'Horde_Db' => new Horde_Core_Binder_Db(),
             'Horde_Db_Adapter' => new Horde_Core_Binder_DbBase(),

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index aee0c89..64b6eed 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="Crypt.php" role="php" />
        <file name="Data.php" role="php" />
        <file name="Db.php" role="php" />
        <file name="DbBase.php" role="php" />
@@ -431,7 +430,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/Crypt.php" name="lib/Horde/Core/Binder/Crypt.php" />
    <install as="Horde/Core/Binder/Data.php" name="lib/Horde/Core/Binder/Data.php" />
    <install as="Horde/Core/Binder/Db.php" name="lib/Horde/Core/Binder/Db.php" />
    <install as="Horde/Core/Binder/DbBase.php" name="lib/Horde/Core/Binder/DbBase.php" />

diff --git a/imp/lib/Injector/Binder/Pgp.php b/imp/lib/Injector/Binder/Pgp.php
index 8e8b16f..1d7e222 100644 (file)
--- a/imp/lib/Injector/Binder/Pgp.php
+++ b/imp/lib/Injector/Binder/Pgp.php
@@ -29,7 +29,7 @@ class IMP_Injector_Binder_Pgp implements Horde_Injector_Binder
             }
         }
 
-        return $injector->getInstance('Horde_Crypt')->getCrypt('IMP_Crypt_Pgp', $params);
+        return $injector->getInstance('Horde_Core_Factory_Crypt')->create('IMP_Crypt_Pgp', $params);
     }
 
     /**

diff --git a/imp/lib/Injector/Binder/Smime.php b/imp/lib/Injector/Binder/Smime.php
index b15a95c..5769ef5 100644 (file)
--- a/imp/lib/Injector/Binder/Smime.php
+++ b/imp/lib/Injector/Binder/Smime.php
@@ -18,7 +18,7 @@ class IMP_Injector_Binder_Smime implements Horde_Injector_Binder
      */
     public function create(Horde_Injector $injector)
     {
-        return $injector->getInstance('Horde_Crypt')->getCrypt('IMP_Crypt_Smime');
+        return $injector->getInstance('Horde_Core_Factory_Crypt')->create('IMP_Crypt_Smime');
     }
 
     /**

diff --git a/mnemo/lib/Driver.php b/mnemo/lib/Driver.php
index 524bc2d..0d92ee0 100644 (file)
--- a/mnemo/lib/Driver.php
+++ b/mnemo/lib/Driver.php
@@ -105,7 +105,7 @@ class Mnemo_Driver {
             return;
         }
 
-        $this->_pgp = $GLOBALS['injector']->getInstance('Horde_Crypt')->getCrypt('pgp', array(
+        $this->_pgp = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Crypt')->create('pgp', array(
             'program' => $GLOBALS['conf']['utils']['gnupg']
         ));
     }