Add work-around for Lumen

Fixes #124
geocoder-php · Mar 25, 2018 · 9b899cf · 9b899cf
1 parent 7881aa7
commit 9b899cf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.8] - 25 Mar 2018
+### Added
+- work-around for missing `config_path()` function in Lumen.
+
 ## [4.0.7] - 25 Mar 2018
 ### Added
 - optional dedicated cache store.

diff --git a/src/Providers/GeocoderService.php b/src/Providers/GeocoderService.php
@@ -21,22 +21,40 @@ class GeocoderService extends ServiceProvider
 
     public function boot()
     {
-        $configPath = __DIR__ . '/../../config/geocoder.php';
-        $this->publishes([$configPath => config_path('geocoder.php')], 'config');
-        $this->mergeConfigFrom($configPath, 'geocoder');
-        $this->app->singleton('geocoder', function () {
+        $configPath = __DIR__ . "/../../config/geocoder.php";
+        $this->publishes(
+            [$configPath => $this->configPath("geocoder.php")],
+            "config"
+        );
+        $this->mergeConfigFrom($configPath, "geocoder");
+        $this->app->singleton("geocoder", function () {
             return (new ProviderAndDumperAggregator)
-                ->registerProvidersFromConfig(collect(config('geocoder.providers')));
+                ->registerProvidersFromConfig(collect(config("geocoder.providers")));
         });
     }
 
     public function register()
     {
-        $this->app->alias('Geocoder', Geocoder::class);
+        $this->app->alias("Geocoder", Geocoder::class);
     }
 
     public function provides() : array
     {
-        return ['geocoder'];
+        return ["geocoder"];
+    }
+
+    protected function configPath(string $path = "") : string
+    {
+        if (function_exists("config_path")) {
+            return config_path($path);
+        }
+
+        $pathParts = [
+            app()->basePath(),
+            "config",
+            trim($path, "/"),
+        ];
+
+        return implode("/", $pathParts);
     }
 }