Merge branch 'release/1.0.2'

Author: sunaoka

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Release Notes
 
-## [Unreleased](https://github.com/sunaoka/push-notifications-php/compare/1.0.1...develop)
+## [Unreleased](https://github.com/sunaoka/push-notifications-php/compare/1.0.2...develop)
+
+## [v1.0.2 (2021-10-13)](https://github.com/sunaoka/push-notifications-php/compare/1.0.1...1.0.2)
+
+### Added
+
+- Added DriverOption::httpOptions (Guzzle Request Options)
+
+### Fixed
+
+- Fixed a bug that APNs by using token failed
 
 ## [v1.0.1 (2021-10-13)](https://github.com/sunaoka/push-notifications-php/compare/1.0.0...1.0.1)
 

src/Drivers/APNs/Certificate.php

@@ -53,13 +53,13 @@ public function __construct($options)
      */
     public function send()
     {
-        $this->httpClient = $this->getHttpClient([
+        $this->httpClient = $this->getHttpClient(array_merge($this->options->httpOptions, [
             'version' => 2.0,
             'cert'    => [
                 $this->options->certificate,
                 $this->options->password,
             ],
-        ]);
+        ]));
 
         foreach ($this->devices as $device) {
             $this->_send($device);

src/Drivers/APNs/Token.php

@@ -17,12 +17,12 @@ class Token extends Driver
     /**
      * @var string
      */
-    protected $endpointSandbox = 'https://api.sandbox.push.apple.com/3/device/';
+    protected $endpointSandbox = 'https://api.sandbox.push.apple.com/3/device/%s';
 
     /**
      * @var string
      */
-    protected $endpointProduction = 'https://api.push.apple.com/3/device/';
+    protected $endpointProduction = 'https://api.push.apple.com/3/device/%s';
 
     /**
      * @var Feedback
@@ -54,9 +54,9 @@ public function __construct($options)
      */
     public function send()
     {
-        $this->httpClient = $this->getHttpClient([
+        $this->httpClient = $this->getHttpClient(array_merge($this->options->httpOptions, [
             'version' => 2.0,
-        ]);
+        ]));
 
         foreach ($this->devices as $device) {
             $this->_send($device);

src/Drivers/DriverOption.php

@@ -12,6 +12,15 @@ abstract class DriverOption implements DriverOptionInterface
      */
     public $payload = [];
 
+    /**
+     * Guzzle Request Options
+     *
+     * <https://docs.guzzlephp.org/en/stable/request-options.html>
+     *
+     * @var array
+     */
+    public $httpOptions = [];
+
     /**
      * @var string[][]
      */

src/Drivers/FCM/Json.php

@@ -53,7 +53,7 @@ public function __construct($options)
      */
     public function send()
     {
-        $this->httpClient = $this->getHttpClient();
+        $this->httpClient = $this->getHttpClient($this->options->httpOptions);
 
         try {
             $options = [

src/Drivers/FCM/PlainText.php

@@ -57,7 +57,7 @@ public function __construct($options)
      */
     public function send()
     {
-        $this->httpClient = $this->getHttpClient();
+        $this->httpClient = $this->getHttpClient($this->options->httpOptions);
 
         foreach ($this->devices as $device) {
             $this->_send($device);

src/Drivers/FCM/V1.php

@@ -59,7 +59,7 @@ public function send()
             'scopes'      => 'https://www.googleapis.com/auth/firebase.messaging',
         ]);
 
-        $this->httpClient = $client->authorize($this->getHttpClient());
+        $this->httpClient = $client->authorize($this->getHttpClient($this->options->httpOptions));
 
         foreach ($this->devices as $device) {
             $this->_send($device);