merged in 1

Author: pulkit

src/GeoIP.php

@@ -66,15 +66,15 @@ public function setIp($ip)
      */
     public function getIp()
     {
-        if ($this->ip) {
-            return $this->ip;
-        }
-
-        if ($this->random) {
-            return long2ip(rand(0, '4294967295'));
+        if (!$this->ip) {
+            if ($this->random) {
+                $this->ip = long2ip(rand(0, '4294967295'));
+            } else {
+                $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'))))));
+            }
         }
 
-        return 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'))))));
+        return $this->ip;
     }
 
     /**
@@ -106,6 +106,7 @@ public function get($property = '')
     protected function getData()
     {
         $ip = $this->getIp();
+        $this->setIp($ip);
 
         // check ip in memory
         $data = array_get($this->store, $ip);

tests/GeoIPTest.php

@@ -7,8 +7,8 @@
 
 class GeoIPTest extends PHPUnit_Framework_TestCase
 {
-    protected $validIP = '81.2.69.160';
-    protected $invalidIP = '127.0.0.1';
+    protected $validIp = '81.2.69.160';
+    protected $invalidIp = '127.0.0.1';
 
     public function tearDown()
     {
@@ -93,11 +93,25 @@ public function test_maxmind_web_api_authentication_exception()
         $this->setExpectedException('PulkitJalan\GeoIP\Exceptions\GeoIPException');
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
-        $geoip = $geoip->setIP($this->validIP);
+        $geoip = $geoip->setIp($this->validIp);
 
         $geoip->get();
     }
 
+    public function test_get_random_ipaddress()
+    {
+        $config = [
+            'driver' => 'ip-api',
+            'random' => true,
+        ];
+
+        $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
+        $ip = $geoip->getIp();
+
+        $this->assertNotEquals($ip, $this->invalidIp);
+        $this->assertTrue(!(filter_var($ip, FILTER_VALIDATE_IP)) === False);
+    }
+
     public function test_maxmind_database()
     {
         $config = [
@@ -108,11 +122,11 @@ public function test_maxmind_database()
         ];
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
-        $geoip = $geoip->setIP($this->validIP);
+        $geoip = $geoip->setIp($this->validIp);
 
         $this->assertEquals($geoip->getCountry(), 'United Kingdom');
 
-        $geoip = $geoip->setIP($this->invalidIP);
+        $geoip = $geoip->setIp($this->invalidIp);
 
         $this->assertEquals($geoip->get(), []);
         $this->assertEquals($geoip->getCountry(), '');
@@ -131,7 +145,7 @@ public function test_ip_api_pro_exception()
         $this->setExpectedException('PulkitJalan\GeoIP\Exceptions\GeoIPException');
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
-        $geoip = $geoip->setIP($this->validIP);
+        $geoip = $geoip->setIp($this->validIp);
 
         $geoip->get();
     }
@@ -143,11 +157,11 @@ public function test_ip_api()
         ];
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
-        $geoip = $geoip->setIP($this->validIP);
+        $geoip = $geoip->setIp($this->validIp);
 
         $this->assertEquals($geoip->getCountry(), 'United Kingdom');
 
-        $geoip = $geoip->setIP($this->invalidIP);
+        $geoip = $geoip->setIp($this->invalidIp);
 
         $this->assertEquals($geoip->get(), []);
         $this->assertEquals($geoip->getCountry(), '');
@@ -160,11 +174,11 @@ public function test_telize()
         ];
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
-        $geoip = $geoip->setIP($this->validIP);
+        $geoip = $geoip->setIp($this->validIp);
 
         $this->assertEquals($geoip->getCountry(), 'United Kingdom');
 
-        $geoip = $geoip->setIP($this->invalidIP);
+        $geoip = $geoip->setIp($this->invalidIp);
 
         $this->assertEquals($geoip->get(), []);
         $this->assertEquals($geoip->getCountry(), '');
@@ -180,11 +194,11 @@ public function test_telize_secure()
         ];
 
         $geoip = new \PulkitJalan\GeoIP\GeoIP($config);
-        $geoip = $geoip->setIP($this->validIP);
+        $geoip = $geoip->setIp($this->validIp);
 
         $this->assertEquals($geoip->getCountry(), 'United Kingdom');
 
-        $geoip = $geoip->setIP($this->invalidIP);
+        $geoip = $geoip->setIp($this->invalidIp);
 
         $this->assertEquals($geoip->get(), []);
         $this->assertEquals($geoip->getCountry(), '');