fix the way to implode provider's arguments + unit tests

toin0u · toin0u · commit 299b9003c8cf · 2014-06-23T17:48:54.000+02:00
diff --git a/src/Toin0u/Geocoder/GeocoderServiceProvider.php b/src/Toin0u/Geocoder/GeocoderServiceProvider.php
@@ -57,7 +57,12 @@ public function register()
 
             foreach($app['config']->get('geocoder-laravel::providers') as $provider => $arguments) {
                 if (0 !== count($arguments)) {
-                    $providers[] = new $provider($app['geocoder.adapter'], implode(',', $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
+                    );
 
                     continue;
                 }
diff --git a/tests/Geocoder/Tests/GeocoderServiceProviderTest.php b/tests/Geocoder/Tests/GeocoderServiceProviderTest.php
@@ -48,7 +48,12 @@ public function testGeocoderDefaultProvider()
         $providers = $this->getProtectedProperty($this->app['geocoder.chain'], 'providers');
 
         $this->assertInstanceOf('Geocoder\\Provider\\GoogleMapsProvider', $providers[0]);
+        $this->assertSame('fr-FR', $providers[0]->getLocale());
+        $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $providers[0]->getAdapter());
+
         $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $providers[1]);
+        $this->assertNull($providers[1]->getLocale());
+        $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $providers[1]->getAdapter());
     }
 
     public function testGeocoder()
