use native gzdecode

Author: pulkitjalan

src/GeoIPUpdater.php

@@ -48,37 +48,22 @@ public function update()
      */
     protected function updateMaxmindDatabase()
     {
-        $maxmindDatabaseUrl = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz';
+        $maxmindDatabaseUrl = array_get($this->config, 'maxmind.download', 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz');
 
         $database = array_get($this->config, 'maxmind.database', false);
 
         if (! file_exists($dir = pathinfo($database, PATHINFO_DIRNAME))) {
             mkdir($dir, 0777, true);
         }
 
-        $file = $this->guzzle->get($maxmindDatabaseUrl)->getBody();
-
         try {
-            file_put_contents($database, $this->gzdecode($file));
+            $file = $this->guzzle->get($maxmindDatabaseUrl)->getBody();
+
+            file_put_contents($database, gzdecode($file));
         } catch (Exception $e) {
             return false;
         }
 
         return $database;
     }
-
-    /**
-     * gzdecode function.
-     * 
-     * @param \Psr\Http\Message\StreamInterface $data
-     * @return string
-     */
-    protected function gzdecode($data)
-    {
-        if (!function_exists('gzdecode')) {
-            return gzinflate(substr($data, 10, -8));
-        }
-
-        return gzdecode($data);
-    }
 }

tests/GeoIPTest.php

@@ -103,6 +103,10 @@ public function test_maxmind_web_api_authentication_exception()
         $geoip = $geoip->setIp($this->validIp);
 
         $geoip->get();
+
+        $this->setExpectedException(GeoIPException::class);
+
+        $geoip->getRaw();
     }
 
     public function test_get_random_ipaddress()
@@ -196,6 +200,10 @@ public function test_ip_api_pro_exception()
         $geoip = $geoip->setIp($this->validIp);
 
         $geoip->get();
+
+        $this->setExpectedException(GeoIPException::class);
+
+        $geoip->getRaw();
     }
 
     public function test_ip_api()

tests/GeoIPUpdaterTest.php

@@ -37,6 +37,22 @@ public function test_maxmind_updater()
         unlink($database);
     }
 
+    public function test_maxmind_updater_invalid_url()
+    {
+        $database = __DIR__.'/data/GeoLite2-City.mmdb';
+        $config = [
+            'driver'  => 'maxmind',
+            'maxmind' => [
+                'database' => $database,
+                'download' => 'http://example.com/maxmind_database.mmdb.gz'
+            ],
+        ];
+
+        $geoipUpdater = new GeoIPUpdater($config);
+
+        $this->assertFalse($geoipUpdater->update());
+    }
+
     public function test_maxmind_updater_dir_not_exist()
     {
         $database = __DIR__.'/data/new_dir/GeoLite2-City.mmdb';