diff --git a/src/Model/Asn.php b/src/Model/Asn.php
index 5feae2f0..02e16727 100644
--- a/src/Model/Asn.php
+++ b/src/Model/Asn.php
@@ -45,8 +45,8 @@ class Asn implements \JsonSerializable
     public function __construct(array $raw)
     {
         $this->autonomousSystemNumber = $raw['autonomous_system_number'] ?? null;
-        $this->autonomousSystemOrganization =
-            $raw['autonomous_system_organization'] ?? null;
+        $this->autonomousSystemOrganization
+            = $raw['autonomous_system_organization'] ?? null;
         $ipAddress = $raw['ip_address'];
         $this->ipAddress = $ipAddress;
         $this->network = Util::cidr($ipAddress, $raw['prefix_len']);
diff --git a/src/Model/City.php b/src/Model/City.php
index e6a32f9d..739a7e1f 100644
--- a/src/Model/City.php
+++ b/src/Model/City.php
@@ -74,22 +74,22 @@ public function __construct(array $raw, array $locales = ['en'])
 
         if (!isset($raw['subdivisions'])) {
             $this->subdivisions = [];
-            $this->mostSpecificSubdivision =
-                    new Subdivision([], $locales);
+            $this->mostSpecificSubdivision
+                    = new Subdivision([], $locales);
 
             return;
         }
 
         $subdivisions = [];
         foreach ($raw['subdivisions'] as $sub) {
-            $subdivisions[] =
-                new Subdivision($sub, $locales)
+            $subdivisions[]
+                = new Subdivision($sub, $locales)
             ;
         }
 
         // Not using end as we don't want to modify internal pointer.
-        $this->mostSpecificSubdivision =
-            $subdivisions[\count($subdivisions) - 1];
+        $this->mostSpecificSubdivision
+            = $subdivisions[\count($subdivisions) - 1];
         $this->subdivisions = $subdivisions;
     }
 
@@ -110,8 +110,8 @@ public function jsonSerialize(): ?array
             $js['location'] = $location;
         }
 
-        $postal =
-         $this->postal->jsonSerialize();
+        $postal
+         = $this->postal->jsonSerialize();
         if (!empty($postal)) {
             $js['postal'] = $postal;
         }
diff --git a/src/Model/Isp.php b/src/Model/Isp.php
index 6b913051..445e056c 100644
--- a/src/Model/Isp.php
+++ b/src/Model/Isp.php
@@ -71,8 +71,8 @@ class Isp implements \JsonSerializable
     public function __construct(array $raw)
     {
         $this->autonomousSystemNumber = $raw['autonomous_system_number'] ?? null;
-        $this->autonomousSystemOrganization =
-            $raw['autonomous_system_organization'] ?? null;
+        $this->autonomousSystemOrganization
+            = $raw['autonomous_system_organization'] ?? null;
         $this->isp = $raw['isp'] ?? null;
         $this->mobileCountryCode = $raw['mobile_country_code'] ?? null;
         $this->mobileNetworkCode = $raw['mobile_network_code'] ?? null;
diff --git a/tests/GeoIp2/Test/Database/ReaderTest.php b/tests/GeoIp2/Test/Database/ReaderTest.php
index e1cdbe53..5a37f6a9 100644
--- a/tests/GeoIp2/Test/Database/ReaderTest.php
+++ b/tests/GeoIp2/Test/Database/ReaderTest.php
@@ -15,14 +15,6 @@
  */
 class ReaderTest extends TestCase
 {
-    /**
-     * @return array<list<string>>
-     */
-    public static function databaseTypes(): array
-    {
-        return [['City', 'city'], ['Country', 'country']];
-    }
-
     /**
      * @dataProvider databaseTypes
      */
@@ -78,6 +70,14 @@ public function testIsInEuropeanUnion(string $type, string $method): void
         $reader->close();
     }
 
+    /**
+     * @return array<list<string>>
+     */
+    public static function databaseTypes(): array
+    {
+        return [['City', 'city'], ['Country', 'country']];
+    }
+
     public function testUnknownAddress(): void
     {
         $this->expectException(AddressNotFoundException::class);
diff --git a/tests/GeoIp2/Test/Model/CountryTest.php b/tests/GeoIp2/Test/Model/CountryTest.php
index 063f1dda..27399973 100644
--- a/tests/GeoIp2/Test/Model/CountryTest.php
+++ b/tests/GeoIp2/Test/Model/CountryTest.php
@@ -170,8 +170,8 @@ public function testValues(): void
 
     public function testJsonSerialize(): void
     {
-        $js =
-        [
+        $js
+        = [
             'continent' => [
                 'names' => ['en' => 'North America'],
                 'code' => 'NA',
diff --git a/tests/GeoIp2/Test/WebService/ClientTest.php b/tests/GeoIp2/Test/WebService/ClientTest.php
index b790b7a2..8e6aba7e 100644
--- a/tests/GeoIp2/Test/WebService/ClientTest.php
+++ b/tests/GeoIp2/Test/WebService/ClientTest.php
@@ -537,8 +537,8 @@ private function makeRequest(
 
         // On macOS, when the SSL version is "SecureTransport", the system's
         // keychain will be used.
-        $caBundle = $curlVersion['ssl_version'] === 'SecureTransport' ?
-          null : CaBundle::getSystemCaRootBundlePath();
+        $caBundle = $curlVersion['ssl_version'] === 'SecureTransport'
+          ? null : CaBundle::getSystemCaRootBundlePath();
 
         $curlVersion = curl_version();
         $factory->expects($this->exactly($callsToRequest))