Merge pull request #8 from anaxamaxan/master

Change from single provider to chain provider
geocoder-php · May 12, 2014 · 38ff08f · 38ff08f
2 parents 7088f31 + 16c2492
commit 38ff08f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/src/Toin0u/Geocoder/GeocoderServiceProvider.php b/src/Toin0u/Geocoder/GeocoderServiceProvider.php
@@ -12,6 +12,7 @@
 namespace Toin0u\Geocoder;
 
 use Geocoder\Geocoder;
+use Geocoder\Provider\ChainProvider;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -52,9 +53,11 @@ public function register()
         });
 
         $this->app->singleton('geocoder.provider', function($app) {
-            $provider = $app['config']->get('geocoder-laravel::provider');
-
-            return new $provider($app['geocoder.adapter']);
+            $providers = $app['config']->get('geocoder-laravel::providers');
+            foreach($providers as &$provider) {
+                $provider = new $provider($app['geocoder.adapter']);
+            }
+            return new ChainProvider($providers);
         });
 
         $this->app['geocoder'] = $this->app->share(function($app) {

diff --git a/src/config/config.php b/src/config/config.php
@@ -10,6 +10,9 @@
  */
 
 return array(
-    'provider' => 'Geocoder\Provider\FreeGeoIpProvider',
+    /* Providers get called in the chain order given here. The first one to return a result will be used. */
+    'providers' => array(
+        'Geocoder\Provider\FreeGeoIpProvider'
+    ),
     'adapter'  => 'Geocoder\HttpAdapter\CurlHttpAdapter'
 );
diff --git a/tests/Geocoder/Tests/GeocoderFacadeTest.php b/tests/Geocoder/Tests/GeocoderFacadeTest.php
@@ -19,7 +19,7 @@ class GeocoderFacadeTest extends TestCase
     public function testGeocoderFacade()
     {
         $this->assertTrue(is_array($providers = \Geocoder::getProviders()));
-        $this->assertArrayHasKey('free_geo_ip', $providers);
-        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoipProvider', $providers['free_geo_ip']);
+        $this->assertArrayHasKey('chain', $providers);
+        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $providers['chain']);
     }
 }
diff --git a/tests/Geocoder/Tests/GeocoderServiceProviderTest.php b/tests/Geocoder/Tests/GeocoderServiceProviderTest.php
@@ -18,7 +18,7 @@ class GeocoderServiceProviderTest extends TestCase
 {
     public function testConfig()
     {
-        $this->assertSame('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::provider'));
+        $this->assertContains('Geocoder\Provider\FreeGeoIpProvider', $this->app['config']->get('geocoder-laravel::providers'));
         $this->assertSame('Geocoder\HttpAdapter\CurlHttpAdapter', $this->app['config']->get('geocoder-laravel::adapter'));
     }
 
@@ -35,13 +35,30 @@ public function testGeocoderDefaultAdapter()
         $this->assertInstanceOf('Geocoder\\HttpAdapter\\CurlHttpAdapter', $this->app['geocoder.adapter']);
     }
 
+    public function testGeocoderChainProvider()
+    {
+        $this->assertInstanceOf('Geocoder\\Provider\\ChainProvider', $this->app['geocoder.provider']);
+    }
+
     public function testGeocoderDefaultProvider()
     {
-        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $this->app['geocoder.provider']);
+        $providersArray = $this->getProtectedProperty($this->app['geocoder.provider'], 'providers');
+        $this->assertInstanceOf('Geocoder\\Provider\\FreeGeoIpProvider', $providersArray[0]);
+
     }
 
     public function testGeocoder()
     {
         $this->assertInstanceOf('Geocoder\\Geocoder', $this->app['geocoder']);
     }
+
+    protected function getProtectedProperty($testObj, $propertyName)
+    {
+        $reflection = new \ReflectionClass($testObj);
+        $property = $reflection->getProperty($propertyName);
+        $property->setAccessible(true);
+
+        return $property->getValue($testObj);
+    }
+
 }