Skip to content

Fix encoding issue for maxmind provider #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
toin0u wants to merge 1 commit into from
Closed

Fix encoding issue for maxmind provider #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Geocoder/Provider/MaxMind.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private function executeQuery($query)
}

return $this->returnResults([
array_merge($this->getDefaults(), $data)
$this->fixEncoding(array_merge($this->getDefaults(), $data))
]);
}

Expand Down
1 change: 1 addition & 0 deletions tests/.cached_responses/2f533a08ae0b6ca65e06bd8dd13f1ef50e94bba0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
s:187:"US,"United States",UT,Utah,Provo,40.2181,-111.6133,770,801,America/Denver,NA,84606,"Unified Layer","Unified Layer",bluehost.com,"AS46606 Unified Layer",Corporate,residential,999,83,5,5,5,";
1 change: 1 addition & 0 deletions tests/.cached_responses/4f5cc7e59037868ffefe62f12e367592fdd3eafe
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
s:79:"US,UT,Provo,84606,40.218102,-111.613297,770,801,"Unified Layer","Unified Layer"";
1 change: 1 addition & 0 deletions tests/.cached_responses/b0b4edb754ec522d7b4ba93b159fa9b68e628393
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
s:215:"BR,Brazil,26,"Santa Catarina",Florian�polis,-27.5833,-48.5667,,,America/Sao_Paulo,SA,,"Global Village Telecom","Global Village Telecom",gvt.net.br,"AS18881 Global Village Telecom",Cable/DSL,residential,18,99,52,92,,";
1 change: 1 addition & 0 deletions tests/.cached_responses/c3487c0fe92a00d80eab35b6b3c5bfe916dd11c0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
s:96:"BR,26,Florian�polis,,-27.583300,-48.566700,0,0,"Global Village Telecom","Global Village Telecom"";
33 changes: 33 additions & 0 deletions tests/Geocoder/Tests/Provider/MaxMindTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,39 @@ public function testGeocodeOmniServiceWithRealIPv4()
$this->assertEquals('America/Chicago', $result->getTimezone());
}

public function testGeocodeOmniServiceWithRealIPv4WithSslAndEncoding()
{
if (!isset($_SERVER['MAXMIND_API_KEY'])) {
$this->markTestSkipped('You need to configure the MAXMIND_API_KEY value in phpunit.xml');
}

$provider = new MaxMind($this->getAdapter(), $_SERVER['MAXMIND_API_KEY'],
MaxMind::OMNI_SERVICE, true);
$results = $provider->geocode('189.26.128.80');

$this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
$this->assertCount(1, $results);

/** @var \Geocoder\Model\Address $result */
$result = $results->first();
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
$this->assertEquals(-27.5833, $result->getLatitude(), '', 0.1);
$this->assertEquals(-48.5666, $result->getLongitude(), '', 0.1);
$this->assertFalse($result->getBounds()->isDefined());
$this->assertNull($result->getStreetNumber());
$this->assertNull($result->getStreetName());
$this->assertNull($result->getPostalCode());
$this->assertEquals('Florianópolis', $result->getLocality());
$this->assertNull($result->getSubLocality());
$this->assertNull($result->getCounty()->getName());
$this->assertNull($result->getCounty()->getCode());
$this->assertEquals('Santa Catarina', $result->getRegion()->getName());
$this->assertEquals('26', $result->getRegion()->getCode());
$this->assertEquals('Brazil', $result->getCountry()->getName());
$this->assertEquals('BR', $result->getCountry()->getCode());
$this->assertEquals('America/Sao_Paulo', $result->getTimezone());
}

public function testGeocodeWithRealIPv6()
{
if (!isset($_SERVER['MAXMIND_API_KEY'])) {
Expand Down