Merge pull request #296 from pupaxxo/patch-2

Add support for api-key based authentication in here factory

Author: norkunas

ProviderFactory/HereFactory.php

@@ -27,6 +27,18 @@ protected function getProvider(array $config): Provider
     {
         $httplug = $config['httplug_client'] ?: $this->httpClient ?? HttpClientDiscovery::find();
 
+        if (empty($config['app_key']) && empty($config['app_id']) && empty($config['app_code'])) {
+            throw new \InvalidArgumentException('No authentication key provided. Here requires app_key or app_code and app_id.');
+        }
+
+        if (!empty($config['app_key'])) {
+            if (!method_exists(Here::class, 'createUsingApiKey')) {
+                throw new \InvalidArgumentException('Here provider has no support for `creatingUsingApiKey` method.');
+            }
+
+            return Here::createUsingApiKey($httplug, $config['app_key'], $config['use_cit']);
+        }
+
         return new Here($httplug, $config['app_id'], $config['app_code'], $config['use_cit']);
     }
 
@@ -35,10 +47,15 @@ protected static function configureOptionResolver(OptionsResolver $resolver)
         $resolver->setDefaults([
             'httplug_client' => null,
             'use_cit' => false,
+            'app_key' => null,
+            'app_id' => null,
+            'app_code' => null,
         ]);
 
         $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setAllowedTypes('app_key', ['string', 'null']);
+        $resolver->setAllowedTypes('app_id', ['string', 'null']);
+        $resolver->setAllowedTypes('app_code', ['string', 'null']);
         $resolver->setAllowedTypes('use_cit', ['bool', 'false']);
-        $resolver->setRequired(['app_id', 'app_code']);
     }
 }

composer.json

@@ -35,7 +35,7 @@
     "geocoder-php/geonames-provider": "^4.0",
     "geocoder-php/google-maps-places-provider": "^1.0",
     "geocoder-php/google-maps-provider": "^4.0",
-    "geocoder-php/here-provider": "^0.2",
+    "geocoder-php/here-provider": "^0.4|^0.5|^0.6",
     "geocoder-php/host-ip-provider": "^4.0",
     "geocoder-php/ip-info-db-provider": "^4.0",
     "geocoder-php/ip-info-provider": "^0.1",