Apply fixes from StyleCI

FriendsOfFlarum · Nov 10, 2023 · e169f30 · e169f30
1 parent 5326306
commit e169f30
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/src/Api/Services/BaseGeoService.php b/src/Api/Services/BaseGeoService.php
@@ -58,7 +58,7 @@ public function get(string $ip): ?ServiceResponse
         /** @phpstan-ignore-next-line */
         if (!$this->isRateLimited() || ($this->isRateLimited() && $this->singleLookupsRemaining > 0)) {
             $response = $this->client->get($this->buildUrl($ip, $apiKey), $this->getRequestOptions($apiKey));
-            
+
             if ($this->isRateLimited()) {
                 $this->updateRateLimitsFromResponse($response);
             }
@@ -74,6 +74,7 @@ public function get(string $ip): ?ServiceResponse
             return $this->parseResponse($body);
         } else {
             $this->storeForLaterLookup($ip);
+
             return null;
         }
     }
@@ -105,7 +106,7 @@ public function getBatch(array $ips)
         /** @phpstan-ignore-next-line */
         if (!$this->isRateLimited() || ($this->isRateLimited() && $this->batchLookupsRemaining > 0)) {
             $response = $this->client->request('POST', $this->buildBatchUrl($ips, $apiKey), $this->getRequestOptions($apiKey, $ips));
-            
+
             if ($this->isRateLimited()) {
                 $this->updateRateLimitsFromResponse($response, 'batch');
             }
@@ -129,7 +130,7 @@ protected function initRateLimitsFromCache(): void
         $this->batchLookupsRemaining = $this->cache->get("{$this->settingPrefix}.batch", $this->batchLookupsRemaining);
     }
 
-    abstract function isRateLimited(): bool;
+    abstract public function isRateLimited(): bool;
 
     abstract protected function updateRateLimitsFromResponse(ResponseInterface $response, string $requestType = 'single'): void;
 

diff --git a/src/Api/Services/IPApi.php b/src/Api/Services/IPApi.php
@@ -24,34 +24,34 @@ class IPApi extends BaseGeoService
 
     /**
      * 45 requests per minute.
-     * 
+     *
      * @see https://ip-api.com/docs/api:json
      *
-     * @var integer
+     * @var int
      */
     protected int $singleLookupsRemaining = 45;
 
     /**
      * 15 requests per minute.
-     * 
+     *
      * @see https://ip-api.com/docs/api:batch
      *
-     * @var integer
+     * @var int
      */
     protected int $batchLookupsRemaining = 15;
 
     protected function updateRateLimitsFromResponse(ResponseInterface $response, string $requestType = 'single'): void
     {
-        /** 
+        /**
          * The number of requests remaining in the current time window.
-         * 
+         *
          * @var int
          */
         $remaining = (int) $response->getHeaderLine('X-Rl');
 
         /**
          * The number of seconds until the current time window resets.
-         * 
+         *
          * @var int
          */
         $ttl = Carbon::now()->addSeconds((int) $response->getHeaderLine('X-Ttl'));

diff --git a/src/Api/Services/IPApiPro.php b/src/Api/Services/IPApiPro.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of fof/geoip.
+ *
+ * Copyright (c) FriendsOfFlarum.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\GeoIP\Api\Services;
 
 class IPApiPro extends IPApi

diff --git a/src/Api/Services/IPData.php b/src/Api/Services/IPData.php
@@ -25,18 +25,18 @@ class IPData extends BaseGeoService
 
     /**
      * 1500 lookups per day, on the free plan.
-     * 
+     *
      * @see https://ipdata.co/pricing.html
      *
-     * @var integer
+     * @var int
      */
     protected int $singleLookupsRemaining = 1500;
 
     protected function updateRateLimitsFromResponse(ResponseInterface $response, string $requestType = 'single'): void
     {
-        /** 
+        /**
          * The number of requests remaining in the current time window.
-         * 
+         *
          * @var int
          */
         $remaining = 1500 - (int) Arr::get(json_decode($response->getBody(), true), 'count', $this->cache->get("$this->settingPrefix.$requestType"));