fix searchContacts to support query params

use query request option in Guzzle client instead of appending to API URI
added CHANGELOG

Author: onlime

CHANGELOG.md

@@ -0,0 +1,28 @@
+# CHANGELOG
+
+## [0.3.x (Unreleased)](https://github.com/onlime/bexio-api-client/compare/0.3.1...main)
+
+## [0.3.1 (2022-03-23)](https://github.com/onlime/bexio-api-client/releases/tag/0.3.0...0.3.1)
+
+- Fix `Contact::searchContacts()` to support query params.
+- Use `query` request option in Guzzle client instead of appending query params to API URI directly to avoid conflicts with already existing query params in configured API URI.
+- Fix phpDoc comments for `$id` method params.
+- Add this CHANGELOG
+
+## [0.3.0 (2022-03-18)](https://github.com/onlime/bexio-api-client/releases/tag/0.2.1...0.3.0)
+
+- Implement Bexio API v3 support with OpenID Connect authentication
+- Detach fork from christianruhstaller/bexio-api-php-client, released as new package
+
+## [0.2.1 (2019-01-16)](https://github.com/onlime/bexio-api-client/releases/tag/0.2.0...0.2.1)
+
+- Add `createInvoicePayment` and `deleteInvoicePayment`
+
+## [0.2.0 (2019-01-16)](https://github.com/onlime/bexio-api-client/releases/tag/0.1.0...0.2.0)
+
+- Update phpDoc for `getContacts` to reflect parameters
+
+## [0.1.0 (2017-08-31)](https://github.com/onlime/bexio-api-client/releases/tag/0.1.0)
+
+- Initial release
+- Fix contacts search and add discount and invoice resources

src/Bexio/AbstractClient.php

@@ -11,9 +11,9 @@ abstract class AbstractClient
 
     abstract protected function request(string $path = '', string $method = self::METHOD_GET, array $data = [], array $queryParams = []);
 
-    public function get(string $path, array $data = [], array $queryParams = [])
+    public function get(string $path, array $queryParams = [])
     {
-        return $this->request($path, self::METHOD_GET, $data, $queryParams);
+        return $this->request($path, self::METHOD_GET, queryParams: $queryParams);
     }
 
     public function post(string $path, array $data = [], array $queryParams = [])

src/Bexio/Client.php

@@ -174,24 +174,24 @@ protected function request(string $path = '', string $method = self::METHOD_GET,
             $path
         ]));
 
-        if (!empty($queryParams)) {
-            $apiUrl .= '?' . http_build_query($queryParams);
-        }
-
         $options = [
             'headers' => [
                 'Authorization' => 'Bearer ' . $this->getAccessToken(),
-                'Accept' => 'application/json'
+                'Accept' => 'application/json',
             ],
-            'allow_redirects' => false
+            'allow_redirects' => false,
         ];
-        if (!empty($data)) {
-            $options[(self::METHOD_GET == $method) ? 'query' : 'json'] = $data;
+
+        if (!empty($queryParams)) {
+            $options['query'] = $queryParams;
+        }
+
+        if (!empty($data) && self::METHOD_GET !== $method) {
+            $options['json'] = $data;
         }
 
-        $client = new GuzzleClient();
         try {
-            $response = $client->request($method, $apiUrl, $options);
+            $response = (new GuzzleClient())->request($method, $apiUrl, $options);
         } catch (ClientException $e) {
             // transform Guzzle ClientException into some more readable form, so that body content does not get truncated
             $body = json_decode($e->getResponse()->getBody()->getContents());

src/Bexio/Resource/Contact.php

@@ -29,7 +29,7 @@ public function getContacts(array $params = [])
      */
     public function searchContacts(array $params = [], array $queryParams = [])
     {
-        return $this->client->post('contact/search', $params);
+        return $this->client->post('contact/search', $params, $queryParams);
     }
 
     /**