From 3155b85020f04c4c87c12c7f0ce239d1c4e8b64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20Nork=C5=ABnas?= <norkunas.tom@gmail.com>
Date: Thu, 11 Dec 2025 14:43:07 +0200
Subject: [PATCH] Replace deprecated `HttpClientDiscovery` usage to
 `Psr18ClientDiscovery`

---
 src/ProviderFactory/AlgoliaFactory.php          | 4 ++--
 src/ProviderFactory/ArcGISOnlineFactory.php     | 4 ++--
 src/ProviderFactory/BingMapsFactory.php         | 4 ++--
 src/ProviderFactory/FreeGeoIpFactory.php        | 4 ++--
 src/ProviderFactory/GeoPluginFactory.php        | 4 ++--
 src/ProviderFactory/GeonamesFactory.php         | 4 ++--
 src/ProviderFactory/GoogleMapsFactory.php       | 4 ++--
 src/ProviderFactory/GoogleMapsPlacesFactory.php | 4 ++--
 src/ProviderFactory/HereFactory.php             | 4 ++--
 src/ProviderFactory/HostIpFactory.php           | 4 ++--
 src/ProviderFactory/IpInfoDbFactory.php         | 4 ++--
 src/ProviderFactory/IpInfoFactory.php           | 4 ++--
 src/ProviderFactory/IpstackFactory.php          | 4 ++--
 src/ProviderFactory/LocationIQFactory.php       | 4 ++--
 src/ProviderFactory/MapQuestFactory.php         | 4 ++--
 src/ProviderFactory/MapboxFactory.php           | 4 ++--
 src/ProviderFactory/MaxMindFactory.php          | 4 ++--
 src/ProviderFactory/NominatimFactory.php        | 4 ++--
 src/ProviderFactory/OpenCageFactory.php         | 4 ++--
 src/ProviderFactory/OpenRouteServiceFactory.php | 4 ++--
 src/ProviderFactory/PickPointFactory.php        | 4 ++--
 src/ProviderFactory/TomTomFactory.php           | 4 ++--
 src/ProviderFactory/YandexFactory.php           | 4 ++--
 23 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/ProviderFactory/AlgoliaFactory.php b/src/ProviderFactory/AlgoliaFactory.php
index 7bb2837..de1d523 100644
--- a/src/ProviderFactory/AlgoliaFactory.php
+++ b/src/ProviderFactory/AlgoliaFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\AlgoliaPlaces\AlgoliaPlaces;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class AlgoliaFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new AlgoliaPlaces($httpClient, $config['api_key'], $config['app_id']);
     }
diff --git a/src/ProviderFactory/ArcGISOnlineFactory.php b/src/ProviderFactory/ArcGISOnlineFactory.php
index e35c1f3..c5c97a4 100644
--- a/src/ProviderFactory/ArcGISOnlineFactory.php
+++ b/src/ProviderFactory/ArcGISOnlineFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\ArcGISOnline\ArcGISOnline;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class ArcGISOnlineFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new ArcGISOnline($httpClient, $config['source_country']);
     }
diff --git a/src/ProviderFactory/BingMapsFactory.php b/src/ProviderFactory/BingMapsFactory.php
index 03abecf..a0412e9 100644
--- a/src/ProviderFactory/BingMapsFactory.php
+++ b/src/ProviderFactory/BingMapsFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\BingMaps\BingMaps;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class BingMapsFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new BingMaps($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/FreeGeoIpFactory.php b/src/ProviderFactory/FreeGeoIpFactory.php
index 53da263..bbff314 100644
--- a/src/ProviderFactory/FreeGeoIpFactory.php
+++ b/src/ProviderFactory/FreeGeoIpFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class FreeGeoIpFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new FreeGeoIp($httpClient, $config['base_url']);
     }
diff --git a/src/ProviderFactory/GeoPluginFactory.php b/src/ProviderFactory/GeoPluginFactory.php
index 2162676..dd68c8a 100644
--- a/src/ProviderFactory/GeoPluginFactory.php
+++ b/src/ProviderFactory/GeoPluginFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class GeoPluginFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new GeoPlugin($httpClient);
     }
