Cleanup

Author: Torann

src/GeoIP.php

@@ -202,7 +202,7 @@ public function getService()
 
             // Sanity check
             if ($class === null) {
-                throw new Exception('The GeoIP service is not valid.');
+                throw new Exception('No GeoIP service is configured.');
             }
 
             // Create service instance
@@ -237,6 +237,7 @@ public function getClientIP()
             'HTTP_FORWARDED_FOR',
             'HTTP_FORWARDED',
             'REMOTE_ADDR',
+            'HTTP_X_FORWARDED_IP',
             'HTTP_X_CLUSTER_CLIENT_IP',
         ];
 

src/Location.php

@@ -16,13 +16,13 @@
  * @property string|null $state
  * @property string|null $state_name
  * @property string|null $postal_code
- * @property float|null $lat
- * @property float|null $lon
+ * @property float|null  $lat
+ * @property float|null  $lon
  * @property string|null $timezone
  * @property string|null $continent
  * @property string|null $currency
- * @property bool $default
- * @property bool $cached
+ * @property bool        $default
+ * @property bool        $cached
  *
  * @package Torann\GeoIP
  */
@@ -48,7 +48,7 @@ public function __construct(array $attributes = [])
     /**
      * Determine if the location is for the same IP address.
      *
-     * @param  string $ip
+     * @param string $ip
      *
      * @return bool
      */
@@ -60,8 +60,8 @@ public function same($ip)
     /**
      * Set a given attribute on the location.
      *
-     * @param  string $key
-     * @param  mixed  $value
+     * @param string $key
+     * @param mixed  $value
      *
      * @return $this
      */
@@ -75,19 +75,19 @@ public function setAttribute($key, $value)
     /**
      * Get an attribute from the $attributes array.
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return mixed
      */
     public function getAttribute($key)
     {
         $value = Arr::get($this->attributes, $key);
 
+        $method = 'get' . Str::studly($key) . 'Attribute';
+
         // First we will check for the presence of a mutator for the set operation
         // which simply lets the developers tweak the attribute as it is set.
-        if (method_exists($this, 'get' . Str::studly($key) . 'Attribute')) {
-            $method = 'get' . Str::studly($key) . 'Attribute';
-
+        if (method_exists($this, $method)) {
             return $this->{$method}($value);
         }
 
@@ -127,7 +127,7 @@ public function toArray()
     /**
      * Get the location's attribute
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return mixed
      */
@@ -139,8 +139,8 @@ public function __get($key)
     /**
      * Set the location's attribute
      *
-     * @param  string $key
-     * @param  mixed  $value
+     * @param string $key
+     * @param mixed  $value
      */
     public function __set($key, $value)
     {
@@ -150,7 +150,7 @@ public function __set($key, $value)
     /**
      * Determine if the given attribute exists.
      *
-     * @param  mixed $offset
+     * @param mixed $offset
      *
      * @return bool
      */
@@ -162,7 +162,7 @@ public function offsetExists(mixed $offset): bool
     /**
      * Get the value for a given offset.
      *
-     * @param  mixed $offset
+     * @param mixed $offset
      *
      * @return mixed
      */
@@ -174,8 +174,8 @@ public function offsetGet(mixed $offset): mixed
     /**
      * Set the value for a given offset.
      *
-     * @param  mixed $offset
-     * @param  mixed $value
+     * @param mixed $offset
+     * @param mixed $value
      *
      * @return void
      */
@@ -187,7 +187,7 @@ public function offsetSet(mixed $offset, mixed $value): void
     /**
      * Unset the value for a given offset.
      *
-     * @param  mixed $offset
+     * @param mixed $offset
      *
      * @return void
      */
@@ -211,7 +211,7 @@ public function __isset($key)
     /**
      * Unset an attribute on the location.
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return void
      */