User auth token must be provided if sending payload

+ fix JSON test

Author: Minishlink

src/WebPush.php

@@ -195,9 +195,10 @@ private function prepareAndSend(array $notifications, $serverType)
             $endpoint = $notification->getEndpoint();
             $payload = $notification->getPayload();
             $userPublicKey = $notification->getUserPublicKey();
+            $userAuthToken = $notification->getUserAuthToken();
 
-            if (isset($payload) && isset($userPublicKey) && ($this->payloadEncryptionSupport || $this->nativePayloadEncryptionSupport)) {
-                $encrypted = Encryption::encrypt($payload, $userPublicKey, $notification->getUserAuthToken(), $this->nativePayloadEncryptionSupport);
+            if (isset($payload) && isset($userPublicKey) && isset($userAuthToken) && ($this->payloadEncryptionSupport || $this->nativePayloadEncryptionSupport)) {
+                $encrypted = Encryption::encrypt($payload, $userPublicKey, $userAuthToken, $this->nativePayloadEncryptionSupport);
 
                 $headers = array(
                     'Content-Length' => strlen($encrypted['cipherText']),

tests/WebPushTest.php

@@ -49,11 +49,9 @@ public function notificationProvider()
         self::setUpBeforeClass(); // dirty hack of PHPUnit limitation
         return array(
             array(self::$endpoints['standard'], null, null, null),
-            array(self::$endpoints['standard'], '{message: "Plop", tag: "general"}', self::$keys['standard'], self::$tokens['standard']),
-            array(self::$endpoints['standard'], '{message: "Plop", tag: "general"}', self::$keys['standard'], null),
+            array(self::$endpoints['standard'], '{"message":"Plop","tag":"general"}', self::$keys['standard'], self::$tokens['standard']),
             array(self::$endpoints['GCM'], null, null, null),
-            array(self::$endpoints['GCM'], '{message: "Plop", tag: "general"}', self::$keys['GCM'], self::$tokens['GCM']),
-            array(self::$endpoints['GCM'], '{message: "Plop", tag: "general"}', self::$keys['GCM'], null),
+            array(self::$endpoints['GCM'], '{"message":"Plop","tag":"general"}', self::$keys['GCM'], self::$tokens['GCM']),
         );
     }
 
@@ -74,7 +72,7 @@ public function testSendNotification($endpoint, $payload, $userPublicKey, $userA
 
     public function testSendNotificationWithOldAPI()
     {
-        $this->setExpectedException('ErrorException', 'The API has changed: sendNotification now takes the optional user auth token as parameter.');
+        $this->setExpectedException('ErrorException', 'The API has changed: sendNotification now takes the user auth token as parameter.');
         $this->webPush->sendNotification(
             self::$endpoints['standard'],
             'test',