Expect a PSR-18 client instead of a PHP-HTTP client (#1110)

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

* Update integration tests

Author: JaZo

Here.php

@@ -25,7 +25,7 @@
 use Geocoder\Query\Query;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author Sébastien Barré <[email protected]>
@@ -116,12 +116,12 @@ final class Here extends AbstractHttpProvider implements Provider
     private $apiKey;
 
     /**
-     * @param HttpClient $client  an HTTP adapter
-     * @param string     $appId   an App ID
-     * @param string     $appCode an App code
-     * @param bool       $useCIT  use Customer Integration Testing environment (CIT) instead of production
+     * @param ClientInterface $client  an HTTP adapter
+     * @param string          $appId   an App ID
+     * @param string          $appCode an App code
+     * @param bool            $useCIT  use Customer Integration Testing environment (CIT) instead of production
      */
-    public function __construct(HttpClient $client, string $appId = null, string $appCode = null, bool $useCIT = false)
+    public function __construct(ClientInterface $client, string $appId = null, string $appCode = null, bool $useCIT = false)
     {
         $this->appId = $appId;
         $this->appCode = $appCode;
@@ -130,7 +130,7 @@ public function __construct(HttpClient $client, string $appId = null, string $ap
         parent::__construct($client);
     }
 
-    public static function createUsingApiKey(HttpClient $client, string $apiKey, bool $useCIT = false): self
+    public static function createUsingApiKey(ClientInterface $client, string $apiKey, bool $useCIT = false): self
     {
         $client = new self($client, null, null, $useCIT);
         $client->apiKey = $apiKey;

Readme.md

@@ -24,7 +24,7 @@ composer require geocoder-php/here-provider
 New applications on the Here platform use the `api_key` authentication method.
 
 ```php
-$httpClient = new \Http\Adapter\Guzzle6\Client();
+$httpClient = new \GuzzleHttp\Client();
 
 // You must provide an API key
 $provider = \Geocoder\Provider\Here\Here::createUsingApiKey($httpClient, 'your-api-key');
@@ -35,7 +35,7 @@ $result = $geocoder->geocodeQuery(GeocodeQuery::create('Buckingham Palace, Londo
 If you're using the legacy `app_code` authentication method, use the constructor on the provider like so:
 
 ```php
-$httpClient = new \Http\Adapter\Guzzle6\Client();
+$httpClient = new \GuzzleHttp\Client();
 
 // You must provide both the app_id and app_code
 $provider = new \Geocoder\Provider\Here\Here($httpClient, 'app-id', 'app-code');

Tests/IntegrationTest.php

@@ -21,8 +21,8 @@
 use Geocoder\Model\Country;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
-use Http\Client\HttpClient;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author Sébastien Barré <[email protected]>
@@ -33,7 +33,7 @@ class IntegrationTest extends ProviderIntegrationTest
 
     protected $testIpv6 = false;
 
-    protected function createProvider(HttpClient $httpClient, bool $useCIT = false)
+    protected function createProvider(ClientInterface $httpClient, bool $useCIT = false)
     {
         return Here::createUsingApiKey($httpClient, $this->getApiKey(), $useCIT);
     }
@@ -51,9 +51,9 @@ protected function getCacheDir()
     private function getCachedHttpClient()
     {
         try {
-            $client = HttpClientDiscovery::find();
-        } catch (\Http\Discovery\NotFoundException $e) {
-            $client = $this->getMockForAbstractClass(HttpClient::class);
+            $client = Psr18ClientDiscovery::find();
+        } catch (\Http\Discovery\Exception\NotFoundException $e) {
+            $client = $this->getMockForAbstractClass(ClientInterface::class);
 
             $client
                 ->expects($this->any())