Use typed properties

Author: oschwald

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

src/Model/City.php

@@ -33,31 +33,25 @@ class City extends Country
 {
     /**
      * @ignore
-     *
-     * @var \GeoIp2\Record\City
      */
-    protected $city;
+    protected \GeoIp2\Record\City $city;
 
     /**
      * @ignore
-     *
-     * @var \GeoIp2\Record\Location
      */
-    protected $location;
+    protected \GeoIp2\Record\Location $location;
 
     /**
      * @ignore
-     *
-     * @var \GeoIp2\Record\Postal
      */
-    protected $postal;
+    protected \GeoIp2\Record\Postal $postal;
 
     /**
      * @ignore
      *
      * @var array<\GeoIp2\Record\Subdivision>
      */
-    protected $subdivisions = [];
+    protected array $subdivisions = [];
 
     /**
      * @ignore

src/Model/ConnectionType.php

@@ -20,20 +20,9 @@
  */
 class ConnectionType extends AbstractModel
 {
-    /**
-     * @var string|null
-     */
-    protected $connectionType;
-
-    /**
-     * @var string
-     */
-    protected $ipAddress;
-
-    /**
-     * @var string
-     */
-    protected $network;
+    protected ?string $connectionType;
+    protected string $ipAddress;
+    protected string $network;
 
     /**
      * @ignore

src/Model/Country.php

@@ -30,40 +30,18 @@
  */
 class Country extends AbstractModel
 {
-    /**
-     * @var \GeoIp2\Record\Continent
-     */
-    protected $continent;
-
-    /**
-     * @var \GeoIp2\Record\Country
-     */
-    protected $country;
+    protected \GeoIp2\Record\Continent $continent;
+    protected \GeoIp2\Record\Country $country;
 
     /**
      * @var array<string>
      */
-    protected $locales;
-
-    /**
-     * @var \GeoIp2\Record\MaxMind
-     */
-    protected $maxmind;
+    protected array $locales;
 
-    /**
-     * @var \GeoIp2\Record\Country
-     */
-    protected $registeredCountry;
-
-    /**
-     * @var \GeoIp2\Record\RepresentedCountry
-     */
-    protected $representedCountry;
-
-    /**
-     * @var \GeoIp2\Record\Traits
-     */
-    protected $traits;
+    protected \GeoIp2\Record\MaxMind $maxmind;
+    protected \GeoIp2\Record\Country $registeredCountry;
+    protected \GeoIp2\Record\RepresentedCountry $representedCountry;
+    protected \GeoIp2\Record\Traits $traits;
 
     /**
      * @ignore

src/Model/Domain.php

@@ -20,20 +20,9 @@
  */
 class Domain extends AbstractModel
 {
-    /**
-     * @var string|null
-     */
-    protected $domain;
-
-    /**
-     * @var string
-     */
-    protected $ipAddress;
-
-    /**
-     * @var string
-     */
-    protected $network;
+    protected ?string $domain;
+    protected string $ipAddress;
+    protected string $network;
 
     /**
      * @ignore