Merge branch '1.7' into master

Author: willdurand

CHANGELOG.md

@@ -5,6 +5,11 @@ CHANGELOG
 
 n/a
 
+### 1.7.0 (2013-05-28) ###
+
+* Updated: Geocoder now uses the official geoip library
+* Added: LocaleAwareProviderInterface
+
 ### 1.6.0 (2013-05-22) ###
 
 * Added: API key to MapQuestProvider

composer.json

@@ -18,14 +18,15 @@
         "kriswallsmith/buzz": "@stable",
         "guzzle/guzzle": "@stable",
         "zendframework/zendframework": "~2.1",
-        "maxromanovsky/php-maxmind-geoip": "~1.12"
+        "geoip/geoip": "~1.13"
     },
     "suggest": {
         "kriswallsmith/buzz": "Enabling Buzz allows you to use the BuzzHttpAdapter.",
-        "ext-curl": "Enabling the curl extension allows you to use CurlHttpAdapter.",
+        "ext-curl": "Enabling the curl extension allows you to use the CurlHttpAdapter.",
+        "ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",
         "guzzle/guzzle": "Enabling Guzzle allows you to use the GuzzleHttpAdapter.",
         "zendframework/zend-http": "Enabling Zend Http allows you to use the ZendHttpAdapter.",
-        "maxromanovsky/php-maxmind-geoip": "If you are going to use MaxMindBinaryProvider."
+        "geoip/geoip": "If you are going to use the MaxMindBinaryProvider (conflict with geoip extension)."
     },
     "autoload": {
         "psr-0": { "Geocoder": "src/" }

src/Geocoder/Provider/BingMapsProvider.php

@@ -18,7 +18,7 @@
 /**
  * @author David Guyon <[email protected]>
  */
-class BingMapsProvider extends AbstractProvider implements ProviderInterface
+class BingMapsProvider extends AbstractProvider implements LocaleAwareProviderInterface
 {
     /**
      * @var string

src/Geocoder/Provider/GeonamesProvider.php

@@ -18,7 +18,7 @@
 /**
  * @author Giovanni Pirrotta <[email protected]>
  */
-class GeonamesProvider extends AbstractProvider implements ProviderInterface
+class GeonamesProvider extends AbstractProvider implements LocaleAwareProviderInterface
 {
     /**
      * @var string

src/Geocoder/Provider/GoogleMapsProvider.php

@@ -18,7 +18,7 @@
 /**
  * @author William Durand <[email protected]>
  */
-class GoogleMapsProvider extends AbstractProvider implements ProviderInterface
+class GoogleMapsProvider extends AbstractProvider implements LocaleAwareProviderInterface
 {
     /**
      * @var string

src/Geocoder/Provider/LocaleAwareProviderInterface.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the Geocoder package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+namespace Geocoder\Provider;
+
+interface LocaleAwareProviderInterface extends ProviderInterface
+{
+    /**
+     * Return the locale to be used in locale aware requests.
+     *
+     * In case there is no locale in use, null is returned.
+     *
+     * @return string|null
+     */
+    public function getLocale();
+}

src/Geocoder/Provider/OpenStreetMapsProvider.php

@@ -16,7 +16,7 @@
 /**
  * @author Niklas Närhinen <[email protected]>
  */
-class OpenStreetMapsProvider extends AbstractProvider implements ProviderInterface
+class OpenStreetMapsProvider extends AbstractProvider implements LocaleAwareProviderInterface
 {
     /**
      * @var string

src/Geocoder/Provider/TomTomProvider.php

@@ -18,7 +18,7 @@
 /**
  * @author Antoine Corcy <[email protected]>
  */
-class TomTomProvider extends AbstractProvider implements ProviderInterface
+class TomTomProvider extends AbstractProvider implements LocaleAwareProviderInterface
 {
     /**
      * @var string

src/Geocoder/Provider/YandexProvider.php

@@ -17,7 +17,7 @@
 /**
  * @author Antoine Corcy <[email protected]>
  */
-class YandexProvider extends AbstractProvider implements ProviderInterface
+class YandexProvider extends AbstractProvider implements LocaleAwareProviderInterface
 {
     /**
      * @var string