Use camel case for all trait attribute names

src/GeoIP2/Model/Country.php

@@ -34,6 +34,6 @@ class Country
   {
 	if ($var != "instance" && isset($this->$var)) return $this->$var;
 
-    throw new RuntimeException("Unknown attribute: $attr");
+    throw new \RuntimeException("Unknown attribute: $attr");
   }
 }

src/GeoIP2/Model/Omni.php

@@ -5,7 +5,4 @@ namespace GeoIP2\Model;
 class Omni extends CityISPOrg
 {
 
-  public function __construct($raw, $language) {
-
-  }
 }

src/GeoIP2/Record/AbstractRecord.php

@@ -12,8 +12,11 @@ abstract class AbstractRecord
 
   public function __get($attr) {
     $valid = in_array($attr, $this->validAttributes);
-    if ($valid && isset($this->record[$attr])){
+    // XXX - kind of ugly but greatly reduces boilerplate code
-      return $this->record[$attr];
+    $key = strtolower(preg_replace('/([A-Z])/', '_\1', $attr));
+
+    if ($valid && isset($this->record[$key])){
+      return $this->record[$key];
     } elseif ($valid) {
       return null;
     } else {

src/GeoIP2/Record/City.php

@@ -4,5 +4,5 @@ namespace GeoIP2\Record;
 
 class City extends AbstractPlaceRecord
 {
-  protected $validAttribute = Array('confidence', 'geoname_id', 'names');
+  protected $validAttribute = Array('confidence', 'geonameId', 'names');
 }

src/GeoIP2/Record/Continent.php

@@ -4,7 +4,7 @@ namespace GeoIP2\Record;
 
 class Continent extends AbstractPlaceRecord
 {
-  protected $validAttributes = Array('continent_code',
+  protected $validAttributes = Array('continentCode',
-                                     'geoname_id',
+                                     'geonameId',
                                      'names');
 }

src/GeoIP2/Record/Country.php

@@ -6,7 +6,7 @@ class Country extends AbstractPlaceRecord
 {
 
   protected $validAttributes = Array('confidence',
-                                   'geoname_id',
+                                     'geonameId',
-                                   'iso_code',
+                                     'isoCode',
-                                   'names');
+                                     'names');
 }

src/GeoIP2/Record/Location.php

@@ -4,11 +4,11 @@ namespace GeoIP2\Record;
 
 class Location extends AbstractRecord
 {
-  protected $validAttributes = Array('accuracy_radius',
+  protected $validAttributes = Array('accuracyRadius',
                                      'latitude',
                                      'longitude',
-                                     'metro_code',
+                                     'metroCode',
-                                     'postal_code',
+                                     'postalCode',
-                                     'postal_confidence',
+                                     'postalConfidence',
-                                     'time_zone');
+                                     'timeZone');
 }

src/GeoIP2/Record/RepresentedCountry.php

@@ -5,8 +5,8 @@ namespace GeoIP2\Record;
 class RepresentedCountry extends Country
 {
   protected $validAttributes = Array('confidence',
-                                   'geoname_id',
+                                   'geonameId',
-                                   'iso_code',
+                                   'isoCode',
                                    'names',
                                    'type');
 }

src/GeoIP2/Record/Subdivision.php

@@ -5,7 +5,7 @@ namespace GeoIP2\Record;
 class Subdivision extends AbstractPlaceRecord
 {
   protected $validAttributes = Array('confidence',
-                                     'geoname_id',
+                                     'geonameId',
-                                     'iso_code',
+                                     'isoCode',
                                      'names');
 }

src/GeoIP2/Record/Traits.php

@@ -4,14 +4,14 @@ namespace GeoIP2\Record;
 
 class Traits extends AbstractRecord
 {
-  protected $validAttributes = Array('autonomous_system_number',
+  protected $validAttributes = Array('autonomousSystemNumber',
-                                     'autonomous_system_organization',
+                                     'autonomousSystemOrganization',
                                      'domain',
-                                     'is_anonymous_proxy',
+                                     'isAnonymousProxy',
-                                     'is_satellite_provider',
+                                     'isSatelliteProvider',
                                      'isp',
-                                     'ip_address',
+                                     'ipAddress',
                                      'organization',
-                                     'user_type');
+                                     'userType');
 
 }