Add direct_book_ok parameter for Android configuration

ker0x · ker0x · commit 028c5b4bd9e4 · 2020-10-29T19:36:10.000+01:00
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.5",
-    "phpstan/phpstan": "^0.11.16",
+    "phpstan/phpstan": "^0.12",
     "phpunit/phpunit": "^7.5"
   },
   "config": {
@@ -39,7 +39,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\Kerox\\Fcm\\": "tests/"
+      "Kerox\\Fcm\\Tests\\": "tests/"
     }
   },
   "scripts": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,6 +4,9 @@ parameters:
 
 	ignoreErrors:
 	    - '#Call to an undefined method GuzzleHttp\\ClientInterface::[a-zA-Z0-9_]+\(\)#'
+	    - '#Method Kerox\\Fcm\\Model\\Message\\[a-zA-z]+::setBody\(\) has no return typehint specified.#'
 
 	fileExtensions:
 		- php
+
+	checkMissingIterableValueType: false
diff --git a/src/Api/AbstractApi.php b/src/Api/AbstractApi.php
@@ -6,9 +6,6 @@
 
 use GuzzleHttp\ClientInterface;
 
-/**
- * Class AbstractApi.
- */
 abstract class AbstractApi
 {
     /**
diff --git a/src/Api/Send.php b/src/Api/Send.php
@@ -8,9 +8,6 @@
 use Kerox\Fcm\Request\SendRequest;
 use Kerox\Fcm\Response\SendResponse;
 
-/**
- * Class Send.
- */
 class Send extends AbstractApi
 {
     public function message(Message $message, bool $validateOnly = false): SendResponse
diff --git a/src/Fcm.php b/src/Fcm.php
@@ -8,9 +8,6 @@
 use GuzzleHttp\ClientInterface;
 use Kerox\Fcm\Api\Send;
 
-/**
- * Class Fcm.
- */
 class Fcm
 {
     public const API_URL = 'https://fcm.googleapis.com/';
diff --git a/src/Model/Message.php b/src/Model/Message.php
@@ -12,9 +12,6 @@
 use Kerox\Fcm\Model\Message\Options;
 use Kerox\Fcm\Model\Message\Webpush;
 
-/**
- * Class Message.
- */
 class Message implements \JsonSerializable
 {
     use UtilityTrait;
diff --git a/src/Model/Message/AbstractNotification.php b/src/Model/Message/AbstractNotification.php
@@ -4,12 +4,7 @@
 
 namespace Kerox\Fcm\Model\Message;
 
-use JsonSerializable;
-
-/**
- * Class AbstractNotification.
- */
-abstract class AbstractNotification implements NotificationInterface, JsonSerializable
+abstract class AbstractNotification implements NotificationInterface, \JsonSerializable
 {
     /**
      * @var string|null
diff --git a/src/Model/Message/Android.php b/src/Model/Message/Android.php
@@ -50,6 +50,11 @@ class Android implements \JsonSerializable
      */
     private $options;
 
+    /**
+     * @var bool|null
+     */
+    private $directBootOk;
+
     /**
      * @return \Kerox\Fcm\Model\Message\Android
      */
@@ -124,6 +129,16 @@ public function setOptions(AndroidOptions $options): self
         return $this;
     }
 
+    /**
+     * @return \Kerox\Fcm\Model\Message\Android
+     */
+    public function setDirectBootOk(bool $directBootOk): self
+    {
+        $this->directBootOk = $directBootOk;
+
+        return $this;
+    }
+
     public function toArray(): array
     {
         $array = [
@@ -134,6 +149,7 @@ public function toArray(): array
             'data' => $this->data,
             'notification' => $this->notification,
             'fcm_options' => $this->options,
+            'direct_boot_ok' => $this->directBootOk,
         ];
 
         return array_filter($array);
diff --git a/src/Model/Message/Condition.php b/src/Model/Message/Condition.php
@@ -7,9 +7,6 @@
 use Closure;
 use Kerox\Fcm\Helper\ValidatorTrait;
 
-/**
- * Class Condition.
- */
 class Condition
 {
     use ValidatorTrait;
diff --git a/src/Model/Message/Notification.php b/src/Model/Message/Notification.php
@@ -4,9 +4,6 @@
 
 namespace Kerox\Fcm\Model\Message;
 
-/**
- * Class Notification.
- */
 class Notification extends AbstractNotification
 {
     /**
diff --git a/src/Model/Message/Notification/AndroidNotification.php b/src/Model/Message/Notification/AndroidNotification.php
@@ -7,9 +7,6 @@
 use Kerox\Fcm\Model\Message\AbstractNotification;
 use Kerox\Fcm\Model\Message\Notification\AndroidNotification\LightSettings;
 
-/**
- * Class AndroidNotification.
- */
 class AndroidNotification extends AbstractNotification
 {
     public const PRIORITY_UNSPECIFIED = 'PRIORITY_UNSPECIFIED';
diff --git a/src/Model/Message/Notification/AndroidNotification/Color.php b/src/Model/Message/Notification/AndroidNotification/Color.php
@@ -4,9 +4,6 @@
 
 namespace Kerox\Fcm\Model\Message\Notification\AndroidNotification;
 
-/**
- * Class Color.
- */
 class Color implements \JsonSerializable
 {
     /**
diff --git a/src/Model/Message/Notification/AndroidNotification/LightSettings.php b/src/Model/Message/Notification/AndroidNotification/LightSettings.php
@@ -4,9 +4,6 @@
 
 namespace Kerox\Fcm\Model\Message\Notification\AndroidNotification;
 
-/**
- * Class LightSettings.
- */
 class LightSettings implements \JsonSerializable
 {
     /**
diff --git a/src/Model/Message/Notification/ApnsNotification.php b/src/Model/Message/Notification/ApnsNotification.php
@@ -9,9 +9,6 @@
 use Kerox\Fcm\Model\Message\Notification\ApnsNotification\Alert;
 use Kerox\Fcm\Model\Message\Notification\ApnsNotification\Sound;
 
-/**
- * Class ApnsNotification.
- */
 class ApnsNotification implements \JsonSerializable
 {
     use UtilityTrait;
diff --git a/src/Model/Message/Notification/ApnsNotification/Alert.php b/src/Model/Message/Notification/ApnsNotification/Alert.php
@@ -6,9 +6,6 @@
 
 use Kerox\Fcm\Model\Message\AbstractNotification;
 
-/**
- * Class Alert.
- */
 class Alert extends AbstractNotification
 {
     /**
diff --git a/src/Model/Message/NotificationInterface.php b/src/Model/Message/NotificationInterface.php
@@ -4,9 +4,6 @@
 
 namespace Kerox\Fcm\Model\Message;
 
-/**
- * Interface NotificationInterface.
- */
 interface NotificationInterface
 {
     public function setBody(string $body);
diff --git a/src/Model/Message/Options.php b/src/Model/Message/Options.php
@@ -4,9 +4,7 @@
 
 namespace Kerox\Fcm\Model\Message;
 
-use JsonSerializable;
-
-class Options implements JsonSerializable
+class Options implements \JsonSerializable
 {
     /**
      * @var string|null
diff --git a/src/Request/AbstractRequest.php b/src/Request/AbstractRequest.php
@@ -4,9 +4,6 @@
 
 namespace Kerox\Fcm\Request;
 
-/**
- * Class BaseRequest.
- */
 abstract class AbstractRequest
 {
     /**
@@ -28,7 +25,8 @@ public function __construct(string $oauthToken)
     protected function buildHeaders(): array
     {
         $headers = [
-            'Authorization' => 'Bearer ' . $this->oauthToken,
+            'Authorization' => sprintf('Bearer %s', $this->oauthToken),
+            'Accept' => 'application/json',
             'Content-Type' => 'application/json',
         ];
 
diff --git a/src/Request/SendRequest.php b/src/Request/SendRequest.php
@@ -6,9 +6,6 @@
 
 use Kerox\Fcm\Model\Message;
 
-/**
- * Class SendRequest.
- */
 class SendRequest extends AbstractRequest
 {
     /**
diff --git a/src/Response/AbstractResponse.php b/src/Response/AbstractResponse.php
@@ -6,9 +6,6 @@
 
 use Psr\Http\Message\ResponseInterface;
 
-/**
- * Class AbstractResponse.
- */
 abstract class AbstractResponse
 {
     /**
diff --git a/src/Response/SendResponse.php b/src/Response/SendResponse.php
@@ -4,9 +4,6 @@
 
 namespace Kerox\Fcm\Response;
 
-/**
- * Class SendResponse.
- */
 class SendResponse extends AbstractResponse
 {
     public const ERROR_KEY = 'error_code';
diff --git a/tests/Api/SendTest.php b/tests/Api/SendTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Kerox\Fcm\Api;
+namespace Kerox\Fcm\Tests\Api;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
@@ -33,8 +33,8 @@ public function testSendMessage(): void
 
         $response = $sendApi->message($message, true);
 
-        $this->assertSame('projects/myproject-b5ae1/messages/0:1500415314455276%31bd1c9631bd1c96', $response->getName());
-        $this->assertSame('0:1500415314455276%31bd1c9631bd1c96', $response->getMessageId());
+        self::assertSame('projects/myproject-b5ae1/messages/0:1500415314455276%31bd1c9631bd1c96', $response->getName());
+        self::assertSame('0:1500415314455276%31bd1c9631bd1c96', $response->getMessageId());
     }
 
     public function testSendMessageWithResponseError(): void
@@ -56,10 +56,10 @@ public function testSendMessageWithResponseError(): void
 
         $response = $sendApi->message($message, true);
 
-        $this->assertNull($response->getName());
-        $this->assertNull($response->getMessageId());
-        $this->assertTrue($response->hasError());
-        $this->assertSame('UNSPECIFIED_ERROR', $response->getErrorCode());
-        $this->assertSame('No more information is available about this error.', $response->getErrorMessage());
+        self::assertNull($response->getName());
+        self::assertNull($response->getMessageId());
+        self::assertTrue($response->hasError());
+        self::assertSame('UNSPECIFIED_ERROR', $response->getErrorCode());
+        self::assertSame('No more information is available about this error.', $response->getErrorMessage());
     }
 }
diff --git a/tests/FcmTest.php b/tests/FcmTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Kerox\Fcm;
+namespace Kerox\Fcm\Tests;
 
 use Kerox\Fcm\Api\Send;
 use Kerox\Fcm\Fcm;
@@ -22,7 +22,7 @@ public function setUp(): void
 
     public function testGetInstanceOfApi(): void
     {
-        $this->assertInstanceOf(Send::class, $this->fcm->send());
+        self::assertInstanceOf(Send::class, $this->fcm->send());
     }
 
     public function tearDown(): void
diff --git a/tests/Mocks/Model/message.json b/tests/Mocks/Model/message.json
@@ -64,7 +64,8 @@
     },
     "fcm_options": {
       "analytics_label": "android"
-    }
+    },
+    "direct_boot_ok": true
   },
   "webpush": {
     "headers": {
diff --git a/tests/Model/Message/ConditionTest.php b/tests/Model/Message/ConditionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Kerox\Fcm\Model\Message;
+namespace Kerox\Fcm\Tests\Model\Message;
 
 use Kerox\Fcm\Model\Message\Condition;
 use PHPUnit\Framework\TestCase;
@@ -13,21 +13,21 @@ public function testConditionAndWithOnlyTopics(): void
     {
         $condition = (new Condition())->and('TopicA', 'TopicB', 'TopicC');
 
-        $this->assertSame("'TopicA' in topics && 'TopicB' in topics && 'TopicC' in topics", $condition);
+        self::assertSame("'TopicA' in topics && 'TopicB' in topics && 'TopicC' in topics", $condition);
     }
 
     public function testConditionOrWithOnlyTopics(): void
     {
         $condition = (new Condition())->or('TopicA', 'TopicB', 'TopicC');
 
-        $this->assertSame("'TopicA' in topics || 'TopicB' in topics || 'TopicC' in topics", $condition);
+        self::assertSame("'TopicA' in topics || 'TopicB' in topics || 'TopicC' in topics", $condition);
     }
 
     public function testConditionNotWithTopic(): void
     {
         $condition = (new Condition())->not('TopicA');
 
-        $this->assertSame("!('TopicA' in topics)", $condition);
+        self::assertSame("!('TopicA' in topics)", $condition);
     }
 
     public function testConditionAndWithClosure(): void
@@ -36,7 +36,7 @@ public function testConditionAndWithClosure(): void
             return (new Condition())->or('TopicB', 'TopicC');
         });
 
-        $this->assertSame("'TopicA' in topics && ('TopicB' in topics || 'TopicC' in topics)", $condition);
+        self::assertSame("'TopicA' in topics && ('TopicB' in topics || 'TopicC' in topics)", $condition);
     }
 
     public function testConditionOrWithClosure(): void
@@ -45,7 +45,7 @@ public function testConditionOrWithClosure(): void
             return (new Condition())->and('TopicB', 'TopicC');
         });
 
-        $this->assertSame("'TopicA' in topics || ('TopicB' in topics && 'TopicC' in topics)", $condition);
+        self::assertSame("'TopicA' in topics || ('TopicB' in topics && 'TopicC' in topics)", $condition);
     }
 
     public function testConditionNotWithClosure(): void
@@ -54,7 +54,7 @@ public function testConditionNotWithClosure(): void
             return (new Condition())->and('TopicA', 'TopicB');
         });
 
-        $this->assertSame("!('TopicA' in topics && 'TopicB' in topics)", $condition);
+        self::assertSame("!('TopicA' in topics && 'TopicB' in topics)", $condition);
     }
 
     public function testConditionWithMultipleClosure(): void
@@ -67,7 +67,7 @@ public function testConditionWithMultipleClosure(): void
             });
         });
 
-        $this->assertSame("'TopicA' in topics && ('TopicB' in topics || ('TopicC' in topics && 'TopicD' in topics && (!('TopicE' in topics))))", $condition);
+        self::assertSame("'TopicA' in topics && ('TopicB' in topics || ('TopicC' in topics && 'TopicD' in topics && (!('TopicE' in topics))))", $condition);
     }
 
     public function testConditionAndWithInvalidTopics(): void
