Merge branch 'release/4.0.10'

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.10] - 1 Jul 2018
+### Changed
+- service provider to register singleton and alias in `register()` method.
+
 ## [4.0.9] - 28 May 2018
 ### Added
 - class-name resolution from Service container, allowing for dependency

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