Work around php-cs-fixer breakage

PHP-CS-Fixer/PHP-CS-Fixer#7642
maxmind · Jan 5, 2024 · f545fe9 · f545fe9
1 parent ffe95d4
commit f545fe9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/Model/City.php b/src/Model/City.php
@@ -4,7 +4,7 @@
 
 namespace GeoIp2\Model;
 
-use GeoIp2\Record\City;
+use GeoIp2\Record\City as CityRecord;
 use GeoIp2\Record\Location;
 use GeoIp2\Record\Postal;
 use GeoIp2\Record\Subdivision;
@@ -19,9 +19,9 @@
 class City extends Country
 {
     /**
-     * @var City city data for the requested IP address
+     * @var CityRecord city data for the requested IP address
      */
-    public readonly \GeoIp2\Record\City $city;
+    public readonly CityRecord $city;
 
     /**
      * @var Location location data for the requested IP address
@@ -65,7 +65,7 @@ public function __construct(array $raw, array $locales = ['en'])
     {
         parent::__construct($raw, $locales);
 
-        $this->city = new \GeoIp2\Record\City($raw['city'] ?? [], $locales);
+        $this->city = new CityRecord($raw['city'] ?? [], $locales);
         $this->location = new \GeoIp2\Record\Location($raw['location'] ?? []);
         $this->postal = new \GeoIp2\Record\Postal($raw['postal'] ?? []);
 

diff --git a/src/Model/Country.php b/src/Model/Country.php
@@ -5,7 +5,7 @@
 namespace GeoIp2\Model;
 
 use GeoIp2\Record\Continent;
-use GeoIp2\Record\Country;
+use GeoIp2\Record\Country as CountryRecord;
 use GeoIp2\Record\MaxMind;
 use GeoIp2\Record\RepresentedCountry;
 use GeoIp2\Record\Traits;
@@ -23,23 +23,24 @@ class Country implements \JsonSerializable
     public readonly \GeoIp2\Record\Continent $continent;
 
     /**
-     * @var Country Country data for the requested IP address. This object
-     *              represents the country where MaxMind believes the end user
-     *              is located.
+     * @var CountryRecord Country data for the requested IP address. This
+     *                    object represents the country where MaxMind believes
+     *                    the end user is located.
      */
-    public readonly \GeoIp2\Record\Country $country;
+    public readonly CountryRecord $country;
 
     /**
      * @var MaxMind data related to your MaxMind account
      */
     public readonly \GeoIp2\Record\MaxMind $maxmind;
 
     /**
-     * @var Country Registered country data for the requested IP address. This
-     *              record represents the country where the ISP has registered
-     *              a given IP block and may differ from the user's country.
+     * @var CountryRecord Registered country data for the requested IP address.
+     *                    This record represents the country where the ISP has
+     *                    registered a given IP block and may differ from the
+     *                    user's country.
      */
-    public readonly \GeoIp2\Record\Country $registeredCountry;
+    public readonly CountryRecord $registeredCountry;
 
     /**
      * @var RepresentedCountry Represented country data for the requested IP
@@ -64,12 +65,12 @@ public function __construct(array $raw, array $locales = ['en'])
             $raw['continent'] ?? [],
             $locales
         );
-        $this->country = new \GeoIp2\Record\Country(
+        $this->country = new CountryRecord(
             $raw['country'] ?? [],
             $locales
         );
         $this->maxmind = new \GeoIp2\Record\MaxMind($raw['maxmind'] ?? []);
-        $this->registeredCountry = new \GeoIp2\Record\Country(
+        $this->registeredCountry = new CountryRecord(
             $raw['registered_country'] ?? [],
             $locales
         );