diff --git a/tests/Model/Message/Notification/AndroidNotificationTest.php b/tests/Model/Message/Notification/AndroidNotificationTest.php
diff --git a/tests/Model/Message/Notification/ApnsNotificationTest.php b/tests/Model/Message/Notification/ApnsNotificationTest.php
diff --git a/tests/Model/Message/WebpushTest.php b/tests/Model/Message/WebpushTest.php
diff --git a/tests/Model/MessageTest.php b/tests/Model/MessageTest.php

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,6 @@`
`6`	`6`
`7`	`7`	`use GuzzleHttp\ClientInterface;`
`8`	`8`
`9`		`-/**`
`10`		`- * Class AbstractApi.`
`11`		`- */`
`12`	`9`	`abstract class AbstractApi`
`13`	`10`	`{`
`14`	`11`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@`
`8`	`8`	`use Kerox\Fcm\Request\SendRequest;`
`9`	`9`	`use Kerox\Fcm\Response\SendResponse;`
`10`	`10`
`11`		`-/**`
`12`		`- * Class Send.`
`13`		`- */`
`14`	`11`	`class Send extends AbstractApi`
`15`	`12`	`{`
`16`	`13`	`public function message(Message $message, bool $validateOnly = false): SendResponse`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@`
`8`	`8`	`use GuzzleHttp\ClientInterface;`
`9`	`9`	`use Kerox\Fcm\Api\Send;`
`10`	`10`
`11`		`-/**`
`12`		`- * Class Fcm.`
`13`		`- */`
`14`	`11`	`class Fcm`
`15`	`12`	`{`
`16`	`13`	`public const API_URL = 'https://fcm.googleapis.com/';`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,6 @@`
`12`	`12`	`use Kerox\Fcm\Model\Message\Options;`
`13`	`13`	`use Kerox\Fcm\Model\Message\Webpush;`
`14`	`14`
`15`		`-/**`
`16`		`- * Class Message.`
`17`		`- */`
`18`	`15`	`class Message implements \JsonSerializable`
`19`	`16`	`{`
`20`	`17`	`use UtilityTrait;`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`	`use Closure;`
`8`	`8`	`use Kerox\Fcm\Helper\ValidatorTrait;`
`9`	`9`
`10`		`-/**`
`11`		`- * Class Condition.`
`12`		`- */`
`13`	`10`	`class Condition`
`14`	`11`	`{`
`15`	`12`	`use ValidatorTrait;`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace Kerox\Fcm\Model\Message;`
`6`	`6`
`7`		`-/**`
`8`		`- * Class Notification.`
`9`		`- */`
`10`	`7`	`class Notification extends AbstractNotification`
`11`	`8`	`{`
`12`	`9`	`/**`