Switched \VuFind\Connection\OpenLibrary to accept injected HTTP client;...

Switched \VuFind\Connection\OpenLibrary to accept injected HTTP client; adjusted OpenLibrarySubjects recommendation module to perform injection.

module/VuFind/src/VuFind/Connection/OpenLibrary.php

@@ -26,7 +26,6 @@
  * @link     http://vufind.org/wiki/system_classes Wiki
  */
 namespace VuFind\Connection;
-use VuFind\Http\Client as HttpClient;
 
 /**
  * Open Library Utilities
@@ -41,6 +40,21 @@ use VuFind\Http\Client as HttpClient;
  */
 class OpenLibrary
 {
+    /**
+     * HTTP client
+     *
+     * @var \Zend\Http\Client
+     */
+    protected $client;
+
+    /**
+     * Constructor
+     */
+    public function __construct(\Zend\Http\Client $client)
+    {
+        $this->client = $client;
+    }
+
     /**
      * Returns an array of elements for each work matching the
      *    parameters. An API call will be made for each subjectType until
@@ -111,11 +125,8 @@ class OpenLibrary
         // empty array to hold the result
         $result = array();
 
-        //find out if there are any reviews
-        $client = new HttpClient();
-        $client->setUri($url);
-        
-        $response = $client->setMethod('GET')->send();
+        // find out if there are any reviews
+        $response = $this->client->setUri($url)->setMethod('GET')->send();
         // Was the request successful?
         if ($response->isSuccess()) {
             // grab the response:

module/VuFind/src/VuFind/Recommend/OpenLibrarySubjects.php

@@ -42,16 +42,77 @@ use VuFind\Connection\OpenLibrary, VuFind\Solr\Utils as SolrUtils;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/building_a_recommendations_module Wiki
  */
-class OpenLibrarySubjects implements RecommendInterface
+class OpenLibrarySubjects implements RecommendInterface,
+    \VuFindHttp\HttpServiceAwareInterface
 {
+    /**
+     * Parameter to use for search terms
+     *
+     * @var string
+     */
     protected $requestParam;
+
+    /**
+     * Search limit
+     *
+     * @var int
+     */
     protected $limit;
+
+    /**
+     * Field to use for date filtering
+     *
+     * @var string
+     */
     protected $pubFilter;
+
+    /**
+     * Date filter to apply
+     *
+     * @var string
+     */
     protected $publishedIn = '';
+
+    /**
+     * Subject to search for
+     *
+     * @var string
+     */
     protected $subject;
+
+    /**
+     * Subject types to use
+     *
+     * @var array
+     */
     protected $subjectTypes;
+
+    /**
+     * Result of search (false if none)
+     *
+     * @var array|bool
+     */
     protected $result = false;
 
+    /**
+     * HTTP service
+     *
+     * @var \VuFindHttp\HttpServiceInterface
+     */
+    protected $httpService = null;
+
+    /**
+     * Set the HTTP service to be used for HTTP requests.
+     *
+     * @param HttpServiceInterface $service HTTP service
+     *
+     * @return void
+     */
+    public function setHttpService(\VuFindHttp\HttpServiceInterface $service)
+    {
+        $this->httpService = $service;
+    }
+
     /**
      * setConfig
      *
@@ -131,7 +192,7 @@ class OpenLibrarySubjects implements RecommendInterface
         // Only proceed if we have a request parameter value
         if (!empty($this->subject)) {
             $result = array();
-            $ol = new OpenLibrary();
+            $ol = new OpenLibrary($this->httpService->createClient());
             $result = $ol->getSubjects(
                 $this->subject, $this->publishedIn, $this->subjectTypes, true, false,
                 $this->limit, null, true