Added isHuawei option to NotificationResolver. (#166)

* Added isHuawei option to NotificationResolver.

* Code-style fixes.

Co-authored-by: Zhilov Andrey <azhilov@code-pilots.ru>

Author: azhilov

src/AbstractApi.php

@@ -8,6 +8,7 @@
 use OneSignal\Exception\InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
+
 use const JSON_THROW_ON_ERROR;
 
 abstract class AbstractApi
@@ -32,6 +33,7 @@ protected function createRequest(string $method, string $uri): RequestInterface
 
     /**
      * @param mixed $value
+     *
      * @phpstan-param int<1, max> $maxDepth
      */
     protected function createStream($value, int $flags = null, int $maxDepth = 512): StreamInterface

src/Notifications.php

@@ -6,6 +6,7 @@
 
 use OneSignal\Resolver\ResolverFactory;
 use ReflectionMethod;
+
 use function count;
 
 class Notifications extends AbstractApi

src/OneSignal.php

@@ -12,7 +12,9 @@
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
+
 use const JSON_THROW_ON_ERROR;
+
 use function gettype;
 use function is_array;
 

src/Resolver/NotificationResolver.php

@@ -39,6 +39,8 @@ public function resolve(array $data): array
             ->setAllowedTypes('isIos', 'bool')
             ->setDefined('isAndroid')
             ->setAllowedTypes('isAndroid', 'bool')
+            ->setDefined('isHuawei')
+            ->setAllowedTypes('isHuawei', 'bool')
             ->setDefined('isWP')
             ->setAllowedTypes('isWP', 'bool')
             ->setDefined('isWP_WNS')

tests/ConfigTest.php

@@ -8,16 +8,16 @@ class ConfigTest extends OneSignalTestCase
 {
     public function testGetApplicationId(): void
     {
-        self::assertSame('fakeApplicationId', ($this->createConfig())->getApplicationId());
+        self::assertSame('fakeApplicationId', $this->createConfig()->getApplicationId());
     }
 
     public function testGetApplicationAuthKey(): void
     {
-        self::assertSame('fakeApplicationAuthKey', ($this->createConfig())->getApplicationAuthKey());
+        self::assertSame('fakeApplicationAuthKey', $this->createConfig()->getApplicationAuthKey());
     }
 
     public function testGetUserAuthKey(): void
     {
-        self::assertSame('fakeUserAuthKey', ($this->createConfig())->getUserAuthKey());
+        self::assertSame('fakeUserAuthKey', $this->createConfig()->getUserAuthKey());
     }
 }

tests/Fixtures/notifications_get_all.json

@@ -63,6 +63,7 @@
       "apns_alert": null,
       "isAdm": false,
       "isAndroid": true,
+      "isHuawei": false,
       "isChrome": false,
       "isChromeWeb": true,
       "isAlexa": false,

tests/NotificationsTest.php

@@ -139,6 +139,7 @@ public function testGetAll(): void
                     'apns_alert' => null,
                     'isAdm' => false,
                     'isAndroid' => true,
+                    'isHuawei' => false,
                     'isChrome' => false,
                     'isChromeWeb' => true,
                     'isAlexa' => false,

tests/Resolver/NotificationResolverTest.php

@@ -35,6 +35,7 @@ public function testResolveWithValidValues(): void
             'subtitle' => ['value'],
             'isIos' => false,
             'isAndroid' => false,
+            'isHuawei' => false,
             'isWP' => false,
             'isWP_WNS' => false,
             'isAdm' => false,
@@ -142,6 +143,7 @@ public function wrongValueTypesProvider(): iterable
         yield [['subtitle' => 666]];
         yield [['isIos' => 666]];
         yield [['isAndroid' => 666]];
+        yield [['isHuawei' => 666]];
         yield [['isWP' => 666]];
         yield [['isWP_WNS' => 666]];
         yield [['isAdm' => 666]];