Updating for Laravel 5.3

mikebronner · mikebronner · commit 21768be3f809 · 2016-09-29T19:42:43.000-07:00
diff --git a/composer.json b/composer.json
@@ -1,44 +1,50 @@
 {
-    "name"        : "toin0u/geocoder-laravel",
-    "description" : "Geocoder Service provider for Laravel 4",
-    "keywords"    : ["laravel", "geocoder", "geocoding"],
-    "homepage"    : "http://geocoder-php.org/",
-    "license"     : "MIT",
-
-    "authors" : [{
-        "name"     : "Antoine Corcy",
-        "email"    : "contact@sbin.dk",
-        "homepage" : "http://sbin.dk",
-        "role"     : "Developer"
-    }],
-
-    "require" : {
-        "php"                 : ">=5.4",
-        "illuminate/support"  : "~5.0",
-        "willdurand/geocoder" : "~2.4"
+    "name": "toin0u/geocoder-laravel",
+    "description": "Geocoder Service Provider for Laravel",
+    "keywords": [
+        "laravel",
+        "geocoder",
+        "geocoding"
+    ],
+    "homepage": "http://geocoder-php.org/",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Antoine Corcy",
+            "email": "contact@sbin.dk",
+            "homepage": "http://sbin.dk",
+            "role": "Developer"
+        },
+        {
+            "name": "Mike Bronner",
+            "email": "hello@genealabs.com",
+            "homepage": "https://genealabs.com",
+            "role": "developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.4",
+        "illuminate/support": "~5.0",
+        "willdurand/geocoder": "~3.3"
     },
-
-    "require-dev" : {
-        "orchestra/testbench"    : "~3.0",
-        "satooshi/php-coveralls" : "~0.6",
-        "phpunit/phpunit"        : "~4.5"
+    "require-dev": {
+        "orchestra/testbench": "~3.0",
+        "satooshi/php-coveralls": "~0.6",
+        "phpunit/phpunit": "~4.5"
     },
-
-    "autoload" : {
-        "psr-4" : {
-            "Toin0u\\Geocoder\\" : "src/"
+    "autoload": {
+        "psr-4": {
+            "Toin0u\\Geocoder\\": "src/"
         }
     },
-
-    "autoload-dev" : {
+    "autoload-dev": {
         "psr-4": {
-            "Toin0u\\Tests\\Geocoder\\" : "tests/"
+            "Toin0u\\Tests\\Geocoder\\": "tests/"
         }
     },
-
-    "extra" : {
-        "branch-alias" : {
-            "dev-master" : "0.6-dev"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.7-dev"
         }
     }
 }
diff --git a/config/geocoder.php b/config/geocoder.php
@@ -13,8 +13,8 @@
     // Providers get called in the chain order given here.
     // The first one to return a result will be used.
     'providers' => [
-        'Geocoder\Provider\GoogleMapsProvider' => ['fr-FR', 'Île-de-France', true],
-        'Geocoder\Provider\FreeGeoIpProvider'  => null,
+        'Geocoder\Provider\GoogleMaps' => ['fr-FR', 'France', true],
+        'Geocoder\Provider\FreeGeoIp'  => null,
     ],
-    'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter',
+    'adapter'  => 'Ivory\HttpAdapter\Guzzle6HttpAdapter',
 ];
diff --git a/src/GeocoderServiceProvider.php b/src/GeocoderServiceProvider.php
@@ -11,8 +11,9 @@
 
 namespace Toin0u\Geocoder;
 
-use Geocoder\Geocoder;
-use Geocoder\Provider\ChainProvider;
+use Geocoder\ProviderAggregator;
+use Geocoder\Provider\Chain;
+use ReflectionClass;
 
 /**
  * Geocoder service provider
@@ -30,7 +31,7 @@ public function boot()
     {
         $source = realpath(__DIR__ . '/../config/geocoder.php');
 
-        $this->publishes([$source => config_path('geocoder.php')]);
+        $this->publishes([$source => config_path('geocoder.php')], 'config');
 
         $this->mergeConfigFrom($source, 'geocoder');
     }
@@ -42,35 +43,30 @@ public function boot()
      */
     public function register()
     {
-        $this->app->singleton('geocoder.adapter', function($app) {
-            $adapter = $app['config']->get('geocoder.adapter');
+        $this->app->singleton('geocoder.adapter', function ($app) {
+            $adapter = config('geocoder.adapter');
 
             return new $adapter;
         });
 
-        $this->app->singleton('geocoder.chain', function($app) {
-            $providers = [];
+        $this->app->singleton('geocoder.chain', function ($app) {
+            $providers = collect(config('geocoder.providers'))
+                ->map(function ($arguments, $provider) {
+                    $reflection = new ReflectionClass($provider);
 
-            foreach($app['config']->get('geocoder.providers') as $provider => $arguments) {
-                if (0 !== count($arguments)) {
-                    $providers[] = call_user_func_array(
-                        function ($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null) use ($app, $provider) {
-                            return new $provider($app['geocoder.adapter'], $arg1, $arg2, $arg3, $arg4);
-                        },
-                        $arguments
-                    );
+                    if (is_array($arguments)) {
+                        array_unshift($arguments, $this->app['geocoder.adapter']);
+                        return $reflection->newInstanceArgs($arguments);
+                    }
 
-                    continue;
-                }
+                    return $reflection->newInstance($this->app['geocoder.adapter']);
+                });
 
-                $providers[] = new $provider($app['geocoder.adapter']);
-            }
-
-            return new ChainProvider($providers);
+            return new Chain($providers->toArray());
         });
 
-        $this->app['geocoder'] = $this->app->share(function($app) {
-            $geocoder = new Geocoder;
+        $this->app->singleton('geocoder', function ($app) {
+            $geocoder = new ProviderAggregator();
             $geocoder->registerProvider($app['geocoder.chain']);
 
             return $geocoder;
