Check for values that could be null

Edujugon · Oct 16, 2022 · d3dfe8c · d3dfe8c
1 parent a6c01c8
commit d3dfe8c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Apn.php b/src/Apn.php
@@ -252,8 +252,10 @@ public function decorateHeaders(array $headers): array
     public function prepareHandle($deviceToken, array $message)
     {
         $uri = false === $this->config['dry_run'] ? $this->getProductionUrl($deviceToken) : $this->getSandboxUrl($deviceToken);
-        $headers = $message['headers'];
-        unset($message['headers']);
+        $headers = $message['headers'] ?? [];
+        if (isset($message['headers'])) {
+            unset($message['headers']);
+        }
         $body = json_encode($message);
 
         $config = $this->config;
@@ -269,10 +271,13 @@ public function prepareHandle($deviceToken, array $message)
             CURLOPT_HEADER => true,
 
             CURLOPT_SSLCERT        => $config['certificate'],
-            CURLOPT_SSLCERTPASSWD  => $config['passPhrase'],
             CURLOPT_SSL_VERIFYPEER => true
         ];
 
+        if (isset($config['passPhrase'])) {
+            $options[CURLOPT_SSLCERTPASSWD] = $config['passPhrase'];
+        }
+
         $ch = curl_init();
 
         curl_setopt_array($ch, $options);