Fix static errors

Author: Minishlink

src/MessageSentReport.php

@@ -20,12 +20,12 @@ class MessageSentReport {
 	protected $success;
 
 	/**
-	 * @var RequestInterface
+	 * @var RequestInterface | null
 	 */
 	protected $request;
 
 	/**
-	 * @var ResponseInterface
+	 * @var ResponseInterface | null
 	 */
 	protected $response;
 
@@ -65,9 +65,9 @@ public function setSuccess(bool $success): MessageSentReport {
 	}
 
 	/**
-	 * @return RequestInterface
+	 * @return RequestInterface | null
 	 */
-	public function getRequest(): RequestInterface {
+	public function getRequest(): ?RequestInterface {
 		return $this->request;
 	}
 
@@ -82,9 +82,9 @@ public function setRequest(RequestInterface $request): MessageSentReport {
 	}
 
 	/**
-	 * @return ResponseInterface
+	 * @return ResponseInterface | null
 	 */
-	public function getResponse(): ResponseInterface {
+	public function getResponse(): ?ResponseInterface {
 		return $this->response;
 	}
 
@@ -99,9 +99,13 @@ public function setResponse(ResponseInterface $response): MessageSentReport {
 	}
 
 	/**
-	 * @return string
+	 * @return string | null
 	 */
-	public function getEndpoint(): string {
+	public function getEndpoint(): ?string {
+        if (!$this->request) {
+            return null;
+        }
+
 		return $this->request->getUri()->__toString();
 	}
 

src/WebPush.php

@@ -100,7 +100,7 @@ public function __construct(array $auth = [], array $defaultOptions = [], ?int $
      * @param array $options Array with several options tied to this notification. If not set, will use the default options that you can set in the WebPush object
      * @param array $auth Use this auth details instead of what you provided when creating WebPush
      *
-     * @return array|bool Return an array of information if $flush is set to true and the queued requests has failed.
+     * @return iterable|bool Return an array of information if $flush is set to true and the queued requests has failed.
      *                    Else return true
      *
      * @throws \ErrorException
@@ -112,7 +112,12 @@ public function sendNotification(Subscription $subscription, ?string $payload =
                 throw new \ErrorException('Size of payload must not be greater than '.Encryption::MAX_PAYLOAD_LENGTH.' octets.');
             }
 
-            $payload = Encryption::padPayload($payload, $this->automaticPadding, $subscription->getContentEncoding());
+            $contentEncoding = $subscription->getContentEncoding();
+            if (!$contentEncoding) {
+                throw new \ErrorException('Subscription should have a content encoding');
+            }
+
+            $payload = Encryption::padPayload($payload, $this->automaticPadding, $contentEncoding);
         }
 
         if (array_key_exists('VAPID', $auth)) {
@@ -192,6 +197,10 @@ private function prepare(array $notifications): array
             $auth = $notification->getAuth($this->auth);
 
             if (!empty($payload) && !empty($userPublicKey) && !empty($userAuthToken)) {
+                if (!$contentEncoding) {
+                    throw new \ErrorException('Subscription should have a content encoding');
+                }
+
                 $encrypted = Encryption::encrypt($payload, $userPublicKey, $userAuthToken, $contentEncoding);
                 $cipherText = $encrypted['cipherText'];
                 $salt = $encrypted['salt'];
@@ -247,6 +256,10 @@ private function prepare(array $notifications): array
                     throw new \ErrorException('Audience "'.$audience.'"" could not be generated.');
                 }
 
+                if (!$contentEncoding) {
+                    throw new \ErrorException('Subscription should have a content encoding');
+                }
+
                 $vapidHeaders = VAPID::getVapidHeaders($audience, $vapid['subject'], $vapid['publicKey'], $vapid['privateKey'], $contentEncoding);
 
                 $headers['Authorization'] = $vapidHeaders['Authorization'];