Merge config

teampickr · Mar 14, 2018 · 42fd13f · 42fd13f
1 parent 902eb9f
commit 42fd13f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/src/Frameworks/Laravel/DistanceMatrix.php b/src/Frameworks/Laravel/DistanceMatrix.php
@@ -4,10 +4,18 @@
 
 use Illuminate\Support\Facades\Facade;
 
+/**
+ * Class DistanceMatrix
+ *
+ * @package TeamPickr\DistanceMatrix\Frameworks\Laravel
+ */
 class DistanceMatrix extends Facade
 {
+    /**
+     * @return string
+     */
     protected static function getFacadeAccessor()
     {
-        return 'DistanceMatrix';
+        return \TeamPickr\DistanceMatrix\DistanceMatrix::class;
     }
 }
diff --git a/src/Frameworks/Laravel/DistanceMatrixServiceProvider.php b/src/Frameworks/Laravel/DistanceMatrixServiceProvider.php
@@ -14,7 +14,7 @@ class DistanceMatrixServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton(DistanceMatrix::class, function () {
+        $this->app->bind(DistanceMatrix::class, function () {
             return new DistanceMatrix($this->getLicense());
         });
     }
@@ -24,6 +24,8 @@ public function register()
      */
     public function boot()
     {
+        $this->mergeConfigFrom(__DIR__ . '/config.php', 'google');
+
         $this->publishes([
             __DIR__ . '/config.php' => config_path('google.php'),
         ], 'config');

diff --git a/src/Frameworks/Laravel/config.php b/src/Frameworks/Laravel/config.php
diff --git a/src/Frameworks/Laravel/google.php b/src/Frameworks/Laravel/google.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'license_type' => env('GOOGLE_LICENSE_TYPE', 'standard'),
+
+    'key' => env('GOOGLE_KEY', ''),
+
+    'client_id'      => env('GOOGLE_CLIENT_ID', ''),
+    'encryption_key' => env('GOOGLE_ENCRYPTION_KEY', ''),
+];