Updated code to follow the PSR-2 style guidelines.

2013-05-09 07:29:29 -07:00
parent 95813b00a9
commit ed6166f934
22 changed files with 807 additions and 636 deletions
@@ -4,28 +4,49 @@ namespace GeoIP2\Model;

 class City extends Country
 {
-  protected $city;
-  protected $location;
-  protected $postal;
-  protected $subdivisions = Array();
+    protected $city;
+    protected $location;
+    protected $postal;
+    protected $subdivisions = array();

-  public function __construct($raw, $languages)
-  {
-    parent::__construct($raw, $languages);
+    public function __construct($raw, $languages)
+    {
+        parent::__construct($raw, $languages);

-    $this->city = new \GeoIP2\Record\City($this->get('city'), $languages);
-    $this->location = new \GeoIP2\Record\Location($this->get('location'));
-    $this->postal = new \GeoIP2\Record\Postal($this->get('postal'));
+        $this->city = new \GeoIP2\Record\City($this->get('city'), $languages);
+        $this->location = new \GeoIP2\Record\Location($this->get('location'));
+        $this->postal = new \GeoIP2\Record\Postal($this->get('postal'));

-    $this->createSubdivisions($raw, $languages);
-  }
-
-  private function createSubdivisions($raw, $languages) {
-    if(!isset($raw['subdivisions'])) return;
-
-    foreach ($raw['subdivisions'] as $sub) {
-      array_push($this->subdivisions,
-                 new \GeoIP2\Record\Subdivision($sub, $languages));
+        $this->createSubdivisions($raw, $languages);
    }
-  }
-}
+
+    private function createSubdivisions($raw, $languages)
+    {
+        if (!isset($raw['subdivisions'])) {
+            return;
+        }
+
+        foreach ($raw['subdivisions'] as $sub) {
+            array_push(
+                $this->subdivisions,
+                new \GeoIP2\Record\Subdivision($sub, $languages)
+            );
+        }
+    }
+
+    public function __get($attr)
+    {
+        if ($attr == 'mostSpecificSubdivision') {
+            return $this->$attr();
+        } else {
+            return parent::__get($attr);
+        }
+    }
+
+    private function mostSpecificSubdivision()
+    {
+        return empty($this->subdivisions)?
+            new \GeoIP2\Record\Subdivision(array(), $this->languages):
+            end($this->subdivisions);
+    }
+}