Merge pull request #175 from romainneutron/add-ip-info-factory

Add IpInfoFactory

Author: Nyholm

ProviderFactory/IpInfoFactory.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the BazingaGeocoderBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+namespace Bazinga\GeocoderBundle\ProviderFactory;
+
+use Geocoder\Provider\IpInfo\IpInfo;
+use Geocoder\Provider\Provider;
+use Http\Client\HttpClient;
+use Http\Discovery\HttpClientDiscovery;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class IpInfoFactory extends AbstractFactory
+{
+    protected static $dependencies = [
+        ['requiredClass' => IpInfo::class, 'packageName' => 'geocoder-php/ip-info-provider'],
+    ];
+
+    protected function getProvider(array $config): Provider
+    {
+        $httplug = $config['httplug_client'] ?: HttpClientDiscovery::find();
+
+        return new IpInfo($httplug);
+    }
+
+    protected static function configureOptionResolver(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'httplug_client' => null,
+        ]);
+
+        $resolver->setAllowedTypes('httplug_client', [HttpClient::class, 'null']);
+    }
+}

Resources/doc/services.md

@@ -21,6 +21,7 @@ Here is a list of all provider factories and their options.
 | `Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory` | httplug_client
 | `Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory` | httplug_client, api_key, region
 | `Bazinga\GeocoderBundle\ProviderFactory\HostIpFactory` | httplug_client
+| `Bazinga\GeocoderBundle\ProviderFactory\IpInfoFactory` | httplug_client
 | `Bazinga\GeocoderBundle\ProviderFactory\IpInfoDbFactory` | httplug_client, api_key, precision
 | `Bazinga\GeocoderBundle\ProviderFactory\MapQuestFactory` | httplug_client, api_key, licensed
 | `Bazinga\GeocoderBundle\ProviderFactory\MapzenFactory` | httplug_client, api_key

Tests/Functional/ProviderFactoryTest.php

@@ -24,6 +24,7 @@
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
 use Geocoder\Provider\HostIp\HostIp;
+use Geocoder\Provider\IpInfo\IpInfo;
 use Geocoder\Provider\IpInfoDb\IpInfoDb;
 use Geocoder\Provider\MapQuest\MapQuest;
 use Geocoder\Provider\Mapzen\Mapzen;
@@ -59,6 +60,7 @@ public function getProviders()
             [GeoPlugin::class, ['empty']],
             [GoogleMaps::class, ['empty']],
             [HostIp::class, ['empty']],
+            [IpInfo::class, ['acme']],
             [IpInfoDb::class, ['empty', 'acme']],
             [MapQuest::class, ['acme']],
             [Mapzen::class, ['acme']],

Tests/Functional/config/provider/ipinfo.yml

@@ -0,0 +1,6 @@
+bazinga_geocoder:
+  profiling:
+    enabled: false
+  providers:
+    acme:
+      factory: Bazinga\GeocoderBundle\ProviderFactory\IpInfoFactory

composer.json

@@ -39,6 +39,7 @@
     "geocoder-php/geonames-provider": "^4.0",
     "geocoder-php/geoips-provider": "^4.0",
     "geocoder-php/geoip2-provider": "^4.0",
+    "geocoder-php/ip-info-provider": "^0.1",
     "geocoder-php/ip-info-db-provider": "^4.0",
     "geocoder-php/host-ip-provider": "^4.0",
     "geocoder-php/maxmind-binary-provider": "^4.0",