Merge pull request #204 from maxmind/greg/ip-check

Add IP check and bump required PHP version

Author: faktas2

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['8.0', '8.1']
     name: "PHP ${{ matrix.php-versions }} test on ${{ matrix.operating-system }}"
     steps:
       - name: Setup PHP

CHANGELOG.md

@@ -1,6 +1,15 @@
 CHANGELOG
 =========
 
+3.0.0
+-------------------
+
+* IMPORTANT: PHP 8.0 or greater is now required.
+* `GeoIp2\WebService\Client` methods now throw an `InvalidArgumentException`
+  if an invalid IP address is passed to them. Previously, they would make
+  a request to the web service and throw a
+  `GeoIp2\Exception\InvalidRequestException`.
+
 2.13.0 (2022-08-05)
 -------------------
 

README.md

@@ -419,7 +419,7 @@ to the client API, please see
 
 ## Requirements  ##
 
-This library requires PHP 7.2 or greater.
+This library requires PHP 8.0 or greater.
 
 This library also relies on the [MaxMind DB Reader](https://github.com/maxmind/MaxMind-DB-Reader-php).
 

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "maxmind-db/reader": "~1.8",
         "maxmind/web-service-common": "~0.8",
-        "php": ">=7.2",
+        "php": ">=8.0",
         "ext-json": "*"
     },
     "require-dev": {

src/Database/Reader.php

@@ -44,20 +44,14 @@
  */
 class Reader implements ProviderInterface
 {
-    /**
-     * @var DbReader
-     */
-    private $dbReader;
+    private DbReader $dbReader;
 
-    /**
-     * @var string
-     */
-    private $dbType;
+    private string $dbType;
 
     /**
      * @var array<string>
      */
-    private $locales;
+    private array $locales;
 
     /**
      * Constructor.

src/Exception/HttpException.php

@@ -11,10 +11,8 @@ class HttpException extends GeoIp2Exception
 {
     /**
      * The URI queried.
-     *
-     * @var string
      */
-    public $uri;
+    public string $uri;
 
     public function __construct(
         string $message,

src/Exception/InvalidRequestException.php

@@ -12,10 +12,8 @@ class InvalidRequestException extends HttpException
 {
     /**
      * The code returned by the MaxMind web service.
-     *
-     * @var string
      */
-    public $error;
+    public string $error;
 
     public function __construct(
         string $message,

src/Model/AbstractModel.php

@@ -12,7 +12,7 @@ abstract class AbstractModel implements \JsonSerializable
     /**
      * @var array<string, mixed>
      */
-    protected $raw;
+    protected array $raw;
 
     /**
      * @ignore

src/Model/AnonymousIp.php

@@ -31,45 +31,14 @@
  */
 class AnonymousIp extends AbstractModel
 {
-    /**
-     * @var bool
-     */
-    protected $isAnonymous;
-
-    /**
-     * @var bool
-     */
-    protected $isAnonymousVpn;
-
-    /**
-     * @var bool
-     */
-    protected $isHostingProvider;
-
-    /**
-     * @var bool
-     */
-    protected $isPublicProxy;
-
-    /**
-     * @var bool
-     */
-    protected $isResidentialProxy;
-
-    /**
-     * @var bool
-     */
-    protected $isTorExitNode;
-
-    /**
-     * @var string
-     */
-    protected $ipAddress;
-
-    /**
-     * @var string
-     */
-    protected $network;
+    protected bool $isAnonymous;
+    protected bool $isAnonymousVpn;
+    protected bool $isHostingProvider;
+    protected bool $isPublicProxy;
+    protected bool $isResidentialProxy;
+    protected bool $isTorExitNode;
+    protected string $ipAddress;
+    protected string $network;
 
     /**
      * @ignore

src/Model/Asn.php

@@ -22,25 +22,10 @@
  */
 class Asn extends AbstractModel
 {
-    /**
-     * @var int|null
-     */
-    protected $autonomousSystemNumber;
-
-    /**
-     * @var string|null
-     */
-    protected $autonomousSystemOrganization;
-
-    /**
-     * @var string
-     */
-    protected $ipAddress;
-
-    /**
-     * @var string
-     */
-    protected $network;
+    protected ?int $autonomousSystemNumber;
+    protected ?string $autonomousSystemOrganization;
+    protected string $ipAddress;
+    protected string $network;
 
     /**
      * @ignore