Changes required for Guzzle 6

uofa · Apr 25, 2019 · 20b39a7 · 20b39a7
1 parent 2ab3b2e
commit 20b39a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/Funnelback/Client.php b/src/Funnelback/Client.php
@@ -64,7 +64,7 @@ class Client implements ClientInterface
      */
     public function __construct(array $config, HttpClientInterface $client = null)
     {
-        $this->baseUrl = $config['base_url'];
+        $this->baseUrl = $config['base_uri'];
         $this->subPath = isset($config['sub_path']) ? $config['sub_path'] : '';
         $format = isset($config['format']) ? $config['format'] : self::JSON_FORMAT;
         $this->setFormat($format);
@@ -77,15 +77,11 @@ public function __construct(array $config, HttpClientInterface $client = null)
      */
     public function getClient()
     {
+        $baseUri = sprintf('%s/s/search.%s', $this->getBaseUrl(), $this->getFormat());
+        $defaults = ['collection' => $this->getCollection()];
         if (!isset($this->client)) {
             $this->client = new HttpClient([
-                'base_url' => [
-                    '{base_url}/s/search.{format}',
-                    ['base_url' => $this->getBaseUrl(), 'format' => $this->getFormat()]
-                ],
-                'defaults' => [
-                    'query' => ['collection' => $this->getCollection()],
-                ]
+                'base_uri' => $baseUri,
             ]);
         }
 
@@ -160,7 +156,12 @@ public function allowedFormats()
      */
     public function search($query, $params = [])
     {
-        $params = array_merge(['query' => $query], $params);
+
+        $params = array_merge(
+            ['collection' => $this->getCollection()],
+            ['query' => $query],
+            $params
+        );
         $http_response = $this->getClient()->get(null, ['query' => $params]);
 
         return new Response($http_response);

diff --git a/tests/Funnelback/ClientTest.php b/tests/Funnelback/ClientTest.php
@@ -34,7 +34,7 @@ public function testSearch()
         $http_client = new HttpClient(['handler' => $handlerStack]);
 
         $config = [
-          'base_url' => 'http://agencysearch.australia.gov.au',
+          'base_uri' => 'http://agencysearch.australia.gov.au',
           'collection' => 'agencies',
         ];