GeoIP2 results use underscore case

giosh94mhz · giosh94mhz · commit c888d7cbfd3a · 2015-02-11T09:44:54.000+01:00
diff --git a/src/Geocoder/Provider/GeoIP2.php b/src/Geocoder/Provider/GeoIP2.php
@@ -67,8 +67,8 @@ public function geocode($address)
                 'locality'    => (isset($result->city->names->{$this->locale}) ? $result->city->names->{$this->locale} : null),
                 'latitude'    => (isset($result->location->latitude) ? $result->location->latitude : null),
                 'longitude'   => (isset($result->location->longitude) ? $result->location->longitude : null),
-                'timezone'    => (isset($result->location->timezone) ? $result->location->timezone : null),
-                'postalCode'  => (isset($result->location->postalcode) ? $result->location->postalcode : null),
+                'timezone'    => (isset($result->location->time_zone) ? $result->location->time_zone : null),
+                'postalCode'  => (isset($result->location->postal_code) ? $result->location->postal_code : null),
                 'region'      => $region,
                 'regionCode'  => $regionCode
             )))
diff --git a/tests/Geocoder/Tests/Provider/GeoIP2Test.php b/tests/Geocoder/Tests/Provider/GeoIP2Test.php
@@ -94,7 +94,7 @@ public static function provideDataForRetrievingGeodata()
                     'regionCode' => 'HH',
                     'country' => 'Germany',
                     'countryCode' => 'DE',
-                    'timezone' => null,
+                    'timezone' => 'Europe/Berlin',
                 )
             ),
             'Response with all data null' => array(

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public static function provideDataForRetrievingGeodata()`
`94`	`94`	`'regionCode' => 'HH',`
`95`	`95`	`'country' => 'Germany',`
`96`	`96`	`'countryCode' => 'DE',`
`97`		`- 'timezone' => null,`
	`97`	`+ 'timezone' => 'Europe/Berlin',`
`98`	`98`	`)`
`99`	`99`	`),`
`100`	`100`	`'Response with all data null' => array(`