Fix issue #12

gomoob · Mar 10, 2015 · 564f687 · 564f687
1 parent 8b29559
commit 564f687
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/main/php/Gomoob/Pushwoosh/Model/Request/RegisterDeviceRequest.php b/src/main/php/Gomoob/Pushwoosh/Model/Request/RegisterDeviceRequest.php
@@ -270,6 +270,12 @@ public function toJSON()
             throw new PushwooshException('The \'hwid\' property is not set !');
 
         }
+
+        // The 'pushToken' parameter must have been defined.
+        if (!isset($this->pushToken)) {
+            throw new PushwooshException('The  \'pushToken\' property is not set !');
+
+        }
 
         $json = array(
             'application' => $this->application,

diff --git a/src/test/php/Gomoob/Pushwoosh/Model/Request/RegisterDeviceRequestTest.php b/src/test/php/Gomoob/Pushwoosh/Model/Request/RegisterDeviceRequestTest.php
@@ -169,15 +169,6 @@ public function testToJSON()
 
         // Test without the 'timezone' parameter set
         $registerDeviceRequest->setPushToken('PUSH_TOKEN');
-        try {
-            $registerDeviceRequest->toJSON();
-            $this->fail('Must have thrown a PushwooshException !');
-
-        } catch (PushwooshException $pe) {
-            // Expected
-
-        }
-
         $registerDeviceRequest->setTimezone(3600);
 
         // Test without the 'language' parameter set