use singleton instead of share

toin0u · toin0u · commit 9ed9177a5bdc · 2013-09-20T23:40:58.000+02:00
diff --git a/src/Toin0u/Geocoder/GeocoderServiceProvider.php b/src/Toin0u/Geocoder/GeocoderServiceProvider.php
@@ -11,7 +11,6 @@
 
 namespace Toin0u\Geocoder;
 
-use Config;
 use Geocoder\Geocoder;
 use Illuminate\Support\ServiceProvider;
 
@@ -48,18 +47,16 @@ public function register()
     {
         $app = $this->app;
 
-        $this->app['geocoder.adapter'] = $this->app->share(function() {
-            $adapter = Config::get('geocoder-laravel::adapter');
-            $class   = 'Geocoder\HttpAdapter\\' . $adapter;
+        $this->app->singleton('geocoder.adapter', function($app) {
+            $adapter = $app['config']->get('geocoder-laravel::adapter');
 
-            return new $class;
+            return new $adapter;
         });
 
-        $this->app['geocoder.provider'] = $this->app->share(function($app) {
-            $provider = Config::get('geocoder-laravel::provider');
-            $class    = '\Geocoder\Provider\\' . $provider;
+        $this->app->singleton('geocoder.provider', function($app) {
+            $provider = $app['config']->get('geocoder-laravel::provider');
 
-            return new $class($app['geocoder.adapter']);
+            return new $provider($app['geocoder.adapter']);
         });
 
         $this->app['geocoder'] = $this->app->share(function($app) {
@@ -77,6 +74,6 @@ public function register()
      */
     public function provides()
     {
-        return array('geocoder');
+        return array('geocoder', 'geocoder.adapter', 'geocoder.provider');
     }
 }
diff --git a/src/config/config.php b/src/config/config.php
@@ -10,6 +10,6 @@
  */
 
 return array(
-    'provider' => 'FreeGeoIpProvider',
-    'adapter'  => 'CurlHttpAdapter'
+    'provider' => 'Geocoder\Provider\FreeGeoIpProvider',
+    'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter'
 );
diff --git a/tests/Geocoder/Tests/GeocoderServiceProviderTest.php b/tests/Geocoder/Tests/GeocoderServiceProviderTest.php
@@ -11,17 +11,15 @@
 
 namespace Geocoder\Tests;
 
-use Config;
-
 /**
  * @author Antoine Corcy <contact@sbin.dk>
  */
 class GeocoderServiceProviderTest extends TestCase
 {
     public function testConfig()
     {
-        $this->assertSame('FreeGeoIpProvider', Config::get('geocoder-laravel::provider'));
-        $this->assertSame('CurlHttpAdapter', Config::get('geocoder-laravel::adapter'));
+        $this->assertSame('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::provider'));
+        $this->assertSame('Geocoder\HttpAdapter\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));
     }
 
     public function testLoadedProviders()

Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,15 @@`
`11`	`11`
`12`	`12`	`namespace Geocoder\Tests;`
`13`	`13`
`14`		`-use Config;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* @author Antoine Corcy <contact@sbin.dk>`
`18`	`16`	`*/`
`19`	`17`	`class GeocoderServiceProviderTest extends TestCase`
`20`	`18`	`{`
`21`	`19`	`public function testConfig()`
`22`	`20`	`{`
`23`		`- $this->assertSame('FreeGeoIpProvider', Config::get('geocoder-laravel::provider'));`
`24`		`- $this->assertSame('CurlHttpAdapter', Config::get('geocoder-laravel::adapter'));`
	`21`	`+ $this->assertSame('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::provider'));`
	`22`	`+ $this->assertSame('Geocoder\HttpAdapter\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`public function testLoadedProviders()`