diff --git a/src/ProviderFactory/GeonamesFactory.php b/src/ProviderFactory/GeonamesFactory.php
index 81c1afb..b37c79f 100644
--- a/src/ProviderFactory/GeonamesFactory.php
+++ b/src/ProviderFactory/GeonamesFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\Geonames\Geonames;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class GeonamesFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new Geonames($httpClient, $config['username']);
     }
diff --git a/src/ProviderFactory/GoogleMapsFactory.php b/src/ProviderFactory/GoogleMapsFactory.php
index 2f548ea..d7c4b75 100644
--- a/src/ProviderFactory/GoogleMapsFactory.php
+++ b/src/ProviderFactory/GoogleMapsFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class GoogleMapsFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new GoogleMaps($httpClient, $config['region'], $config['api_key']);
     }
diff --git a/src/ProviderFactory/GoogleMapsPlacesFactory.php b/src/ProviderFactory/GoogleMapsPlacesFactory.php
index 82ac985..db2e95d 100644
--- a/src/ProviderFactory/GoogleMapsPlacesFactory.php
+++ b/src/ProviderFactory/GoogleMapsPlacesFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\GoogleMapsPlaces\GoogleMapsPlaces;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class GoogleMapsPlacesFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new GoogleMapsPlaces($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/HereFactory.php b/src/ProviderFactory/HereFactory.php
index 48309fb..c940d7e 100644
--- a/src/ProviderFactory/HereFactory.php
+++ b/src/ProviderFactory/HereFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\Here\Here;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -33,7 +33,7 @@ protected function getProvider(array $config): Provider
             throw new \InvalidArgumentException('No authentication key provided. Here requires app_key or app_code and app_id.');
         }
 
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         if (!empty($config['app_key'])) {
             if (!method_exists(Here::class, 'createUsingApiKey')) {
diff --git a/src/ProviderFactory/HostIpFactory.php b/src/ProviderFactory/HostIpFactory.php
index 864e022..f90e66b 100644
--- a/src/ProviderFactory/HostIpFactory.php
+++ b/src/ProviderFactory/HostIpFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\HostIp\HostIp;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class HostIpFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new HostIp($httpClient);
     }
diff --git a/src/ProviderFactory/IpInfoDbFactory.php b/src/ProviderFactory/IpInfoDbFactory.php
index d065f8d..2349f0b 100644
--- a/src/ProviderFactory/IpInfoDbFactory.php
+++ b/src/ProviderFactory/IpInfoDbFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\IpInfoDb\IpInfoDb;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class IpInfoDbFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new IpInfoDb($httpClient, $config['api_key'], $config['precision']);
     }
diff --git a/src/ProviderFactory/IpInfoFactory.php b/src/ProviderFactory/IpInfoFactory.php
index 2420f79..4e396fd 100644
--- a/src/ProviderFactory/IpInfoFactory.php
+++ b/src/ProviderFactory/IpInfoFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\IpInfo\IpInfo;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class IpInfoFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new IpInfo($httpClient);
     }
diff --git a/src/ProviderFactory/IpstackFactory.php b/src/ProviderFactory/IpstackFactory.php
index 5396c90..0062e83 100644
--- a/src/ProviderFactory/IpstackFactory.php
+++ b/src/ProviderFactory/IpstackFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\Ipstack\Ipstack;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class IpstackFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new Ipstack($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/LocationIQFactory.php b/src/ProviderFactory/LocationIQFactory.php
index ce793d3..63e4b0f 100644
--- a/src/ProviderFactory/LocationIQFactory.php
+++ b/src/ProviderFactory/LocationIQFactory.php
@@ -12,7 +12,7 @@
 
 use Geocoder\Provider\LocationIQ\LocationIQ;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -27,7 +27,7 @@ final class LocationIQFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new LocationIQ($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/MapQuestFactory.php b/src/ProviderFactory/MapQuestFactory.php
index 6207e28..4491997 100644
--- a/src/ProviderFactory/MapQuestFactory.php
+++ b/src/ProviderFactory/MapQuestFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\MapQuest\MapQuest;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class MapQuestFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new MapQuest($httpClient, $config['api_key'], $config['licensed']);
     }
diff --git a/src/ProviderFactory/MapboxFactory.php b/src/ProviderFactory/MapboxFactory.php
index 2622999..cdaaa63 100644
--- a/src/ProviderFactory/MapboxFactory.php
+++ b/src/ProviderFactory/MapboxFactory.php
@@ -12,7 +12,7 @@
 
 use Geocoder\Provider\Mapbox\Mapbox;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -27,7 +27,7 @@ final class MapboxFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new Mapbox($httpClient, $config['api_key'], $config['country'], $config['mode']);
     }
