Skip to content

Commit 084b4bc

Browse files
committed
Remove GeoIP2 Omni support
1 parent 905c32c commit 084b4bc

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

src/Geocoder/HttpAdapter/GeoIP2Adapter.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class GeoIP2Adapter implements HttpAdapterInterface
2424
*/
2525
const GEOIP2_MODEL_CITY = 'city';
2626
const GEOIP2_MODEL_COUNTRY = 'country';
27-
const GEOIP2_MODEL_OMNI = 'omni';
2827

2928
/**
3029
* @var ProviderInterface
@@ -129,7 +128,6 @@ protected function isSupportedGeoIP2Model($method)
129128
$availableMethods = array(
130129
self::GEOIP2_MODEL_CITY,
131130
self::GEOIP2_MODEL_COUNTRY,
132-
self::GEOIP2_MODEL_OMNI
133131
);
134132

135133
return in_array($method, $availableMethods);

tests/Geocoder/Tests/HttpAdapter/GeoIP2AdapterTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public static function provideDataForSwitchingRequestMethods()
7272
return array(
7373
array(GeoIP2Adapter::GEOIP2_MODEL_CITY),
7474
array(GeoIP2Adapter::GEOIP2_MODEL_COUNTRY),
75-
array(GeoIP2Adapter::GEOIP2_MODEL_OMNI),
7675
);
7776
}
7877

@@ -81,8 +80,6 @@ public static function provideDataForSwitchingRequestMethods()
8180
*/
8281
public function testIpAddressIsPassedCorrectToReader($geoIp2Model)
8382
{
84-
$this->markTestSkipped('FIXME: issue with jsonSerialize() method...');
85-
8683
$geoIp2Provider = $this->getGeoIP2ProviderMock();
8784
$geoIp2Provider
8885
->expects($this->any())

0 commit comments

Comments
 (0)