#42 Fix type issue

InteractionDesignFoundation · Jan 16, 2025 · ff0f7f0 · ff0f7f0
1 parent 397fff7
commit ff0f7f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -106,7 +106,6 @@
       <code><![CDATA[\InteractionDesignFoundation\GeoIP\Contracts\ServiceInterface]]></code>
     </MoreSpecificReturnType>
     <PossiblyNullArgument>
-      <code><![CDATA[$ip]]></code>
       <code><![CDATA[$location->iso_code]]></code>
       <code><![CDATA[$this->currencies]]></code>
     </PossiblyNullArgument>

diff --git a/src/GeoIP.php b/src/GeoIP.php
@@ -269,9 +269,14 @@ private function isValid($ip): bool
      * @param string|null $ip
      *
      * @return bool
+     * @psalm-assert-if-true string $ip
      */
-    private function shouldCache(Location $location, $ip = null): bool
+    private function shouldCache(Location $location, ?string $ip = null): bool
     {
+        if ($ip === null) {
+            return false;
+        }
+
         if ($location->default === true || $location->cached === true) {
             return false;
         }