Merge branch 'master' of github.com:geocoder-php/GeocoderLaravel into develop

Author: mikebronner

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.9] - 28 May 2018
+### Added
+- class-name resolution from Service container, allowing for dependency
+ injection.
+
+## [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.

README.md

@@ -234,6 +234,19 @@ app('geocoder')->reverse(43.882587,-103.454067)->get();
 app('geocoder')->geocode('Los Angeles, CA')->dump('kml');
 ```
 
+#### Dependency Injection
+```php
+use Geocoder\Laravel\ProviderAndDumperAggregator as Geocoder;
+
+class GeocoderController extends Controller
+{
+ public function getGeocode(Geocoder $geocoder)
+ {
+ $geocoder->geocode('Los Angeles, CA')->get()
+ }
+}
+```
+
 ## Upgrading
 Anytime you upgrade this package, please remember to clear your cache, to prevent incompatible cached responses when breaking changes are introduced (this should hopefully only be necessary in major versions):
 ```sh

src/Providers/GeocoderService.php

@@ -11,32 +11,52 @@
 
 use Geocoder\Laravel\Facades\Geocoder;
 use Geocoder\Laravel\ProviderAndDumperAggregator;
-use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
-use ReflectionClass;
 
 class GeocoderService extends ServiceProvider
 {
  protected $defer = false;
 
  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 () {
- return (new ProviderAndDumperAggregator)
- ->registerProvidersFromConfig(collect(config('geocoder.providers')));
- });
+ $configPath = __DIR__ . "/../../config/geocoder.php";
+ $this->publishes(
+ [$configPath => $this->configPath("geocoder.php")],
+ "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->alias("Geocoder", Geocoder::class);
  }
 
  public function provides() : array
  {
- return ['geocoder'];
+ return ["geocoder", ProviderAndDumperAggregator::class];
+ }
+
+ protected function configPath(string $path = "") : string
+ {
+ if (function_exists("config_path")) {
+ return config_path($path);
+ }
+
+ $pathParts = [
+ app()->basePath(),
+ "config",
+ trim($path, "/"),
+ ];
+
+ return implode("/", $pathParts);
  }
 }