V1.6.1 (#26)

V1.6.1
nathan-fiscaletti · Jun 27, 2019 · 049e597 · 049e597
2 parents 2bd0915 + 4b20e3a
commit 049e597
Showing 1 changed file with 21 additions and 35 deletions.
diff --git a/src/IPStack/GeoLookup.php b/src/IPStack/GeoLookup.php
@@ -75,8 +75,6 @@ public function __construct(string $api_key)
      */
     public function getLocation(string $ip)
     {
-        $ret = null;
-
         try {
             $response = (new Client([
                 'base_uri' => (
@@ -93,19 +91,10 @@ public function getLocation(string $ip)
                 '&language='.$this->language
             );
 
-            if ($response->getStatusCode() == 200) {
-                $compiled = json_decode($response->getBody()->getContents(), true);
-                if (array_key_exists('error', $compiled)) {
-                    throw new \Exception('Error: '.$compiled['error']['info']);
-                }
-
-                $ret = $compiled;
-            }
+            return $this->processResponse($response);
         } catch (\Exception $e) {
             throw $e;
         }
-
-        return $ret;
     }
 
     /**
@@ -122,8 +111,6 @@ public function getLocations(string ...$ips)
             throw new \Exception('Error: Bulk lookup limitted to 50 IP addresses at a time.');
         }
 
-        $ret = null;
-
         try {
             $response = (new Client([
                 'base_uri' => (
@@ -140,19 +127,10 @@ public function getLocations(string ...$ips)
                 '&language='.$this->language
             );
 
-            if ($response->getStatusCode() == 200) {
-                $compiled = json_decode($response->getBody()->getContents(), true);
-                if (array_key_exists('error', $compiled)) {
-                    throw new \Exception('Error: '.$compiled['error']['info']);
-                }
-
-                $ret = $compiled;
-            }
+            return $this->processResponse($response);
         } catch (\Exception $e) {
             throw $e;
         }
-
-        return $ret;
     }
 
     /**
@@ -163,8 +141,6 @@ public function getLocations(string ...$ips)
      */
     public function getOwnLocation()
     {
-        $ret = null;
-
         try {
             $response = (new Client([
                 'base_uri' => (
@@ -181,19 +157,29 @@ public function getOwnLocation()
                 '&language='.$this->language
             );
 
-            if ($response->getStatusCode() == 200) {
-                $compiled = json_decode($response->getBody()->getContents(), true);
-                if (array_key_exists('error', $compiled)) {
-                    throw new \Exception('Error: '.$compiled['error']['info']);
-                }
-
-                $ret = $compiled;
-            }
+            return $this->processResponse($response);
         } catch (\Exception $e) {
             throw $e;
         }
+    }
+
+    /**
+     * Processes a response to be sent back to the user.
+     *
+     * @param object $response
+     *
+     * @return array|null
+     */
+    private function processResponse($response)
+    {
+        if ($response->getStatusCode() == 200) {
+            $compiled = json_decode($response->getBody()->getContents(), true);
+            if (array_key_exists('error', $compiled)) {
+                throw new \Exception('Error: '.$compiled['error']['info']);
+            }
 
-        return $ret;
+            return $compiled;
+        }
     }
 
     /**