Merge pull request #90 from K-Phoen/remove-cloudmade

Removed all references to the CloudMade provider as it does not exist in Geocoder anymore

Author: willdurand

DependencyInjection/BazingaGeocoderExtension.php

@@ -81,14 +81,6 @@ public function load(array $configs, ContainerBuilder $container)
             ));
         }
 
-        if (isset($config['providers']['cloudmade'])) {
-            $cloudMadeParams = $config['providers']['cloudmade'];
-
-            $this->addProvider('cloudmade', array(
-                $cloudMadeParams['api_key']
-            ));
-        }
-
         if (isset($config['providers']['google_maps'])) {
             $googleMapsParams = $config['providers']['google_maps'];
 

DependencyInjection/Configuration.php

@@ -91,13 +91,6 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
-                ->arrayNode('cloudmade')
-                    ->children()
-                        ->scalarNode('api_key')
-                            ->isRequired()->cannotBeEmpty()
-                        ->end()
-                    ->end()
-                ->end()
                 ->arrayNode('google_maps')
                     ->children()
                         ->scalarNode('locale')->defaultNull()->end()

Resources/config/services.xml

@@ -14,7 +14,6 @@
         <parameter key="bazinga_geocoder.geocoder.provider.host_ip.class">Geocoder\Provider\HostIpProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.ip_info_db.class">Geocoder\Provider\IpInfoDbProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.yahoo.class">Geocoder\Provider\YahooProvider</parameter>
-        <parameter key="bazinga_geocoder.geocoder.provider.cloudmade.class">Geocoder\Provider\CloudMadeProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.openstreetmap.class">Geocoder\Provider\OpenStreetMapProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.geoip.class">Geocoder\Provider\GeoipProvider</parameter>
         <parameter key="bazinga_geocoder.geocoder.provider.mapquest.class">Geocoder\Provider\MapQuestProvider</parameter>

Resources/doc/index.md

@@ -257,8 +257,6 @@ bazinga_geocoder:
             lifetime:             86400
         ip_info_db:
             api_key:              ~ # Required
-        cloudmade:
-            api_key:              ~ # Required
         google_maps:
             locale:               null
             region:               null

Tests/DependencyInjection/BazingaGeocoderExtensionTest.php

@@ -56,7 +56,6 @@ public function testLoad()
             'bing_maps'            => 'Geocoder\\Provider\\BingMapsProvider',
             'cache'                => 'Bazinga\\Bundle\\GeocoderBundle\\Provider\\CacheProvider',
             'ip_info_db'           => 'Geocoder\\Provider\\IpInfoDbProvider',
-            'cloudmade'            => 'Geocoder\\Provider\\CloudMadeProvider',
             'google_maps'          => 'Geocoder\\Provider\\GoogleMapsProvider',
             'google_maps_business' => 'Geocoder\\Provider\\GoogleMapsBusinessProvider',
             'openstreetmap'        => 'Geocoder\\Provider\\OpenStreetMapProvider',

Tests/DependencyInjection/Fixtures/config.yml

@@ -16,8 +16,6 @@ bazinga_geocoder:
             lifetime: 86400
         ip_info_db:
             api_key: 123
-        cloudmade:
-            api_key: 123
         google_maps:
             locale: en_US
             region: en_US