Push: Update Curl types for PHP8

move-backend · Apr 26, 2024 · b0916fc · b0916fc
1 parent 77125a4
commit b0916fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/ApnsPHP/Push.php b/ApnsPHP/Push.php
@@ -9,13 +9,14 @@
 
 namespace ApnsPHP;
 
-use DateTimeImmutable;
 use ApnsPHP\Push\Exception;
-use Psr\Log\LoggerInterface;
+use CurlHandle;
+use DateTimeImmutable;
 use Lcobucci\JWT\Signer\Key\InMemory;
 use Lcobucci\JWT\Signer\Ecdsa\MultibyteStringConverter;
 use Lcobucci\JWT\Signer\Ecdsa\Sha256;
 use Lcobucci\JWT\Configuration;
+use Psr\Log\LoggerInterface;
 
 /**
  * The Push Notification Provider.
@@ -147,9 +148,9 @@ class Push
 
     /**
      * SSL Socket.
-     * @var resource|\CurlHandle|null
+     * @var CurlHandle|null
      */
-    protected $hSocket;
+    protected ?CurlHandle $hSocket;
 
     /**
      * HTTP/2 Error-response messages.
@@ -412,7 +413,7 @@ public function connect(): void
      */
     public function disconnect(): bool
     {
-        if (is_resource($this->hSocket) || is_object($this->hSocket)) {
+        if (is_object($this->hSocket)) {
             $this->logger->info('Disconnected.');
             curl_close($this->hSocket);
             unset($this->hSocket); // curl_close($handle) has no effect in PHP >= 8.0

diff --git a/ApnsPHP/Tests/PushConnectTest.php b/ApnsPHP/Tests/PushConnectTest.php
@@ -29,9 +29,6 @@ public function testConnectSuccess(): void
     {
         $this->set_reflection_property_value('logger', $this->logger);
 
-        $this->mock_function('curl_init', function () {
-            return new stdClass();
-        });
         $this->mock_function('curl_setopt_array', function () {
             return true;
         });
@@ -46,7 +43,6 @@ public function testConnectSuccess(): void
 
         $this->class->connect();
 
-        $this->unmock_function('curl_init');
         $this->unmock_function('curl_setopt_array');
     }
 

diff --git a/ApnsPHP/Tests/PushSendTest.php b/ApnsPHP/Tests/PushSendTest.php
@@ -39,7 +39,7 @@ public function testSendThrowsExceptionOnNoConnection(): void
      */
     public function testSendThrowsExceptionOnEmptyQueue(): void
     {
-        $this->set_reflection_property_value('hSocket', new stdClass());
+        $this->set_reflection_property_value('hSocket', curl_init());
 
         $this->expectException('ApnsPHP\Push\Exception');
         $this->expectExceptionMessage('No notifications queued to be sent');
@@ -66,9 +66,6 @@ public function testSendFailsWithoutRetrying(): void
         $this->mock_function('curl_close', function () {
             return null;
         });
-        $this->mock_function('curl_init', function () {
-            return new stdClass();
-        });
         $this->mock_function('curl_errno', function () {
             return 0;
         });
@@ -86,7 +83,7 @@ public function testSendFailsWithoutRetrying(): void
         $message = [ 1 => [ 'MESSAGE' => $this->message, 'ERRORS' => [] ] ];
 
         $this->set_reflection_property_value('environment', 1);
-        $this->set_reflection_property_value('hSocket', new stdClass());
+        $this->set_reflection_property_value('hSocket', curl_init());
         $this->set_reflection_property_value('messageQueue', $message);
         $this->set_reflection_property_value('logger', $this->logger);
         $this->set_reflection_property_value('writeInterval', 0);
@@ -117,7 +114,6 @@ public function testSendFailsWithoutRetrying(): void
         $this->unmock_function('curl_setopt_array');
         $this->unmock_function('curl_getinfo');
         $this->unmock_function('curl_close');
-        $this->unmock_function('curl_init');
     }
 
     /**
@@ -139,14 +135,11 @@ public function testSendFailsWithRetrying(): void
         $this->mock_function('curl_close', function () {
             return null;
         });
-        $this->mock_function('curl_init', function () {
-            return new stdClass();
-        });
 
         $message = [ 1 => [ 'MESSAGE' => $this->message, 'ERRORS' => [] ] ];
 
         $this->set_reflection_property_value('environment', 1);
-        $this->set_reflection_property_value('hSocket', new stdClass());
+        $this->set_reflection_property_value('hSocket', curl_init());
         $this->set_reflection_property_value('messageQueue', $message);
         $this->set_reflection_property_value('logger', $this->logger);
         $this->set_reflection_property_value('writeInterval', 0);
@@ -190,7 +183,6 @@ public function testSendFailsWithRetrying(): void
         $this->unmock_function('curl_setopt_array');
         $this->unmock_function('curl_getinfo');
         $this->unmock_function('curl_close');
-        $this->unmock_function('curl_init');
     }
 
     /**
@@ -218,14 +210,11 @@ public function testSendRemovesWhenNoError(): void
         $this->mock_function('curl_error', function () {
             return '';
         });
-        $this->mock_function('curl_init', function () {
-            return new stdClass();
-        });
 
         $message = [ 1 => [ 'MESSAGE' => $this->message, 'ERRORS' => [] ] ];
 
         $this->set_reflection_property_value('environment', 1);
-        $this->set_reflection_property_value('hSocket', new stdClass());
+        $this->set_reflection_property_value('hSocket', curl_init());
         $this->set_reflection_property_value('messageQueue', $message);
         $this->set_reflection_property_value('logger', $this->logger);
         $this->set_reflection_property_value('writeInterval', 0);
@@ -256,7 +245,6 @@ public function testSendRemovesWhenNoError(): void
         $this->unmock_function('curl_setopt_array');
         $this->unmock_function('curl_getinfo');
         $this->unmock_function('curl_close');
-        $this->unmock_function('curl_init');
     }
 
     /**
@@ -278,14 +266,11 @@ public function testSendSuccessfullySends(): void
         $this->mock_function('curl_close', function () {
             return null;
         });
-        $this->mock_function('curl_init', function () {
-            return new stdClass();
-        });
 
         $message = [ 1 => [ 'MESSAGE' => $this->message, 'ERRORS' => [] ] ];
 
         $this->set_reflection_property_value('environment', 1);
-        $this->set_reflection_property_value('hSocket', new stdClass());
+        $this->set_reflection_property_value('hSocket', curl_init());
         $this->set_reflection_property_value('messageQueue', $message);
         $this->set_reflection_property_value('logger', $this->logger);
         $this->set_reflection_property_value('writeInterval', 0);
@@ -304,6 +289,5 @@ public function testSendSuccessfullySends(): void
         $this->unmock_function('curl_setopt_array');
         $this->unmock_function('curl_getinfo');
         $this->unmock_function('curl_close');
-        $this->unmock_function('curl_init');
     }
 }