Revert "This can be moved to Deprecated class"

This reverts commit 995b655. Not worth it.
horde · Feb 6, 2014 · d57b13a · d57b13a
1 parent bc440f5
commit d57b13a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -309,6 +309,22 @@ public function __construct(array $params = array())
         $this->_initOb();
     }
 
+    /**
+     * Get encryption key.
+     *
+     * @deprecated  Pass callable into 'password' parameter instead.
+     *
+     * @return string  The encryption key.
+     */
+    protected function _getEncryptKey()
+    {
+        if (is_callable($ekey = $this->getParam('encryptKey'))) {
+            return call_user_func($ekey);
+        }
+
+        throw new InvalidArgumentException('encryptKey parameter is not a valid callback.');
+    }
+
     /**
      * Do initialization tasks.
      */
@@ -504,12 +520,14 @@ public function getParam($key)
                 return $this->_params[$key]->getPassword();
             }
 
-            // @deprecated
+            // DEPRECATED
             if (!empty($this->_params['_passencrypt'])) {
-                return Horde_Imap_Client_Base_Deprecated::getEncryptKey(
-                    $this,
-                    $this->_params['password']
-                );
+                try {
+                    $secret = new Horde_Secret();
+                    return $secret->read($this->_getEncryptKey(), $this->_params['password']);
+                } catch (Exception $e) {
+                    return null;
+                }
             }
             break;
         }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base/Deprecated.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base/Deprecated.php
@@ -106,23 +106,4 @@ static public function parseCacheId($id)
         return $info;
     }
 
-    /**
-     * Get encryption key.
-     *
-     * @deprecated  Pass callable into 'password' parameter instead.
-     *
-     * @return string  The encryption key.
-     */
-    static public function getEncryptKey($base, $password)
-    {
-        if (is_callable($ekey = $base->getParam('encryptKey'))) {
-            try {
-                $secret = new Horde_Secret();
-                return $secret->read(call_user_func($ekey), $password);
-            } catch (Exception $e) {}
-        }
-
-        return null;
-    }
-
 }