fix merge

Author: Minishlink

src/Notification.php

@@ -26,7 +26,7 @@ public function __construct($endpoint, $payload, $userPublicKey)
     {
         $this->endpoint = $endpoint;
         $this->payload = $payload;
-        $this->userPublicKey = $payload;
+        $this->userPublicKey = $userPublicKey;
     }
 
     /**
@@ -36,4 +36,20 @@ public function getEndpoint()
     {
         return $this->endpoint;
     }
+
+    /**
+     * @return null|string
+     */
+    public function getPayload()
+    {
+        return $this->payload;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getUserPublicKey()
+    {
+        return $this->userPublicKey;
+    }
 }

src/WebPush.php

@@ -187,23 +187,16 @@ private function encrypt($userPublicKey, $payload)
         );
     }
 
-    /**
-     * @param array      $endpoints
-     * @param array|null $payloads
-     * @param array|null $userPublicKeys
-     *
-     * @return array
-     *
-     * @throws \ErrorException
-     */
     private function sendToStandardEndpoints(array $notifications)
     {
         $responses = array();
-        foreach ($endpoints as $i => $endpoint) {
-            $payload = $payloads[$i];
+        /** @var Notification $notification */
+        foreach ($notifications as $notification) {
+            $payload = $notification->getPayload();
+            $userPublicKey = $notification->getUserPublicKey();
 
-            if (isset($payload)) {
-                $encrypted = $this->encrypt($userPublicKeys[$i], $payload);
+            if (isset($payload) && isset($userPublicKey)) {
+                $encrypted = $this->encrypt($userPublicKey, $payload);
 
                 $headers = array(
                     'Content-Length' => strlen($encrypted['cipherText']),
@@ -226,9 +219,6 @@ private function sendToStandardEndpoints(array $notifications)
                 $headers['TTL'] = $this->TTL;
             }
 
-        $responses = array();
-        /** @var Notification $notification */
-        foreach ($notifications as $notification) {
             $responses[] = $this->sendRequest($notification->getEndpoint(), $headers, $content);
         }