Merge branch 'feature/optimize-service-provider' into develop

mikebronner · mikebronner · commit 2da0d71fb248 · 2018-07-01T11:09:56.000-07:00
diff --git a/src/Providers/GeocoderService.php b/src/Providers/GeocoderService.php
@@ -25,19 +25,16 @@ public function boot()
             "config"
         );
         $this->mergeConfigFrom($configPath, "geocoder");
-        $geocoder = (new ProviderAndDumperAggregator)
-            ->registerProvidersFromConfig(collect(config("geocoder.providers")));
-        $this->app
-            ->singleton("geocoder", function () use ($geocoder) {
-                return $geocoder;
-            });
-        $this->app
-            ->instance(ProviderAndDumperAggregator::class, $geocoder);
     }
 
     public function register()
     {
         $this->app->alias("Geocoder", Geocoder::class);
+        $this->app->singleton(ProviderAndDumperAggregator::class, function () {
+            return (new ProviderAndDumperAggregator)
+                ->registerProvidersFromConfig(collect(config("geocoder.providers")));
+        });
+        $this->app->bind('geocoder', ProviderAndDumperAggregator::class);
     }
 
     public function provides() : array
