Merge branch 'master' into payload

Author: Minishlink

src/WebPush.php

@@ -63,7 +63,8 @@ public function __construct(array $apiKeys = array(), $TTL = null, $timeout = nu
      * @param string|null $userPublicKey
      * @param bool        $flush If you want to flush directly (usually when you send only one notification)
      *
-     * @return bool|array Return an array of information if $flush is set to true and the request has failed. Else return true.
+     * @return bool|array Return an array of information if $flush is set to true and the request has failed.
+     *                    Else return true.
      * @throws \ErrorException
      */
     public function sendNotification($endpoint, $payload = null, $userPublicKey = null, $flush = false)
@@ -84,12 +85,17 @@ public function sendNotification($endpoint, $payload = null, $userPublicKey = nu
      * Flush notifications. Triggers the requests.
      *
      * @return array|bool If there are no errors, return true.
-     * Else return an array of information for each notification sent (success, statusCode, headers).
+     *                    If there were no notifications in the queue, return false.
+     *                    Else return an array of information for each notification sent (success, statusCode, headers).
      *
      * @throws \ErrorException
      */
     public function flush()
     {
+        if (empty($this->notificationsByServerType)) {
+            return false;
+        }
+
         // if GCM is present, we should check for the API key
         if (array_key_exists('GCM', $this->notificationsByServerType)) {
             if (empty($this->apiKeys['GCM'])) {
@@ -142,6 +148,9 @@ public function flush()
             }
         }
 
+        // reset queue
+        $this->notificationsByServerType = null;
+
         return $completeSuccess ? true : $return;
     }
 

tests/WebPushTest.php

@@ -38,7 +38,7 @@ public function testSendNotification()
     {
         $res = $this->webPush->sendNotification($this->endpoints['standard'], null, null, true);
 
-        $this->assertTrue($res);
+        $this->assertEquals($res, true);
     }
 
     public function testSendNotificationWithPayload()
@@ -61,7 +61,19 @@ public function testSendNotifications()
 
         $res = $this->webPush->flush();
 
-        $this->assertTrue($res);
+        $this->assertEquals(true, $res);
+    }
+
+    public function testFlush()
+    {
+        $this->webPush->sendNotification($this->endpoints['standard']);
+        $this->assertEquals(true, $this->webPush->flush());
+
+        // queue has been reset
+        $this->assertEquals(false, $this->webPush->flush());
+
+        $this->webPush->sendNotification($this->endpoints['standard']);
+        $this->assertEquals(true, $this->webPush->flush());
     }
 
     public function testSendGCMNotificationWithoutGCMApiKey()