Merge pull request #30 from maxmind/greg/types

Add additional type hints

.travis.yml

@@ -4,9 +4,6 @@ language: php
 dist: trusty
 matrix:
   include:
-    - php: '5.6'
-    - php: '7.0'
-    - php: '7.1'
     - php: '7.2'
     - php: '7.3'
     - php: '7.4'

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+0.8.0
+------------------
+
+* PHP 7.2 or greater is now required.
+* Added additional type hints.
+
 0.7.0 (2020-05-06)
 ------------------
 

README.md

@@ -5,7 +5,7 @@ shared code between MaxMind's various web service client APIs.
 
 ## Requirements  ##
 
-The library requires PHP 5.6 or greater.
+The library requires PHP 7.2 or greater.
 
 There are several other dependencies as defined in the `composer.json` file.
 

composer.json

@@ -12,14 +12,14 @@
     }
   ],
   "require": {
-    "php": ">=5.6",
+    "php": ">=7.2",
     "composer/ca-bundle": "^1.0.3",
     "ext-curl": "*",
     "ext-json": "*"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "2.*",
-    "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0",
+    "phpunit/phpunit": "^8.0 || ^9.0",
     "squizlabs/php_codesniffer": "3.*"
   },
   "autoload": {

src/Exception/AuthenticationException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**

src/Exception/HttpException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
@@ -19,21 +21,21 @@ class HttpException extends WebServiceException
      * @param \Exception $previous   the previous exception, if any
      */
     public function __construct(
-        $message,
-        $httpStatus,
-        $uri,
+        string $message,
+        int $httpStatus,
+        string $uri,
         \Exception $previous = null
     ) {
         $this->uri = $uri;
         parent::__construct($message, $httpStatus, $previous);
     }
 
-    public function getUri()
+    public function getUri(): string
     {
         return $this->uri;
     }
 
-    public function getStatusCode()
+    public function getStatusCode(): int
     {
         return $this->getCode();
     }

src/Exception/InsufficientFundsException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**

src/Exception/InvalidInputException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**

src/Exception/InvalidRequestException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**
@@ -14,23 +16,23 @@ class InvalidRequestException extends HttpException
 
     /**
      * @param string     $message    the exception message
-     * @param int        $error      the error code returned by the MaxMind web service
+     * @param string     $error      the error code returned by the MaxMind web service
      * @param int        $httpStatus the HTTP status code of the response
      * @param string     $uri        the URI queries
      * @param \Exception $previous   the previous exception, if any
      */
     public function __construct(
-        $message,
-        $error,
-        $httpStatus,
-        $uri,
+        string $message,
+        string $error,
+        int $httpStatus,
+        string $uri,
         \Exception $previous = null
     ) {
         $this->error = $error;
         parent::__construct($message, $httpStatus, $uri, $previous);
     }
 
-    public function getErrorCode()
+    public function getErrorCode(): string
     {
         return $this->error;
     }

src/Exception/IpAddressNotFoundException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 class IpAddressNotFoundException extends InvalidRequestException

src/Exception/PermissionRequiredException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**

src/Exception/WebServiceException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaxMind\Exception;
 
 /**