will/GeoIP2-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Gregory Oschwald 2013-05-08 09:14:19 -07:00
parent 473435e221
commit 00f274c617
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/GeoIP2/Model/City.php
View File

@ -4,21 +4,20 @@ namespace GeoIP2\Model;
class City extends Country class City extends Country
{ {
//XXX use properties protected $city;
private $city; protected $location;
private $location; protected $postal;
private $postal; protected $subdivisions = Array();
private $subdivisions = Array();
public function __construct($raw, $languages) public function __construct($raw, $languages)
{ {
parent::__construct($raw, $languages);
$this->city = new \GeoIP2\Record\City($this->get('city'), $languages); $this->city = new \GeoIP2\Record\City($this->get('city'), $languages);
$this->location = new \GeoIP2\Record\Location($this->get('location')); $this->location = new \GeoIP2\Record\Location($this->get('location'));
$this->postal = new \GeoIP2\Record\Postal($this->get('postal')); $this->postal = new \GeoIP2\Record\Postal($this->get('postal'));
$this->createSubdivisions($raw, $languages); $this->createSubdivisions($raw, $languages);
parent::__construct($raw, $languages);
} }
private function createSubdivisions($raw, $languages) { private function createSubdivisions($raw, $languages) {

2
src/GeoIP2/Record/City.php
View File

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