rm sorting, add 'endpoint' key in the (bad) results array, add 400 to expired codes

fix #36

Author: Minishlink

README.md

@@ -133,6 +133,7 @@ The `expired` key can be useful to clean your database of expired endpoints.
 $res = array(
     array( // first notification
         'success' => false,
+        'endpoint' => $theEndpointToDeleteInYourDatabaseIfExpired
         'statusCode' => $responseStatusCode,
         'headers' => $responseHeaders,
         'content' => $responseContent, // you may have more infos here

src/WebPush.php

@@ -27,13 +27,8 @@ class WebPush
     /** @var array Key is push server type and value is the API key */
     protected $apiKeys;
 
-    /** @var array Array of array of Notifications by server type */
-    private $notificationsByServerType;
-
-    /** @var array Array of not standard endpoint sources */
-    private $urlByServerType = array(
-        'GCM' => self::GCM_URL,
-    );
+    /** @var array Array of array of Notifications */
+    private $notifications;
 
     /** @var array Default options : TTL, urgency, topic */
     private $defaultOptions;
@@ -87,9 +82,7 @@ public function sendNotification($endpoint, $payload = null, $userPublicKey = nu
             $payload = Encryption::padPayload($payload, $this->automaticPadding);
         }
 
-        // sort notification by server type
-        $type = $this->sortEndpoint($endpoint);
-        $this->notificationsByServerType[$type][] = new Notification($endpoint, $payload, $userPublicKey, $userAuthToken, $options);
+        $this->notifications[] = new Notification($endpoint, $payload, $userPublicKey, $userAuthToken, $options);
 
         if ($flush) {
             $res = $this->flush();
@@ -121,22 +114,12 @@ public function sendNotification($endpoint, $payload = null, $userPublicKey = nu
      */
     public function flush()
     {
-        if (empty($this->notificationsByServerType)) {
+        if (empty($this->notifications)) {
             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'])) {
-                throw new \ErrorException('No GCM API Key specified.');
-            }
-        }
-
         // for each endpoint server type
-        $responses = array();
-        foreach ($this->notificationsByServerType as $serverType => $notifications) {
-            $responses = array_merge($responses, $this->prepareAndSend($notifications, $serverType));
-        }
+        $responses = $this->prepareAndSend($this->notifications);
 
         // if multi curl, flush
         if ($this->browser->getClient() instanceof MultiCurl) {
@@ -148,20 +131,22 @@ public function flush()
         /** @var Response|null $response */
         $return = array();
         $completeSuccess = true;
-        foreach ($responses as $response) {
+        foreach ($responses as $i => $response) {
             if (!isset($response)) {
                 $return[] = array(
                     'success' => false,
+                    'endpoint' => $this->notifications[$i]->getEndpoint(),
                 );
 
                 $completeSuccess = false;
             } elseif (!$response->isSuccessful()) {
                 $return[] = array(
                     'success' => false,
+                    'endpoint' => $this->notifications[$i]->getEndpoint(),
                     'statusCode' => $response->getStatusCode(),
                     'headers' => $response->getHeaders(),
                     'content' => $response->getContent(),
-                    'expired' => in_array($response->getStatusCode(), array(404, 410)),
+                    'expired' => in_array($response->getStatusCode(), array(400, 404, 410)),
                 );
 
                 $completeSuccess = false;
@@ -173,12 +158,12 @@ public function flush()
         }
 
         // reset queue
-        $this->notificationsByServerType = null;
+        $this->notifications = null;
 
         return $completeSuccess ? true : $return;
     }
 
-    private function prepareAndSend(array $notifications, $serverType)
+    private function prepareAndSend(array $notifications)
     {
         $responses = array();
         /** @var Notification $notification */
@@ -219,8 +204,12 @@ private function prepareAndSend(array $notifications, $serverType)
                 $headers['Topic'] = $options['topic'];
             }
 
-            if ($serverType === 'GCM') {
-                $headers['Authorization'] = 'key='.$this->apiKeys['GCM'];
+            if (substr($endpoint, 0, strlen(self::GCM_URL)) === self::GCM_URL) {
+                if (array_key_exists('GCM', $this->apiKeys)) {
+                    $headers['Authorization'] = 'key='.$this->apiKeys['GCM'];
+                } else {
+                    throw new \ErrorException('No GCM API Key specified.');
+                }
             }
 
             $responses[] = $this->sendRequest($endpoint, $headers, $content);
@@ -247,22 +236,6 @@ private function sendRequest($url, array $headers, $content)
         return $response;
     }
 
-    /**
-     * @param string $endpoint
-     *
-     * @return string
-     */
-    private function sortEndpoint($endpoint)
-    {
-        foreach ($this->urlByServerType as $type => $url) {
-            if (substr($endpoint, 0, strlen($url)) === $url) {
-                return $type;
-            }
-        }
-
-        return 'standard';
-    }
-
     /**
      * @return Browser
      */

tests/WebPushTest.php

@@ -136,5 +136,8 @@ public function testSendGCMNotificationWithWrongGCMApiKey()
         $this->assertEquals(400, $res['statusCode']);
 
         $this->assertArrayHasKey('headers', $res);
+
+        $this->assertArrayHasKey('endpoint', $res);
+        $this->assertEquals(self::$endpoints['GCM'], $res['endpoint']);
     }
 }