Check attribute validity and return null on empty but valid attributes

2013-05-08 07:18:50 -07:00
parent 45228dfad4
commit 275bda0fc4
10 changed files with 53 additions and 22 deletions
@@ -5,17 +5,8 @@ namespace GeoIP2\Record;
 class Country extends AbstractPlaceRecord
 {

-  private $languages;
-
-  public function __construct($record, $languages){
-    $this->languages = $languages;
-    parent::__construct($record);
-  }
-
-  public function name() {
-    foreach($this->languages as $language) {
-      if (isset($this->names[$language])) return $this->names[$language];
-    }
-  }
-
+  protected $validAttributes = Array('confidence',
+                                   'geoname_id',
+                                   'iso_code',
+                                   'names');
 }