added test and fixed

Author: pulkit

src/GeoIP.php

@@ -70,15 +70,15 @@ public function getIp()
             if ($this->random) {
                 $this->ip = long2ip(rand(0, '4294967295'));
             } else {
-                $ip = array_get($_SERVER, 'HTTP_CLIENT_IP', array_get($_SERVER, 'HTTP_X_FORWARDED_FOR', array_get($_SERVER, 'HTTP_X_FORWARDED', array_get($_SERVER, 'HTTP_FORWARDED_FOR', array_get($_SERVER, 'HTTP_FORWARDED', array_get($_SERVER, 'REMOTE_ADDR', '127.0.0.1'))))));
-
-                // sometimes we can get multiple ipaddresses
-                // seperated with a ',', eg: proxy/vpn
-                $ip = explode(',', $ip);
-                $this->ip = trim(head($ip));
+                $this->ip = array_get($_SERVER, 'HTTP_CLIENT_IP', array_get($_SERVER, 'HTTP_X_FORWARDED_FOR', array_get($_SERVER, 'HTTP_X_FORWARDED', array_get($_SERVER, 'HTTP_FORWARDED_FOR', array_get($_SERVER, 'HTTP_FORWARDED', array_get($_SERVER, 'REMOTE_ADDR', '127.0.0.1'))))));
             }
         }
 
+        // sometimes we can get multiple ipaddresses
+        // seperated with a ',', eg: proxy/vpn
+        $this->ip = explode(',', $this->ip);
+        $this->ip = trim(head($this->ip));
+
         return $this->ip;
     }
 
@@ -110,8 +110,8 @@ public function get($property = '')
      */
     protected function getData()
     {
-        $ips = $this->getIp();
-        $this->setIp($ips);
+        $ip = $this->getIp();
+        $this->setIp($ip);
 
         // check ip in memory
         $data = array_get($this->store, $ip);

tests/GeoIPTest.php

@@ -7,6 +7,7 @@
 
 class GeoIPTest extends PHPUnit_Framework_TestCase
 {
+    protected $multipleIps = '81.2.69.160,127.0.0.1';
     protected $validIp = '81.2.69.160';
     protected $invalidIp = '127.0.0.1';
 
@@ -126,6 +127,20 @@ public function test_get_non_random_ipaddress()
         $this->assertTrue(!(filter_var($ip, FILTER_VALIDATE_IP)) === False);
     }
 
+    public function test_get_multiple_ipaddress()
+    {
+        $config = [
+            'driver' => 'ip-api',
+        ];
+
+        $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
+        $geoip->setIp($this->multipleIps);
+        $ip = $geoip->getIp();
+
+        $this->assertEquals($ip, $this->validIp);
+        $this->assertTrue(!(filter_var($ip, FILTER_VALIDATE_IP)) === False);
+    }
+
     public function test_maxmind_database()
     {
         $config = [