Fix viral mis-naming of Horde_Http_Exception

horde · Oct 8, 2013 · 9712db0 · 9712db0
1 parent 83210d8
commit 9712db0
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
@@ -110,7 +110,7 @@ public function __construct($app = 'horde')
      * @return array  Keys are app names, values are arrays with two keys:
      *                'version' and 'url'.
      * @throws Horde_Exception
-     * @throws Horde_Http_Client_Exception
+     * @throws Horde_Http_Exception, Horde_Exception
      */
     public function checkVersions()
     {

diff --git a/framework/Core/lib/Horde/Core/Factory/HttpClient.php b/framework/Core/lib/Horde/Core/Factory/HttpClient.php
@@ -11,7 +11,7 @@ class Horde_Core_Factory_HttpClient extends Horde_Core_Factory_Base
      * @param array $opts  Configuration options.
      *
      * @return Horde_Http_Client  Client object.
-     * @throws Horde_Http_Client_Exception
+     * @throws Horde_Http_Exception
      */
     public function create(array $opts = array())
     {

diff --git a/framework/Release/lib/Horde/Release/Whups.php b/framework/Release/lib/Horde/Release/Whups.php
@@ -79,7 +79,7 @@ public function addNewVersion($module, $version, $desc = '')
         $params = array($id, $version, $desc);
         try {
             Horde_Rpc::request('jsonrpc', $this->_params['url'], $method, $this->_http, $params);
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Exception_Wrapped($e);
         }
     }

diff --git a/framework/Rpc/lib/Horde/Rpc/Jsonrpc.php b/framework/Rpc/lib/Horde/Rpc/Jsonrpc.php
@@ -148,7 +148,7 @@ public static function request($url, $method, $client, $params = null)
         $data = Horde_Serialize::serialize($data, Horde_Serialize::JSON);
         try {
             $result = $client->post($url, $data, $headers);
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Rpc_Exception($e->getMessage());
         }
         if ($result->code == 500) {

diff --git a/framework/Rpc/lib/Horde/Rpc/Phpgw.php b/framework/Rpc/lib/Horde/Rpc/Phpgw.php
@@ -125,7 +125,7 @@ public static function request($url, $method, $client, $params = null)
             'Content-Type', 'text/xml');
         try {
             $result = $client->post($url, xmlrpc_encode_request($method, $params), $headers);
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Rpc_Exception($result);
         }
         if ($result->code != 200) {

diff --git a/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php b/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php
@@ -102,7 +102,7 @@ public static function request($url, $method, $client, $params = null)
             'Content-Type' => 'text/xml');
         try {
             $result = $client->post($url, xmlrpc_encode_request($method, $params), $headers);
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Rpc_Exception($result);
         }
         if ($result->code != 200) {

diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Request/Graph.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Request/Graph.php
@@ -102,7 +102,7 @@ public function upload(array $options = array())
                     'Content-Length' => strlen($content)
                 )
             );
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Service_Facebook_Exception(sprintf(Horde_Service_Facebook_Translation::t("Upload failed: %s"), $e->getMessage()));
         }
 
@@ -130,7 +130,7 @@ public function run()
 
         try {
             $result = $this->_http->request($this->_request, $this->_endpoint->toString(true), $params);
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             $this->_facebook->logger->err($e->getMessage());
             throw new Horde_Service_Facebook_Exception($e);
         }
@@ -147,4 +147,4 @@ public function run()
         return json_decode($result->getBody());
     }
 
-}
+}
diff --git a/kronolith/lib/FreeBusy.php b/kronolith/lib/FreeBusy.php
@@ -180,7 +180,7 @@ public static function get($email, $json = false)
                 ->create(array('request.verifyPeer' => false));
             try {
                 $response = $http->get($url);
-            } catch (Horde_Http_Client_Exception $e) {
+            } catch (Horde_Http_Exception $e) {
                 throw new Kronolith_Exception(sprintf(_("The free/busy url for %s cannot be retrieved."), $email));
             }
             if ($response->code == 200 && $data = $response->getBody()) {

diff --git a/kronolith/lib/Storage/Kolab.php b/kronolith/lib/Storage/Kolab.php
@@ -39,7 +39,7 @@ public function search($email, $private_only = false)
 
         try {
             $response = $http->get(sprintf('%s/%s.xfb', $server, $email));
-        } catch (Horde_Http_Client_Exception $e) {
+        } catch (Horde_Http_Exception $e) {
             throw new Horde_Exception_NotFound();
         }
         if ($response->code != 200) {

diff --git a/whups/bin/whups-git-hook b/whups/bin/whups-git-hook
@@ -128,7 +128,7 @@ function post_comment($ticket, $log_message) {
             $GLOBALS['rpc_method'],
             $http,
             array((int)$ticket, $log_message));
-    } catch (Horde_Http_Client_Exception $e) {
+    } catch (Horde_Http_Exception $e) {
         abort($e->getMessage());
     }
 

diff --git a/whups/bin/whups-svn-hook b/whups/bin/whups-svn-hook
@@ -110,7 +110,7 @@ function post_comment($ticket, $log_message) {
             $GLOBALS['rpc_method'],
             $http,
             array((int)$ticket, $log_message));
-    } catch (Horde_Http_Client_Exception $e) {
+    } catch (Horde_Http_Exception $e) {
         abort($e->getMessage());
     }