Backport all new options from v1 (#36)

* Backport all new options from v1

Author: norkunas

src/Apps.php

@@ -104,14 +104,48 @@ protected function resolve(array $data)
     {
         $resolver = new OptionsResolver();
 
-        $resolver->setRequired('name');
-        $resolver->setAllowedTypes('name', 'string');
-        $resolver->setDefined(['apns_env', 'apns_p12', 'apns_p12_password', 'gcm_key']);
-        $resolver->setAllowedTypes('apns_env', 'string');
-        $resolver->setAllowedValues('apns_env', ['sandbox', 'production']);
-        $resolver->setAllowedTypes('apns_p12', 'string');
-        $resolver->setAllowedTypes('apns_p12_password', 'string');
-        $resolver->setAllowedTypes('gcm_key', 'string');
+        $resolver
+            ->setRequired('name')
+            ->setAllowedTypes('name', 'string')
+            ->setDefined('apns_env')
+            ->setAllowedTypes('apns_env', 'string')
+            ->setAllowedValues('apns_env', ['sandbox', 'production'])
+            ->setDefined('apns_p12')
+            ->setAllowedTypes('apns_p12', 'string')
+            ->setDefined('apns_p12_password')
+            ->setAllowedTypes('apns_p12_password', 'string')
+            ->setDefined('gcm_key')
+            ->setAllowedTypes('gcm_key', 'string')
+            ->setDefined('chrome_key')
+            ->setAllowedTypes('chrome_key', 'string')
+            ->setDefined('safari_apns_p12')
+            ->setAllowedTypes('safari_apns_p12', 'string')
+            ->setDefined('chrome_web_key')
+            ->setAllowedTypes('chrome_web_key', 'string')
+            ->setDefined('safari_apns_p12_password')
+            ->setAllowedTypes('safari_apns_p12_password', 'string')
+            ->setDefined('site_name')
+            ->setAllowedTypes('site_name', 'string')
+            ->setDefined('safari_site_origin')
+            ->setAllowedTypes('safari_site_origin', 'string')
+            ->setDefined('safari_icon_16_16')
+            ->setAllowedTypes('safari_icon_16_16', 'string')
+            ->setDefined('safari_icon_32_32')
+            ->setAllowedTypes('safari_icon_32_32', 'string')
+            ->setDefined('safari_icon_64_64')
+            ->setAllowedTypes('safari_icon_64_64', 'string')
+            ->setDefined('safari_icon_128_128')
+            ->setAllowedTypes('safari_icon_128_128', 'string')
+            ->setDefined('safari_icon_256_256')
+            ->setAllowedTypes('safari_icon_256_256', 'string')
+            ->setDefined('chrome_web_origin')
+            ->setAllowedTypes('chrome_web_origin', 'string')
+            ->setDefined('chrome_web_gcm_sender_id')
+            ->setAllowedTypes('chrome_web_gcm_sender_id', 'string')
+            ->setDefined('chrome_web_default_notification_icon')
+            ->setAllowedTypes('chrome_web_default_notification_icon', 'string')
+            ->setDefined('chrome_web_sub_domain')
+            ->setAllowedTypes('chrome_web_sub_domain', 'string');
 
         return $resolver->resolve($data);
     }

src/Devices.php

@@ -6,12 +6,18 @@
 
 class Devices
 {
-    const DEVICES_LIMIT = 50;
+    const DEVICES_LIMIT = 300;
 
     const IOS = 0;
     const ANDROID = 1;
     const AMAZON = 2;
     const WINDOWS_PHONE = 3;
+    const WINDOWS_PHONE_MPNS = 3;
+    const CHROME_APP = 4;
+    const CHROME_WEB = 5;
+    const WINDOWS_PHONE_WNS = 6;
+    const SAFARI = 7;
+    const FIREFOX = 8;
 
     /**
      * @var OneSignal
@@ -267,6 +273,9 @@ protected function resolve(array $data, callable $callback = null)
             ->setAllowedTypes('badge_count', 'int')
             ->setDefined('last_active')
             ->setAllowedTypes('last_active', 'int')
+            ->setDefined('test_type')
+            ->setAllowedTypes('test_type', 'int')
+            ->setAllowedValues('test_type', [1, 2])
             ->setDefault('app_id', $this->api->getConfig()->getApplicationId());
 
         return $resolver->resolve($data);

src/Notifications.php

@@ -254,6 +254,8 @@ protected function resolve(array $data)
             ->setAllowedTypes('chrome_big_picture', 'string')
             ->setDefined('chrome_web_icon')
             ->setAllowedTypes('chrome_web_icon', 'string')
+            ->setDefined('firefox_icon')
+            ->setAllowedTypes('firefox_icon', 'string')
             ->setDefined('url')
             ->setAllowedTypes('url', 'string')
             ->setAllowedValues('url', function ($value) {

src/OneSignal.php

@@ -154,7 +154,5 @@ public function __get($name)
         $error = 'Undefined property via __get(): %s in %s on line %u';
 
         trigger_error(sprintf($error, $name, $trace[0]['file'], $trace[0]['line']), E_USER_NOTICE);
-
-        return;
     }
 }