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

diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
index fe87ed5..b3320a2 100644 (file)
--- 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 4b3c592..20fa0a4 100644 (file)
--- 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 (file)
index f42f812..0000000
--- a/framework/Core/lib/Horde/Core/Binder/HttpClient.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_HttpClient implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_HttpClient($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Facebook.php b/framework/Core/lib/Horde/Core/Factory/Facebook.php
index 67269e4..03419a6 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Facebook.php
+++ b/framework/Core/lib/Horde/Core/Factory/Facebook.php
@@ -18,7 +18,7 @@ class Horde_Core_Factory_Facebook
         $secret = $conf['facebook']['secret'];
 
         /* Create required objects */
-        $context = array('http_client' => $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 d0c0d1a..0426bf5 100644 (file)
--- 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 644c5bc..bb3af49 100644 (file)
--- 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 95db7fe..545f2e7 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_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 7329206..e14a346 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="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
        <file name="Logger.php" role="php" />
        <file name="Mail.php" role="php" />
@@ -427,7 +426,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/HttpClient.php" name="lib/Horde/Core/Binder/HttpClient.php" />
    <install as="Horde/Core/Binder/Identity.php" name="lib/Horde/Core/Binder/Identity.php" />
    <install as="Horde/Core/Binder/Logger.php" name="lib/Horde/Core/Binder/Logger.php" />
    <install as="Horde/Core/Binder/Mail.php" name="lib/Horde/Core/Binder/Mail.php" />

diff --git a/horde/lib/Block/feed.php b/horde/lib/Block/feed.php
index 8956efc..2052b30 100644 (file)
--- 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 c18c6ce..d5ddb3f 100644 (file)
--- 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 4e9c3cf..a5d7cf7 100644 (file)
--- 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 eab03be..35d41c9 100644 (file)
--- 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;
     }