Merge pull request #331 from oschwald/remove-geoip2-omni

Remove GeoIP2 Omni support

Author: willdurand

src/Geocoder/HttpAdapter/GeoIP2Adapter.php

@@ -24,7 +24,6 @@ class GeoIP2Adapter implements HttpAdapterInterface
      */
     const GEOIP2_MODEL_CITY    = 'city';
     const GEOIP2_MODEL_COUNTRY = 'country';
-    const GEOIP2_MODEL_OMNI    = 'omni';
 
     /**
      * @var ProviderInterface
@@ -129,7 +128,6 @@ protected function isSupportedGeoIP2Model($method)
         $availableMethods = array(
             self::GEOIP2_MODEL_CITY,
             self::GEOIP2_MODEL_COUNTRY,
-            self::GEOIP2_MODEL_OMNI
         );
 
         return in_array($method, $availableMethods);

tests/Geocoder/Tests/HttpAdapter/GeoIP2AdapterTest.php

@@ -72,7 +72,6 @@ public static function provideDataForSwitchingRequestMethods()
         return array(
             array(GeoIP2Adapter::GEOIP2_MODEL_CITY),
             array(GeoIP2Adapter::GEOIP2_MODEL_COUNTRY),
-            array(GeoIP2Adapter::GEOIP2_MODEL_OMNI),
         );
     }
 
@@ -81,8 +80,6 @@ public static function provideDataForSwitchingRequestMethods()
      */
     public function testIpAddressIsPassedCorrectToReader($geoIp2Model)
     {
-        $this->markTestSkipped('FIXME: issue with jsonSerialize() method...');
-
         $geoIp2Provider = $this->getGeoIP2ProviderMock();
         $geoIp2Provider
             ->expects($this->any())