Merge pull request #20 from arrizalamin/lumen-support

Lumen Support
stevebauman · Oct 12, 2015 · 39ebe91 · 39ebe91 · natsu90 · Oct 14, 2015
2 parents 0dbcf72 + ec889a5
commit 39ebe91
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/LocationServiceProvider.php b/src/LocationServiceProvider.php
@@ -30,11 +30,13 @@ public function register()
     {
         $config = __DIR__.'/Config/config.php';
 
-        $this->mergeConfigFrom($config, 'location');
+        if (class_exists('Illuminate\Foundation\Application', false)) {
+            $this->publishes([
+                $config => config_path('location.php'),
+            ], 'config');
+        }
 
-        $this->publishes([
-            $config => config_path('location.php'),
-        ], 'config');
+        $this->mergeConfigFrom($config, 'location');
     }
 
     /**