Merge pull request #109 from ipinfo/fix-messages

Fix deprecation, warning, and notice messages

Author: silvanocerza

src/Details.php

@@ -32,6 +32,22 @@ class Details
     public $abuse;
     public $domains;
     public $bogon;
+    public $is_anycast;
+    public $is_mobile;
+    public $is_anonymous;
+    public $is_satellite;
+    public $is_hosting;
+    public $name;
+    public $allocated;
+    public $registry;
+    public $domain;
+    public $num_ips;
+    public $type;
+    public $prefixes;
+    public $prefixes6;
+    public $peers;
+    public $upstreams;
+    public $downstreams;
     public $all;
 
     public function __construct($raw_details)

src/DetailsCore.php

@@ -16,6 +16,9 @@ class DetailsCore
     public $is_mobile;
     public $is_satellite;
     public $bogon;
+    public $hostname;
+    public $mobile;
+    public $anonymous;
     public $all;
 
     public function __construct($raw_details)

src/IPinfo.php

@@ -181,7 +181,7 @@ public function getBatchDetails(
 
     public function formatDetailsObject($details = [])
     {
-        $country = $details['country'] ?? null;
+        $country = $details['country'] ?? '';
         $details['country_name'] = $this->countries[$country] ?? null;
         $details['is_eu'] = in_array($country, $this->eu_countries);
         $details['country_flag'] = $this->countries_flags[$country] ?? null;
@@ -330,7 +330,7 @@ public function getMapUrl($ips)
         }
 
         $res = json_decode($response->getBody(), true);
-        return $res['reportUrl'];
+        return $res['reportUrl'] ?? null;
     }
 
     /**

src/IPinfoLite.php

@@ -105,7 +105,7 @@ public function getDetails($ip_address = null)
 
     public function formatDetailsObject($details = [])
     {
-        $country_code = $details["country_code"] ?? null;
+        $country_code = $details["country_code"] ?? '';
         $details["country_name"] = $details["country"] ?? null;
         $details["is_eu"] = in_array($country_code, $this->eu_countries);
         $details["country_flag"] =

tests/IPinfoTest.php

@@ -367,7 +367,7 @@ public function testIPv6NotationsCaching()
         // Replace the real Guzzle client with our mock
         $reflectionClass = new \ReflectionClass($h);
         $reflectionProperty = $reflectionClass->getProperty('http_client');
-        $reflectionProperty->setAccessible(true);
+
         $reflectionProperty->setValue($h, $mock_guzzle);
 
         // Different notations of the same IPv6 address
@@ -415,26 +415,26 @@ public function testResproxy()
         $h = new IPinfo("test_token");
         $ip = "175.107.211.204";
 
-        // Create a mock stream for the response body
-        $mockStream = $this->createMock(\Psr\Http\Message\StreamInterface::class);
+        // Create a stub stream for the response body
+        $mockStream = $this->createStub(\Psr\Http\Message\StreamInterface::class);
         $mockStream->method("__toString")->willReturn(json_encode([
             "ip" => "175.107.211.204",
             "last_seen" => "2025-01-20",
             "percent_days_seen" => 0.85,
             "service" => "example_service"
         ]));
 
-        $mockResponse = $this->createMock(\GuzzleHttp\Psr7\Response::class);
+        $mockResponse = $this->createStub(\GuzzleHttp\Psr7\Response::class);
         $mockResponse->method("getStatusCode")->willReturn(200);
         $mockResponse->method("getBody")->willReturn($mockStream);
 
-        $mockClient = $this->createMock(\GuzzleHttp\Client::class);
+        $mockClient = $this->createStub(\GuzzleHttp\Client::class);
         $mockClient->method("request")->willReturn($mockResponse);
 
         // Use reflection to replace the http_client
         $reflectionClass = new \ReflectionClass($h);
         $reflectionProperty = $reflectionClass->getProperty("http_client");
-        $reflectionProperty->setAccessible(true);
+
         $reflectionProperty->setValue($h, $mockClient);
 
         $res = $h->getResproxy($ip);
@@ -448,21 +448,21 @@ public function testResproxyEmpty()
     {
         $h = new IPinfo("test_token");
 
-        // Create a mock stream for the response body
-        $mockStream = $this->createMock(\Psr\Http\Message\StreamInterface::class);
+        // Create a stub stream for the response body
+        $mockStream = $this->createStub(\Psr\Http\Message\StreamInterface::class);
         $mockStream->method("__toString")->willReturn("{}");
 
-        $mockResponse = $this->createMock(\GuzzleHttp\Psr7\Response::class);
+        $mockResponse = $this->createStub(\GuzzleHttp\Psr7\Response::class);
         $mockResponse->method("getStatusCode")->willReturn(200);
         $mockResponse->method("getBody")->willReturn($mockStream);
 
-        $mockClient = $this->createMock(\GuzzleHttp\Client::class);
+        $mockClient = $this->createStub(\GuzzleHttp\Client::class);
         $mockClient->method("request")->willReturn($mockResponse);
 
         // Use reflection to replace the http_client
         $reflectionClass = new \ReflectionClass($h);
         $reflectionProperty = $reflectionClass->getProperty("http_client");
-        $reflectionProperty->setAccessible(true);
+
         $reflectionProperty->setValue($h, $mockClient);
 
         $res = $h->getResproxy("8.8.8.8");