[mms] Add Horde_Registry#hasLink() (Bug #13175).

horde · May 14, 2014 · 153f277 · 153f277
1 parent b710754
commit 153f277
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
@@ -1016,6 +1016,36 @@ public function hasInterface($interface)
      *                false if the method doesn't exist.
      */
     public function hasMethod($method, $app = null)
+    {
+        return $this->_doHasSearch($method, $app, 'methods');
+    }
+
+    /**
+     * Determine if a link has been registered with the registry.
+     *
+     * @since 2.12.0
+     *
+     * @param string $method  The full name of the link method to check for.
+     * @param string $app     Only check this application.
+     *
+     * @return mixed  The application implementing $method if we have it,
+     *                false if the link method doesn't exist.
+     */
+    public function hasLink($method, $app = null)
+    {
+        return $this->_doHasSearch($method, $app, 'links');
+    }
+
+    /**
+     * Do the has*() search.
+     *
+     * @see hasMethod
+     * @see hasLink
+     *
+     * @param string $func  The API function to call to get the list of
+     *                      elements to search. Either 'methods' or 'links'.
+     */
+    protected function _doHasSearch($method, $app, $func)
     {
         if (is_null($app)) {
             if (($lookup = $this->_methodLookup($method)) === false) {
@@ -1026,11 +1056,18 @@ public function hasMethod($method, $app = null)
             $call = $method;
         }
 
-        $api_ob = $this->_loadApi($app);
+        if ($api_ob = $this->_loadApi($app)) {
+            switch ($func) {
+            case 'links':
+                $links = $api_ob->links();
+                return isset($links[$call]);
 
-        return ($api_ob && in_array($call, $api_ob->methods()))
-            ? $app
-            : false;
+            case 'methods':
+                return in_array($call, $api_ob->methods());
+            }
+        }
+
+        return false;
     }
 
     /**

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Add Horde_Registry#hasLink() (Bug #13175).
 * [mjr] Fix returning mailbox list for ActiveSync clients when not using IMAP subscriptions (Bug #13177).
  </notes>
  <contents>
@@ -3392,6 +3393,7 @@
    <date>2014-05-02</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Add Horde_Registry#hasLink() (Bug #13175).
 * [mjr] Fix returning mailbox list for ActiveSync clients when not using IMAP subscriptions (Bug #13177).
    </notes>
   </release>