From d53dd13629d1900320b107a142e521b47f8c4ce3 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Thu, 7 Oct 2010 12:38:19 -0400 Subject: [PATCH] Ask for Horde_Core_Factory_Http_Client directly, change factory method to create() --- framework/Core/lib/Horde/Config.php | 2 +- .../lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php | 2 +- framework/Core/lib/Horde/Core/Binder/HttpClient.php | 18 ------------------ framework/Core/lib/Horde/Core/Factory/Facebook.php | 2 +- framework/Core/lib/Horde/Core/Factory/HttpClient.php | 2 +- framework/Core/lib/Horde/Core/Factory/Twitter.php | 2 +- framework/Core/lib/Horde/Registry.php | 1 - framework/Core/package.xml | 2 -- horde/lib/Block/feed.php | 4 ++-- imp/lib/Compose.php | 4 ++-- jonah/lib/Jonah.php | 4 ++-- kronolith/lib/Driver/Ical.php | 4 ++-- 12 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 framework/Core/lib/Horde/Core/Binder/HttpClient.php diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php index fe87ed5dd..b3320a254 100644 --- a/framework/Core/lib/Horde/Config.php +++ b/framework/Core/lib/Horde/Config.php @@ -118,7 +118,7 @@ class Horde_Config throw new Horde_Exception('SimpleXML not available.'); } - $http = $GLOBALS['injector']->getInstance('Horde_Http_Client')->getClient(); + $http = $GLOBALS['injector']->getInstance('Horde_Core_Factory_HttpClient')->create(); $response = $http->get($this->_versionUrl); if ($response->code != 200) { throw new Horde_Exception('Unexpected response from server.'); diff --git a/framework/Core/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php b/framework/Core/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php index 4b3c592db..20fa0a45d 100644 --- a/framework/Core/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php +++ b/framework/Core/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php @@ -59,7 +59,7 @@ class Horde_Core_Ajax_Imple_Geocoder_Geonames extends Horde_Core_Ajax_Imple $url = $url->add(array('lat' => $args['lat'], 'lng' => $args['lon'])); } - $client = $GLOBALS['injector']->getInstance('Horde_Http_Client')->getClient(); + $client = $GLOBALS['injector']->getInstance('Horde_Core_Factory_HttpClient')->create(); try { $response = $client->get($url); } catch (Horde_Http_Exception $e) { diff --git a/framework/Core/lib/Horde/Core/Binder/HttpClient.php b/framework/Core/lib/Horde/Core/Binder/HttpClient.php deleted file mode 100644 index f42f81265..000000000 --- a/framework/Core/lib/Horde/Core/Binder/HttpClient.php +++ /dev/null @@ -1,18 +0,0 @@ - $injector->getInstance('Horde_Http_Client')->getClient(), + $context = array('http_client' => $injector->getInstance('Horde_Core_Factory_HttpClient')->create(), 'http_request' => $injector->getInstance('Horde_Controller_Request_Http')); return new Horde_Service_Facebook($apikey, $secret, $context); diff --git a/framework/Core/lib/Horde/Core/Factory/HttpClient.php b/framework/Core/lib/Horde/Core/Factory/HttpClient.php index d0c0d1abe..0426bf57d 100644 --- a/framework/Core/lib/Horde/Core/Factory/HttpClient.php +++ b/framework/Core/lib/Horde/Core/Factory/HttpClient.php @@ -30,7 +30,7 @@ class Horde_Core_Factory_HttpClient * @return Horde_Http_Client Client object. * @throws Horde_Http_Client_Exception */ - public function getClient(array $opts = array()) + public function create(array $opts = array()) { global $conf; diff --git a/framework/Core/lib/Horde/Core/Factory/Twitter.php b/framework/Core/lib/Horde/Core/Factory/Twitter.php index 644c5bcde..bb3af490a 100644 --- a/framework/Core/lib/Horde/Core/Factory/Twitter.php +++ b/framework/Core/lib/Horde/Core/Factory/Twitter.php @@ -35,7 +35,7 @@ class Horde_Core_Factory_Twitter //$twitter->setCache($injector->getInstance('Horde_Cache')); $twitter->setLogger($injector->getInstance('Horde_Log_Logger')); - $twitter->setHttpClient($injector->getInstance('Horde_Http_Client')->getClient()); + $twitter->setHttpClient($injector->getInstance('Horde_Core_Factory_HttpClient')->create()); return $twitter; } else { diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 95db7fe3b..545f2e7e6 100644 --- 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_Http_Client' => new Horde_Core_Binder_HttpClient(), 'Horde_Log_Logger' => new Horde_Core_Binder_Logger(), 'Horde_Mail' => new Horde_Core_Binder_Mail(), 'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(), diff --git a/framework/Core/package.xml b/framework/Core/package.xml index 732920602..e14a346a0 100644 --- a/framework/Core/package.xml +++ b/framework/Core/package.xml @@ -113,7 +113,6 @@ Application Framework. - @@ -427,7 +426,6 @@ Application Framework. - diff --git a/horde/lib/Block/feed.php b/horde/lib/Block/feed.php index 8956efc25..2052b3012 100644 --- a/horde/lib/Block/feed.php +++ b/horde/lib/Block/feed.php @@ -89,8 +89,8 @@ class Horde_Block_Horde_feed extends Horde_Block try { $client = $GLOBALS['injector'] - ->getInstance('Horde_Http_Client') - ->getClient(); + ->getInstance('Horde_Core_Factory_HttpClient') + ->create(); $feed = Horde_Feed::readUri($this->_params['uri'], $client); $cache->set($key, serialize($feed)); $this->_feed = $feed; diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index c18c6ce2b..d5ddb3f43 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -2286,8 +2286,8 @@ class IMP_Compose implements ArrayAccess, Countable, Iterator } $client = $GLOBALS['injector'] - ->getInstance('Horde_Http_Client') - ->getClient(); + ->getInstance('Horde_Core_Factory_HttpClient') + ->create(); $img_data = $img_parts = array(); /* Go through list of results, download the image, and create diff --git a/jonah/lib/Jonah.php b/jonah/lib/Jonah.php index 4e9c3cfd5..a5d7cf76b 100644 --- a/jonah/lib/Jonah.php +++ b/jonah/lib/Jonah.php @@ -52,8 +52,8 @@ class Jonah global $conf; $http = $GLOBALS['injector'] - ->getInstance('Horde_Http_Client') - ->getClient(); + ->getInstance('Horde_Core_Factory_HttpClient') + ->create(); try { $response = $http->get($url); diff --git a/kronolith/lib/Driver/Ical.php b/kronolith/lib/Driver/Ical.php index eab03be3c..35d41c9ed 100644 --- a/kronolith/lib/Driver/Ical.php +++ b/kronolith/lib/Driver/Ical.php @@ -748,8 +748,8 @@ class Kronolith_Driver_Ical extends Kronolith_Driver } $this->_client = $GLOBALS['injector'] - ->getInstance('Horde_Http_Client') - ->getClient($options); + ->getInstance('Horde_Core_Factory_HttpClient') + ->create($options); return $this->_client; } -- 2.11.0