Merge branch '2.x'

willdurand · willdurand · commit 51f4688e1a92 · 2015-01-07T14:29:33.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,10 @@ CHANGELOG
 
 ## 2.x
 
+### 2.8.2 (2015-01-07)
+
+* Fixed: encoding issue for `maxmind` provider
+
 ### 2.8.1 (2014-12-08)
 
 * Fixed: freegeoip `zip_code` property because of an API change
diff --git a/src/Geocoder/Provider/MaxMind.php b/src/Geocoder/Provider/MaxMind.php
@@ -147,7 +147,7 @@ private function executeQuery($query)
         }
 
         return $this->returnResults([
-            array_merge($this->getDefaults(), $data)
+            $this->fixEncoding(array_merge($this->getDefaults(), $data))
         ]);
     }
 
diff --git a/tests/.cached_responses/b0b4edb754ec522d7b4ba93b159fa9b68e628393 b/tests/.cached_responses/b0b4edb754ec522d7b4ba93b159fa9b68e628393
@@ -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,,";

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private function executeQuery($query)`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`return $this->returnResults([`
`150`		`- array_merge($this->getDefaults(), $data)`
	`150`	`+ $this->fixEncoding(array_merge($this->getDefaults(), $data))`
`151`	`151`	`]);`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`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,,";`