update

.travis.yml

@@ -1,9 +1,16 @@
 language: php
+
+before_install:
+  # If PHP >= 5.6, download & install PHPunit 5.7 to avoid builds failures
+  - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6', '>=' ) );"; then wget -O phpunit https://phar.phpunit.de/phpunit-5.7.phar && chmod +x phpunit && mkdir ~/bin && mv -v phpunit ~/bin; fi
+
 php:
   - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
 env:
   - SYMFONY_VERSION=origin/master
 

DependencyInjection/Compiler/AddHandlerPass.php

@@ -38,7 +38,7 @@ public function process(ContainerBuilder $container)
                 }
 
                 $refClass = new \ReflectionClass($class);
-            } catch (\ReflectionClass $ref) {
+            } catch (\ReflectionException $ref) {
                 // Class not found or other reflection error
                 throw new \RuntimeException(sprintf(
                     'Can\'t compile notification handler by service id "%s".',

DependencyInjection/Configuration.php

@@ -65,6 +65,7 @@ protected function addAndroid()
                             children()->
                                 scalarNode("api_key")->isRequired()->cannotBeEmpty()->end()->
                                 booleanNode("use_multi_curl")->defaultValue(true)->end()->
+                                booleanNode("dry_run")->defaultFalse()->end()->
                             end()->
                         end()->
                     end()->

DependencyInjection/RMSPushNotificationsExtension.php

@@ -100,6 +100,7 @@ protected function setAndroidConfig(array $config)
         if (isset($config["android"]["gcm"])) {
             $this->container->setParameter("rms_push_notifications.android.gcm.api_key", $config["android"]["gcm"]["api_key"]);
             $this->container->setParameter("rms_push_notifications.android.gcm.use_multi_curl", $config["android"]["gcm"]["use_multi_curl"]);
+            $this->container->setParameter('rms_push_notifications.android.gcm.dry_run', $config["android"]["gcm"]["dry_run"]);
         }
     }
 

Message/AppleMessage.php

@@ -210,6 +210,28 @@ public function setAPSContentAvailable($contentAvailable)
         $this->apsBody["aps"]["content-available"] = $contentAvailable;
     }
 
+    /**
+     * iOS-specific
+     * Sets the APS category
+     *
+     * @param string $category The notification category
+     */
+    public function setCategory($category)
+    {
+        $this->apsBody["aps"]["category"] = $category;
+    }
+
+    /**
+     * iOS-specific
+     * Sets the APS mutable-content attribute
+     *
+     * @param bool $mutableContent 
+     */
+    public function setMutableContent($mutableContent)
+    {
+        $this->apsBody["aps"]["mutable-content"] = $mutableContent ? 1 : 0;
+    }
+
     /**
      * Set expiry of message
      *

README.md

@@ -43,6 +43,7 @@ only be available if you provide configuration respectively for them.
           gcm:
               api_key: <string_android_gcm_api_key> # This is titled "Server Key" when creating it
               use_multi_curl: <boolean_android_gcm_use_multi_curl> # default is true
+              dry_run: <bool_use_gcm_dry_run>
       ios:
           timeout: 60 # Seconds to wait for connection timeout, default is 60
           sandbox: <bool_use_apns_sandbox>
@@ -111,6 +112,10 @@ Here, `$uuids` contains an array of [Feedback](https://github.com/richsage/RMSPu
 
 Apple recommend you poll this service daily.
 
+## Windows Phone - Toast support
+
+The bundle has beta support for Windows Phone, and supports the Toast notification. Use the `WindowsphoneMessage` message class to send accordingly.
+
 # Thanks
 
 Firstly, thanks to all contributors to this bundle!

Resources/config/android.xml

@@ -24,6 +24,9 @@
             <argument>%rms_push_notifications.android.gcm.api_key%</argument>
             <argument>%rms_push_notifications.android.gcm.use_multi_curl%</argument>
             <argument>%rms_push_notifications.android.timeout%</argument>
+            <argument type="service" id="logger" />
+            <argument>null</argument>
+            <argument>%rms_push_notifications.android.gcm.dry_run%</argument>
             <tag name="rms_push_notifications.handler" osType="rms_push_notifications.os.android.gcm" />
         </service>
 

Resources/config/blackberry.xml

@@ -15,6 +15,7 @@
             <argument>%rms_push_notifications.blackberry.app_id%</argument>
             <argument>%rms_push_notifications.blackberry.password%</argument>
             <argument>%rms_push_notifications.blackberry.timeout%</argument>
+            <argument type="service" id="logger" />
             <tag name="rms_push_notifications.handler" osType="rms_push_notifications.os.blackberry" />
         </service>
 

Resources/config/ios.xml

@@ -18,6 +18,7 @@
             <argument>%rms_push_notifications.ios.timeout%</argument>
             <argument>%kernel.cache_dir%</argument>
             <argument type="service" id="rms_push_notifications.event_listener" />
+            <argument type="service" id="logger" />
             <tag name="rms_push_notifications.handler" osType="rms_push_notifications.os.ios" />
         </service>
 

Resources/config/mac.xml

@@ -16,6 +16,9 @@
             <argument>%rms_push_notifications.mac.passphrase%</argument>
             <argument>%rms_push_notifications.mac.json_unescaped_unicode%</argument>
             <argument>%rms_push_notifications.mac.timeout%</argument>
+            <argument>%kernel.cache_dir%</argument>
+            <argument type="service" id="rms_push_notifications.event_listener" />
+            <argument type="service" id="logger" />
             <tag name="rms_push_notifications.handler" osType="rms_push_notifications.os.mac" />
         </service>
     </services>

Resources/config/windowsphone.xml

@@ -12,6 +12,7 @@
         <!-- Windows Phone -->
         <service id="rms_push_notifications.windowsphone" class="%rms_push_notifications.windowsphone.class%" public="false">
             <argument>%rms_push_notifications.windowsphone.timeout%</argument>
+            <argument type="service" id="logger" />
             <tag name="rms_push_notifications.handler" osType="rms_push_notifications.os.windowsphone" />
         </service>
 

Service/EventListener.php

@@ -8,7 +8,7 @@ class EventListener {
     /**
      * @var EventListenerInterface[]
      */
-    protected $listeners = [];
+    protected $listeners = array();
 
     /**
      * @param EventListenerInterface $listener
@@ -25,4 +25,4 @@ public function onKernelTerminate () {
             $listener->onKernelTerminate();
         }
     }
-}
+}

Service/OS/AndroidGCMNotification.php

@@ -2,6 +2,7 @@
 
 namespace RMS\PushNotificationsBundle\Service\OS;
 
+use Psr\Log\LoggerInterface;
 use RMS\PushNotificationsBundle\Exception\InvalidMessageTypeException,
     RMS\PushNotificationsBundle\Message\AndroidMessage,
     RMS\PushNotificationsBundle\Message\MessageInterface;
@@ -12,6 +13,14 @@
 
 class AndroidGCMNotification implements OSNotificationServiceInterface
 {
+
+    /**
+     * Whether or not to use the dry run GCM
+     *
+     * @var bool
+     */
+    protected $useDryRun = false;
+
     /**
      * GCM endpoint
      *
@@ -47,16 +56,26 @@ class AndroidGCMNotification implements OSNotificationServiceInterface
      */
     protected $responses;
 
+    /**
+     * Monolog logger
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
     /**
      * Constructor
      *
-     * @param $apiKey
+     * @param string       $apiKey
      * @param bool         $useMultiCurl
      * @param int          $timeout
-     * @param AbstractCurl $client       (optional)
+     * @param LoggerInterface $logger
+     * @param AbstractCurl $client (optional)
+     * @param bool         $dryRun
      */
-    public function __construct($apiKey, $useMultiCurl, $timeout, AbstractCurl $client = null)
+    public function __construct($apiKey, $useMultiCurl, $timeout, $logger, AbstractCurl $client = null, $dryRun = false)
     {
+        $this->useDryRun = $dryRun;
         $this->apiKey = $apiKey;
         if (!$client) {
             $client = ($useMultiCurl ? new MultiCurl() : new Curl());
@@ -65,6 +84,7 @@ public function __construct($apiKey, $useMultiCurl, $timeout, AbstractCurl $clie
 
         $this->browser = new Browser($client);
         $this->browser->getClient()->setVerifyPeer(false);
+        $this->logger = $logger;
     }
 
     /**
@@ -92,14 +112,25 @@ public function send(MessageInterface $message)
             array("data" => $message->getData())
         );
 
-        // Chunk number of registration IDs according to the maximum allowed by GCM
-        $chunks = array_chunk($message->getGCMIdentifiers(), $this->registrationIdMaxCount);
+        if ($this->useDryRun) {
+            $data['dry_run'] = true;
+        }
 
         // Perform the calls (in parallel)
         $this->responses = array();
-        foreach ($chunks as $registrationIDs) {
-            $data["registration_ids"] = $registrationIDs;
+        $gcmIdentifiers = $message->getGCMIdentifiers();
+
+        if (count($message->getGCMIdentifiers()) == 1) {
+            $data['to'] = $gcmIdentifiers[0];
             $this->responses[] = $this->browser->post($this->apiURL, $headers, json_encode($data));
+        } else {
+            // Chunk number of registration IDs according to the maximum allowed by GCM
+            $chunks = array_chunk($message->getGCMIdentifiers(), $this->registrationIdMaxCount);
+
+            foreach ($chunks as $registrationIDs) {
+                $data['registration_ids'] = $registrationIDs;
+                $this->responses[] = $this->browser->post($this->apiURL, $headers, json_encode($data));
+            }
         }
 
         // If we're using multiple concurrent connections via MultiCurl
@@ -112,6 +143,15 @@ public function send(MessageInterface $message)
         foreach ($this->responses as $response) {
             $message = json_decode($response->getContent());
             if ($message === null || $message->success == 0 || $message->failure > 0) {
+                if ($message == null) {
+                    $this->logger->error($response->getContent());
+                } else {
+                    foreach ($message->results as $result) {
+                        if (isset($result->error)) {
+                            $this->logger->error($result->error);
+                        }
+                    }
+                }
                 return false;
             }
         }