Expect a PSR-18 client instead of a PHP-HTTP client

CHANGELOG.md

@@ -6,6 +6,10 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased]
 
+### Changed
+
+- Expect a PSR-18 client instead of a PHP-HTTP client. N.B. PHP-HTTP clients implement this interface, so it should not be a breaking change.
+
 ### Removed
 
 - PHP <7.4 support

README.md

@@ -25,19 +25,19 @@ $ composer require swisnl/geocoder-php-nationaal-georegister-provider
 
 ### HTTP Client
 
-PHP Geocoder is decoupled from any HTTP messaging client with the help of [PHP-HTTP](http://php-http.org/).
-This requires another package providing [php-http/client-implementation](https://packagist.org/providers/php-http/client-implementation).
-To use Guzzle 6, for example, simply require `php-http/guzzle6-adapter`:
+PHP Geocoder is decoupled from any HTTP messaging client with the help of [PSR-18 HTTP Client](https://www.php-fig.org/psr/psr-18/).
+This requires another package providing [psr/http-client-implementation](https://packagist.org/providers/psr/http-client-implementation).
+To use Guzzle 7, for example, simply require `guzzlehttp/guzzle`:
 
 ``` bash
-$ composer require php-http/guzzle6-adapter
+$ composer require guzzlehttp/guzzle
 ```
 
 ## Usage
 
 ``` php
 // Create geocoder
-$client = new \Http\Client\Curl\Client();
+$client = new \GuzzleHttp\Client();
 $geocoder = new \Swis\Geocoder\NationaalGeoregister\NationaalGeoregister($client);
 
 // Geocode!
@@ -70,7 +70,7 @@ Example using extra options:
 
 ``` php
 // On the geocoder instance:
-$client = new \Http\Client\Curl\Client();
+$client = new \GuzzleHttp\Client();
 $options = ['fq' => 'bron:BAG'];
 $geocoder = new \Swis\Geocoder\NationaalGeoregister\NationaalGeoregister($client, $options);
 

composer.json

@@ -14,12 +14,12 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
-        "geocoder-php/common-http": "^4.0",
-        "willdurand/geocoder": "^4.0"
+        "geocoder-php/common-http": "^4.5",
+        "willdurand/geocoder": "^4.6"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.4",
-        "geocoder-php/provider-integration-tests": "^1.5",
+        "friendsofphp/php-cs-fixer": "^3.9",
+        "geocoder-php/provider-integration-tests": "^1.6",
         "php-http/curl-client": "^2.0",
         "phpunit/phpunit": "^9.0"
     },

src/NationaalGeoregister.php

@@ -13,7 +13,7 @@
 use Geocoder\Provider\Provider;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 
 class NationaalGeoregister extends AbstractHttpProvider implements Provider
 {
@@ -63,10 +63,10 @@ class NationaalGeoregister extends AbstractHttpProvider implements Provider
     protected $options = [];
 
     /**
-     * @param \Http\Client\HttpClient $client  An HTTP adapter
-     * @param array                   $options Extra query parameters (optional)
+     * @param \Psr\Http\Client\ClientInterface $client  An HTTP adapter
+     * @param array                            $options Extra query parameters (optional)
      */
-    public function __construct(HttpClient $client, array $options = [])
+    public function __construct(ClientInterface $client, array $options = [])
     {
         parent::__construct($client);
 

tests/IntegrationTest.php

@@ -5,7 +5,7 @@
 namespace Swis\Geocoder\NationaalGeoregister\Tests;
 
 use Geocoder\IntegrationTest\ProviderIntegrationTest;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Swis\Geocoder\NationaalGeoregister\NationaalGeoregister;
 
 class IntegrationTest extends ProviderIntegrationTest
@@ -20,7 +20,7 @@ class IntegrationTest extends ProviderIntegrationTest
 
     protected $testIpv6 = false;
 
-    protected function createProvider(HttpClient $httpClient)
+    protected function createProvider(ClientInterface $httpClient)
     {
         return new NationaalGeoregister($httpClient);
     }