Upgrade geoip2/geoip2

Author: alies-dev

composer.json

@@ -1,71 +1,71 @@
-{
-  "name": "interaction-design-foundation/laravel-geoip",
-  "description": "Support for multiple GeoIP services.",
-  "license": "BSD-2-Clause",
-  "keywords": [
-    "laravel",
-    "geoip",
-    "location",
-    "geolocation",
-    "MaxMind",
-    "IP API",
-    "infoDB"
-  ],
-  "require": {
-    "php": "^8.1",
-    "illuminate/cache": "^10.0 || ^11.0",
-    "illuminate/console": "^10.0 || ^11.0",
-    "illuminate/support": "^10.0 || ^11.0"
-  },
-  "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.50",
-    "geoip2/geoip2": "^2.11",
-    "mockery/mockery": "^1.6",
-    "phpstan/phpstan": "^1.10",
-    "phpunit/phpunit": "^10.5 || ^11.0",
-    "squizlabs/php_codesniffer": "^3.9",
-    "vimeo/psalm": "^5.22",
-    "vlucas/phpdotenv": "^5.4"
-  },
-  "suggest": {
-    "geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
-    "monolog/monolog": "Allows for storing location not found errors to the log"
-  },
-  "autoload": {
-    "psr-4": {
-      "InteractionDesignFoundation\\GeoIP\\": "src/"
-    },
-    "files": [
-      "src/helpers.php"
-    ]
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "InteractionDesignFoundation\\GeoIP\\Tests\\": "tests/"
-    },
-    "files": [
-      "tests/TestFunctions.php"
-    ]
-  },
-  "config": {
-    "sort-packages": true
-  },
-  "extra": {
-    "laravel": {
-      "aliases": {
-        "GeoIP": "InteractionDesignFoundation\\GeoIP\\Facades\\GeoIP"
-      },
-      "providers": [
-        "InteractionDesignFoundation\\GeoIP\\GeoIPServiceProvider"
-      ]
-    }
-  },
-  "scripts": {
-    "cs": "@php-cs-fixer",
-    "php-cs-fixer": "@php -d memory_limit=-1 vendor/bin/php-cs-fixer fix --no-interaction --ansi --verbose",
-    "phpcs": "vendor/bin/phpcs --standard=phpcs.xml src",
-    "phpstan": "vendor/bin/phpstan --level=0 --no-progress analyse --configuration phpstan.neon --memory-limit 2G",
-    "psalm": "vendor/bin/psalm",
-    "test": "vendor/bin/phpunit"
-  }
-}
+{
+  "name": "interaction-design-foundation/laravel-geoip",
+  "description": "Support for multiple GeoIP services.",
+  "license": "BSD-2-Clause",
+  "keywords": [
+    "laravel",
+    "geoip",
+    "location",
+    "geolocation",
+    "MaxMind",
+    "IP API",
+    "infoDB"
+  ],
+  "require": {
+    "php": "^8.1",
+    "illuminate/cache": "^10.0 || ^11.0",
+    "illuminate/console": "^10.0 || ^11.0",
+    "illuminate/support": "^10.0 || ^11.0"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.50",
+    "geoip2/geoip2": "^3.0",
+    "mockery/mockery": "^1.6",
+    "phpstan/phpstan": "^1.10",
+    "phpunit/phpunit": "^10.5 || ^11.0",
+    "squizlabs/php_codesniffer": "^3.9",
+    "vimeo/psalm": "^5.22",
+    "vlucas/phpdotenv": "^5.4"
+  },
+  "suggest": {
+    "geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
+    "monolog/monolog": "Allows for storing location not found errors to the log"
+  },
+  "autoload": {
+    "psr-4": {
+      "InteractionDesignFoundation\\GeoIP\\": "src/"
+    },
+    "files": [
+      "src/helpers.php"
+    ]
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "InteractionDesignFoundation\\GeoIP\\Tests\\": "tests/"
+    },
+    "files": [
+      "tests/TestFunctions.php"
+    ]
+  },
+  "config": {
+    "sort-packages": true
+  },
+  "extra": {
+    "laravel": {
+      "aliases": {
+        "GeoIP": "InteractionDesignFoundation\\GeoIP\\Facades\\GeoIP"
+      },
+      "providers": [
+        "InteractionDesignFoundation\\GeoIP\\GeoIPServiceProvider"
+      ]
+    }
+  },
+  "scripts": {
+    "cs": "@php-cs-fixer",
+    "php-cs-fixer": "@php -d memory_limit=-1 vendor/bin/php-cs-fixer fix --no-interaction --ansi --verbose",
+    "phpcs": "vendor/bin/phpcs --standard=phpcs.xml src",
+    "phpstan": "vendor/bin/phpstan --level=0 --no-progress analyse --configuration phpstan.neon --memory-limit 2G",
+    "psalm": "vendor/bin/psalm",
+    "test": "vendor/bin/phpunit"
+  }
+}

src/Contracts/ServiceInterface.php

@@ -23,6 +23,8 @@ public function boot();
      * @param string $ip
      *
      * @return \InteractionDesignFoundation\GeoIP\Location
+     *
+     * @throws \InvalidArgumentException if an invalid IP address is passed
      */
     public function locate($ip);
 

src/Services/IPFinder.php

@@ -4,7 +4,6 @@
 
 namespace InteractionDesignFoundation\GeoIP\Services;
 
-use Exception;
 use InteractionDesignFoundation\GeoIP\Support\HttpClient;
 
 class IPFinder extends AbstractService
@@ -36,7 +35,7 @@ public function boot()
 
     /**
      * {@inheritDoc}
-     * @throws Exception
+     * @throws \Exception
      */
     public function locate($ip)
     {
@@ -45,7 +44,7 @@ public function locate($ip)
 
         // Verify server response
         if ($this->client->getErrors() !== null || empty($data[0])) {
-            throw new Exception('Request failed (' . $this->client->getErrors() . ')');
+            throw new \Exception('Request failed (' . $this->client->getErrors() . ')');
         }
 
         $json = json_decode($data[0], true);