From d3dfe8c2d358bca29727fadffb291134ed86bc0b Mon Sep 17 00:00:00 2001 From: Ammar Al-Khawaldeh Date: Sun, 16 Oct 2022 15:27:19 +0300 Subject: [PATCH] Check for values that could be null --- src/Apn.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Apn.php b/src/Apn.php index a58df87..c82542a 100644 --- 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);