Promote properties

Signed-off-by: Jefersson Nathan <malukenho.dev@gmail.com>

Author: malukenho

src/ApiThrottling.php

@@ -4,19 +4,16 @@
 
 namespace Scullwm\DbIpClient;
 
-class ApiThrottling
+final class ApiThrottling
 {
-    private string $apiKey;
-    private int $queriesPerDay;
-    private int $queriesLeft;
-    private string $status;
-
-    public function __construct(string $apiKey, int $queriesPerDay, int $queriesLeft, string $status)
-    {
-        $this->apiKey        = $apiKey;
-        $this->queriesPerDay = $queriesPerDay;
-        $this->queriesLeft   = $queriesLeft;
-        $this->status        = $status;
+    private const UNKNOWN = 'unknown';
+
+    public function __construct(
+        private string $apiKey,
+        private int $queriesPerDay,
+        private int $queriesLeft,
+        private string $status
+    ) {
     }
 
     /**
@@ -29,7 +26,7 @@ public static function new(array $data, string $defaultApiToken = ''): self
             $data['apiKey'] ?? $defaultApiToken,
             $data['queriesPerDay'] ?? 0,
             $data['queriesLeft'] ?? 0,
-            $data['status'] ?? 'unknown'
+            $data['status'] ?? self::UNKNOWN
         );
     }
 

src/Client.php

@@ -21,23 +21,19 @@
 
 use const JSON_THROW_ON_ERROR;
 
-class Client
+final class Client
 {
     private ClientInterface $client;
-
     private RequestFactoryInterface $messageFactory;
 
-    private string $token;
-
     private const API_ENDPOINT_V2_IP_DETAILS = 'https://api.db-ip.com/v2/%s/%s';
     private const API_ENDPOINT_V2_API_STATUS = 'https://api.db-ip.com/v2/%s';
 
     public function __construct(
-        string $token,
+        private string $token,
         ?ClientInterface $client = null,
         ?RequestFactoryInterface $factory = null
     ) {
-        $this->token          = $token;
         $this->client         = $client ?: Psr18ClientDiscovery::find();
         $this->messageFactory = $factory ?: Psr17FactoryDiscovery::findRequestFactory();
     }
@@ -60,8 +56,6 @@ public function getApiStatus(): ApiThrottling
      * @psalm-return array<string, string>
      *
      * @throws ClientExceptionInterface
-     *
-     * @todo can we get the right array shape here?
      */
     protected function getParsedResponse(RequestInterface $request): array
     {

src/IpDetails.php

@@ -4,50 +4,20 @@
 
 namespace Scullwm\DbIpClient;
 
-class IpDetails
+final class IpDetails
 {
-    private string $ipAddress;
-
-    private string $continentCode;
-
-    private string $continentName;
-
-    private string $countryCode;
-
-    private string $countryName;
-
-    private bool $isEuMember;
-
-    private string $stateProv;
-
-    private string $city;
-
-    private string $threatLevel;
-
-    private string $isp;
-
     private function __construct(
-        string $ipAddress,
-        string $continentCode,
-        string $continentName,
-        string $countryCode,
-        string $countryName,
-        bool $isEuMember,
-        string $stateProv,
-        string $city,
-        string $threatLevel,
-        string $isp
+        private string $ipAddress,
+        private string $continentCode,
+        private string $continentName,
+        private string $countryCode,
+        private string $countryName,
+        private bool $isEuMember,
+        private string $stateProv,
+        private string $city,
+        private string $threatLevel,
+        private string $isp
     ) {
-        $this->ipAddress     = $ipAddress;
-        $this->continentCode = $continentCode;
-        $this->continentName = $continentName;
-        $this->countryCode   = $countryCode;
-        $this->countryName   = $countryName;
-        $this->stateProv     = $stateProv;
-        $this->isEuMember    = $isEuMember;
-        $this->city          = $city;
-        $this->threatLevel   = $threatLevel;
-        $this->isp           = $isp;
     }
 
     /**

tests/DbIpClientTest.php

@@ -67,11 +67,13 @@ public function testApiStatus(): void
 
         $response = $this->getResponse(file_get_contents(__DIR__ . '/Fixtures/status.json'));
         $client->setDefaultResponse($response);
-        $dbipClient = new TestedClient('d74be40a1acd2b5b356f67a0f6a5e1be', $client);
+        $hash = 'd74be40a1acd2b5b356f67a0f6a5e1be';
+
+        $dbipClient = new TestedClient($hash, $client);
 
         $apiStatus = $dbipClient->getApiStatus();
 
-        self::assertEquals('d74be40a1acd2b5b356f67a0f6a5e1be', $apiStatus->getApiKey());
+        self::assertEquals($hash, $apiStatus->getApiKey());
         self::assertEquals(10000, $apiStatus->getQueriesPerDay());
         self::assertEquals(9986, $apiStatus->getQueriesLeft());
         self::assertEquals('active', $apiStatus->getStatus());