diff --git a/src/ProviderFactory/MaxMindFactory.php b/src/ProviderFactory/MaxMindFactory.php
index c551f7b..c7da086 100644
--- a/src/ProviderFactory/MaxMindFactory.php
+++ b/src/ProviderFactory/MaxMindFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\MaxMind\MaxMind;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class MaxMindFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new MaxMind($httpClient, $config['api_key'], $config['endpoint']);
     }
diff --git a/src/ProviderFactory/NominatimFactory.php b/src/ProviderFactory/NominatimFactory.php
index 28dcd2a..f6d9c46 100644
--- a/src/ProviderFactory/NominatimFactory.php
+++ b/src/ProviderFactory/NominatimFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\Nominatim\Nominatim;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class NominatimFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new Nominatim($httpClient, $config['root_url'], $config['user_agent']);
     }
diff --git a/src/ProviderFactory/OpenCageFactory.php b/src/ProviderFactory/OpenCageFactory.php
index 65a9fc3..02b253b 100644
--- a/src/ProviderFactory/OpenCageFactory.php
+++ b/src/ProviderFactory/OpenCageFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\OpenCage\OpenCage;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class OpenCageFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new OpenCage($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/OpenRouteServiceFactory.php b/src/ProviderFactory/OpenRouteServiceFactory.php
index 86214fc..2bcd2e8 100644
--- a/src/ProviderFactory/OpenRouteServiceFactory.php
+++ b/src/ProviderFactory/OpenRouteServiceFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\OpenRouteService\OpenRouteService;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class OpenRouteServiceFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new OpenRouteService($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/PickPointFactory.php b/src/ProviderFactory/PickPointFactory.php
index 35c95aa..66d583c 100644
--- a/src/ProviderFactory/PickPointFactory.php
+++ b/src/ProviderFactory/PickPointFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\PickPoint\PickPoint;
 use Geocoder\Provider\Provider;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class PickPointFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new PickPoint($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/TomTomFactory.php b/src/ProviderFactory/TomTomFactory.php
index 27820e7..b707b2a 100644
--- a/src/ProviderFactory/TomTomFactory.php
+++ b/src/ProviderFactory/TomTomFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\Provider;
 use Geocoder\Provider\TomTom\TomTom;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class TomTomFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new TomTom($httpClient, $config['api_key']);
     }
diff --git a/src/ProviderFactory/YandexFactory.php b/src/ProviderFactory/YandexFactory.php
index 9792c09..37c9c2d 100644
--- a/src/ProviderFactory/YandexFactory.php
+++ b/src/ProviderFactory/YandexFactory.php
@@ -14,7 +14,7 @@
 
 use Geocoder\Provider\Provider;
 use Geocoder\Provider\Yandex\Yandex;
-use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,7 +29,7 @@ final class YandexFactory extends AbstractFactory
      */
     protected function getProvider(array $config): Provider
     {
-        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? HttpClientDiscovery::find();
+        $httpClient = $config['http_client'] ?? $config['httplug_client'] ?? $this->httpClient ?? Psr18ClientDiscovery::find();
 
         return new Yandex($httpClient, $config['toponym'], $config['api_key']);
     }