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

Updated code to follow the PSR-2 style guidelines.

Browse Source
This commit is contained in:
Gregory Oschwald
2013-05-09 07:29:29 -07:00
parent 95813b00a9
commit ed6166f934
22 changed files with 807 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GeoIP2/Record/AbstractPlaceRecord.php
+22 -18
View File
@@ -4,25 +4,29 @@ namespace GeoIP2\Record;
abstract class AbstractPlaceRecord extends AbstractRecord
{
private $languages;
private $languages;
public function __construct($record, $languages){
$this->languages = $languages;
parent::__construct($record);
}
public function __get($attr) {
if ($attr == 'name') {
return $this->name();
} else {
return parent::__get($attr);
public function __construct($record, $languages)
{
$this->languages = $languages;
parent::__construct($record);
}
}
private function name() {
foreach($this->languages as $language) {
if (isset($this->names[$language])) return $this->names[$language];
public function __get($attr)
{
if ($attr == 'name') {
return $this->name();
} else {
return parent::__get($attr);
}
}
}
}
private function name()
{
foreach ($this->languages as $language) {
if (isset($this->names[$language])) {
return $this->names[$language];
}
}
}
}
src/GeoIP2/Record/AbstractRecord.php
+20 -18
View File
@@ -4,23 +4,25 @@ namespace GeoIP2\Record;
abstract class AbstractRecord
{
private $record;
private $record;
public function __construct($record) {
$this->record = $record;
}
public function __get($attr) {
$valid = in_array($attr, $this->validAttributes);
// XXX - kind of ugly but greatly reduces boilerplate code
$key = strtolower(preg_replace('/([A-Z])/', '_\1', $attr));
if ($valid && isset($this->record[$key])){
return $this->record[$key];
} elseif ($valid) {
return null;
} else {
throw new \RuntimeException("Unknown attribute: $attr");
public function __construct($record)
{
$this->record = $record;
}
}
}
public function __get($attr)
{
$valid = in_array($attr, $this->validAttributes);
// XXX - kind of ugly but greatly reduces boilerplate code
$key = strtolower(preg_replace('/([A-Z])/', '_\1', $attr));
if ($valid && isset($this->record[$key])) {
return $this->record[$key];
} elseif ($valid) {
return null;
} else {
throw new \RuntimeException("Unknown attribute: $attr");
}
}
}
src/GeoIP2/Record/City.php
+2 -2
View File
@@ -4,5 +4,5 @@ namespace GeoIP2\Record;
class City extends AbstractPlaceRecord
{
protected $validAttributes = Array('confidence', 'geonameId', 'names');
}
protected $validAttributes = array('confidence', 'geonameId', 'names');
}
src/GeoIP2/Record/Continent.php
+6 -4
View File
@@ -4,7 +4,9 @@ namespace GeoIP2\Record;
class Continent extends AbstractPlaceRecord
{
protected $validAttributes = Array('continentCode',
'geonameId',
'names');
}
protected $validAttributes = array(
'continentCode',
'geonameId',
'names'
);
}
src/GeoIP2/Record/Country.php
+7 -6
View File
@@ -4,9 +4,10 @@ namespace GeoIP2\Record;
class Country extends AbstractPlaceRecord
{
protected $validAttributes = Array('confidence',
'geonameId',
'isoCode',
'names');
}
protected $validAttributes = array(
'confidence',
'geonameId',
'isoCode',
'names'
);
}
src/GeoIP2/Record/Location.php
+10 -8
View File
@@ -4,11 +4,13 @@ namespace GeoIP2\Record;
class Location extends AbstractRecord
{
protected $validAttributes = Array('accuracyRadius',
'latitude',
'longitude',
'metroCode',
'postalCode',
'postalConfidence',
'timeZone');
}
protected $validAttributes = array(
'accuracyRadius',
'latitude',
'longitude',
'metroCode',
'postalCode',
'postalConfidence',
'timeZone'
);
}
src/GeoIP2/Record/Postal.php
+1 -1
View File
@@ -4,5 +4,5 @@ namespace GeoIP2\Record;
class Postal extends AbstractRecord
{
protected $validAttributes = Array('code', 'confidence');
protected $validAttributes = array('code', 'confidence');
}
src/GeoIP2/Record/RepresentedCountry.php
+8 -6
View File
@@ -4,9 +4,11 @@ namespace GeoIP2\Record;
class RepresentedCountry extends Country
{
protected $validAttributes = Array('confidence',
'geonameId',
'isoCode',
'names',
'type');
}
protected $validAttributes = array(
'confidence',
'geonameId',
'isoCode',
'namespace',
'type'
);
}
src/GeoIP2/Record/Subdivision.php
+7 -5
View File
@@ -4,8 +4,10 @@ namespace GeoIP2\Record;
class Subdivision extends AbstractPlaceRecord
{
protected $validAttributes = Array('confidence',
'geonameId',
'isoCode',
'names');
}
protected $validAttributes = array(
'confidence',
'geonameId',
'isoCode',
'names'
);
}
src/GeoIP2/Record/Traits.php
+12 -11
View File
@@ -4,14 +4,15 @@ namespace GeoIP2\Record;
class Traits extends AbstractRecord
{
protected $validAttributes = Array('autonomousSystemNumber',
'autonomousSystemOrganization',
'domain',
'isAnonymousProxy',
'isSatelliteProvider',
'isp',
'ipAddress',
'organization',
'userType');
}
protected $validAttributes = array(
'autonomousSystemNumber',
'autonomousSystemOrganization',
'domain',
'isAnonymousProxy',
'isSatelliteProvider',
'isp',
'ipAddress',
'organization',
'userType'
);
}