Merge pull request #331 from norkunas/psr-client

Allow PSR-18 client

Author: norkunas

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 The changelog describes what have been "Added", "Changed", "Removed" or "Fixed" between versions.
 
+## Version 5.19.0
+
+### Changed
+
+- Allow PSR-18 client
+- Updated Geocoder Provider dependency requirements to the latest versions
+
 ## Version 5.18.0
 
 ### Added

ProviderFactory/AbstractFactory.php

@@ -13,7 +13,7 @@
 namespace Bazinga\GeocoderBundle\ProviderFactory;
 
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -30,18 +30,15 @@ abstract class AbstractFactory implements ProviderFactoryInterface
      */
     protected static $dependencies = [];
 
-    /**
-     * @var HttpClient|null
-     */
-    protected $httpClient;
+    protected ?ClientInterface $httpClient;
 
-    public function __construct(HttpClient $httpClient = null)
+    public function __construct(?ClientInterface $httpClient = null)
     {
         $this->httpClient = $httpClient;
     }
 
     /**
-     * @phpstan-param array<mixed, mixed> $config
+     * @param array<mixed, mixed> $config
      */
     abstract protected function getProvider(array $config): Provider;
 

ProviderFactory/AlgoliaFactory.php

@@ -14,8 +14,8 @@
 
 use Geocoder\Provider\AlgoliaPlaces\AlgoliaPlaces;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class AlgoliaFactory extends AbstractFactory
@@ -25,7 +25,7 @@ final class AlgoliaFactory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{api_key: ?string, app_id: ?string, httplug_client: ?HttpClient} $config
+     * @param array{api_key: ?string, app_id: ?string, httplug_client: ?ClientInterface} $config
      */
     protected function getProvider(array $config): Provider
     {
@@ -42,7 +42,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'app_id' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('httplug_client', [ClientInterface::class, 'null']);
         $resolver->setAllowedTypes('api_key', ['string', 'null']);
         $resolver->setAllowedTypes('app_id', ['string', 'null']);
     }

ProviderFactory/ArcGISOnlineFactory.php

@@ -14,8 +14,8 @@
 
 use Geocoder\Provider\ArcGISOnline\ArcGISOnline;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class ArcGISOnlineFactory extends AbstractFactory
@@ -25,7 +25,7 @@ final class ArcGISOnlineFactory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{source_country: ?string, httplug_client: ?HttpClient} $config
+     * @param array{source_country: ?string, httplug_client: ?ClientInterface} $config
      */
     protected function getProvider(array $config): Provider
     {
@@ -41,7 +41,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'source_country' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('httplug_client', [ClientInterface::class, 'null']);
         $resolver->setAllowedTypes('source_country', ['string', 'null']);
     }
 }

ProviderFactory/BingMapsFactory.php

@@ -14,8 +14,8 @@
 
 use Geocoder\Provider\BingMaps\BingMaps;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class BingMapsFactory extends AbstractFactory
@@ -25,7 +25,7 @@ final class BingMapsFactory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{api_key: string, httplug_client: ?HttpClient} $config
+     * @param array{api_key: string, httplug_client: ?ClientInterface} $config
      */
     protected function getProvider(array $config): Provider
     {
@@ -41,7 +41,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('httplug_client', [ClientInterface::class, 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }

ProviderFactory/ChainFactory.php

@@ -30,7 +30,7 @@ final class ChainFactory extends AbstractFactory implements LoggerAwareInterface
     ];
 
     /**
-     * @phpstan-param array{services: Provider[]} $config
+     * @param array{services: Provider[]} $config
      */
     protected function getProvider(array $config): Provider
     {

ProviderFactory/FreeGeoIpFactory.php

@@ -14,8 +14,8 @@
 
 use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class FreeGeoIpFactory extends AbstractFactory
@@ -25,7 +25,7 @@ final class FreeGeoIpFactory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{base_url: string, httplug_client: ?HttpClient} $config
+     * @param array{base_url: string, httplug_client: ?ClientInterface} $config
      */
     protected function getProvider(array $config): Provider
     {
@@ -41,7 +41,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'base_url' => 'https://freegeoip.app/json/%s',
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('httplug_client', [ClientInterface::class, 'null']);
         $resolver->setAllowedTypes('base_url', ['string']);
     }
 }

ProviderFactory/GeoIP2Factory.php

@@ -27,7 +27,7 @@ final class GeoIP2Factory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string|int|null, license_key: string|null, locales: list<string>, webservice_options: array<mixed, mixed>, database_filename: ?string} $config
+     * @param array{provider: string, provider_service: ?ProviderInterface, model: string, user_id: string|int|null, license_key: string|null, locales: list<string>, webservice_options: array<mixed, mixed>, database_filename: ?string} $config
      */
     protected function getProvider(array $config): Provider
     {
@@ -61,7 +61,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
 
         $resolver->setRequired('provider');
         $resolver->setAllowedTypes('provider', ['string']);
-        $resolver->setAllowedTypes('provider_service', ['object', 'null']);
+        $resolver->setAllowedTypes('provider_service', [ProviderInterface::class, 'null']);
         $resolver->setAllowedTypes('model', ['string']);
         $resolver->setAllowedTypes('user_id', ['string', 'int', 'null']);
         $resolver->setAllowedTypes('license_key', ['string', 'null']);

ProviderFactory/GeoIPsFactory.php

@@ -28,13 +28,14 @@ final class GeoIPsFactory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{api_key: string, httplug_client: ?HttpClient} $config
+     * @param array{api_key: string, httplug_client: ?HttpClient} $config
      */
     protected function getProvider(array $config): Provider
     {
         @trigger_error('Bazinga\GeocoderBundle\ProviderFactory\GeoIPsFactory is deprecated since 5.6, to be removed in 6.0. See https://github.com/geocoder-php/Geocoder/issues/965', E_USER_DEPRECATED);
 
         $httplug = $config['httplug_client'] ?: $this->httpClient ?? HttpClientDiscovery::find();
+        assert($httplug instanceof HttpClient);
 
         return new GeoIPs($httplug, $config['api_key']);
     }
@@ -46,7 +47,7 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         ]);
 
         $resolver->setRequired('api_key');
-        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
         $resolver->setAllowedTypes('api_key', ['string']);
     }
 }

ProviderFactory/GeoPluginFactory.php

@@ -14,8 +14,8 @@
 
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class GeoPluginFactory extends AbstractFactory
@@ -25,7 +25,7 @@ final class GeoPluginFactory extends AbstractFactory
     ];
 
     /**
-     * @phpstan-param array{httplug_client: ?HttpClient} $config
+     * @param array{httplug_client: ?ClientInterface} $config
      */
     protected function getProvider(array $config): Provider
     {
@@ -40,6 +40,6 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
             'httplug_client' => null,
         ]);
 
-        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('httplug_client', [ClientInterface::class, 'null']);
     }
 }