Merge branch 'master' into payload

Conflicts:
	README.md
	src/WebPush.php

Author: Minishlink

README.md

@@ -1,6 +1,9 @@
-# WebPush [![Build Status](https://travis-ci.org/Minishlink/web-push.svg?branch=master)](https://travis-ci.org/Minishlink/web-push)
+# WebPush
 > Web Push library for PHP
 
+[![Build Status](https://travis-ci.org/Minishlink/web-push.svg?branch=master)](https://travis-ci.org/Minishlink/web-push)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d60e8eea-aea1-4739-8ce0-a3c3c12c6ccf/mini.png)](https://insight.sensiolabs.com/projects/d60e8eea-aea1-4739-8ce0-a3c3c12c6ccf)
+
 ## Installation
 `composer require minishlink/web-push`
 
@@ -73,6 +76,28 @@ $webPush = new WebPush($apiKeys);
 $webPush->sendNotification($endpoint, null, null, true);
 ```
 
+### Time To Live
+Time To Live (TTL, in seconds) is how long a push message is retained by the push service (eg. Mozilla) in case the user browser 
+is not yet accessible (eg. is not connected). You may want to use a very long time for important notifications. The default TTL is 4 weeks. 
+However, if you send multiple nonessential notifications, set a TTL of 0: the push notification will be delivered only 
+if the user is currently connected. For other cases, you should use a minimum of one day if your users have multiple time 
+zones, and if you don't several hours will suffice.
+
+```php
+<?php
+
+use Minishlink\WebPush\WebPush;
+
+$webPush = new WebPush(); // default TTL is 4 weeks
+// send some important notifications...
+
+$webPush->setTTL(3600);
+// send some not so important notifications
+
+$webPush->setTTL(0);
+// send some trivial notifications
+```
+
 ### Changing the browser client
 By default, WebPush will use `MultiCurl`, allowing to send multiple notifications in parallel.
 You can change the client to any client extending `\Buzz\Client\AbstractClient`.

src/Notification.php

@@ -16,12 +16,6 @@ class Notification
     /** @var string */
     private $endpoint;
 
-    /** @var string|null */
-    private $payload;
-
-    /** @var string|null Base64 encoded */
-    private $userPublicKey;
-
     public function __construct($endpoint, $payload, $userPublicKey)
     {
         $this->endpoint = $endpoint;

src/WebPush.php

@@ -36,21 +36,23 @@ class WebPush
         'GCM' => 'https://android.googleapis.com/gcm/send',
     );
 
+    /** @var int Time To Live of notifications */
+    private $TTL;
+
     /**
      * WebPush constructor.
      *
      * @param array               $apiKeys Some servers needs authentication. Provide your API keys here. (eg. array('GCM' => 'GCM_API_KEY'))
-     * @param int|null            $TTL     Time to live of notifications
+     * @param int|null            $TTL     Time To Live of notifications, default being 4 weeks.
      * @param int|null            $timeout Timeout of POST request
      * @param AbstractClient|null $client
      */
-    public function __construct(array $apiKeys = array(), $TTL = null, $timeout = null, AbstractClient $client = null)
+    public function __construct(array $apiKeys = array(), $TTL = 2419200, $timeout = 30, AbstractClient $client = null)
     {
         $this->apiKeys = $apiKeys;
         $this->TTL = $TTL;
 
         $client = isset($client) ? $client : new MultiCurl();
-        $timeout = isset($timeout) ? $timeout : 30;
         $client->setTimeout($timeout);
         $this->browser = new Browser($client);
     }
@@ -213,21 +215,19 @@ private function sendToStandardEndpoints(array $notifications)
                     'Encryption-Key' => 'keyid=p256dh;dh='.$encrypted['localPublicKey'],
                     'Encryption' => 'keyid=p256dh;salt='.$encrypted['salt'],
                     'Content-Encoding' => 'aesgcm128',
+                    'TTL' => $this->TTL,
                 );
 
                 $content = $encrypted['cipherText'];
             } else {
                 $headers = array(
                     'Content-Length' => 0,
+                    'TTL' => $this->TTL,
                 );
 
                 $content = '';
             }
 
-            if (isset($this->TTL)) {
-                $headers['TTL'] = $this->TTL;
-            }
-
             $responses[] = $this->sendRequest($notification->getEndpoint(), $headers, $content);
         }
 
@@ -239,8 +239,11 @@ private function sendToGCMEndpoints(array $notifications)
         $maxBatchSubscriptionIds = 1000;
         $url = $this->urlByServerType['GCM'];
 
-        $headers['Authorization'] = 'key='.$this->apiKeys['GCM'];
-        $headers['Content-Type'] = 'application/json';
+        $headers = array(
+            'Authorization' => 'key='.$this->apiKeys['GCM'],
+            'Content-Type' => 'application/json',
+            'TTL' => $this->TTL,
+        );
 
         $subscriptionIds = array();
         /** @var Notification $notification */
@@ -316,4 +319,20 @@ public function setBrowser($browser)
     {
         $this->browser = $browser;
     }
+
+    /**
+     * @return int
+     */
+    public function getTTL()
+    {
+        return $this->TTL;
+    }
+
+    /**
+     * @param int $TTL
+     */
+    public function setTTL($TTL)
+    {
+        $this->TTL = $TTL;
+    }
 }