Merge remote-tracking branch 'origin/master'

Author: lkaybob

.gitignore

@@ -82,4 +82,7 @@ modules.xml
 service_account.json
 
 # PHPUnit HTML Report
-report/
+report/
+
+# PHP Unit Local Test Configureation
+phpunit.local.xml

.travis.yml

@@ -0,0 +1,19 @@
+language: php
+
+php:
+  - 7.0
+  - 7.1
+  - 7.2
+
+before_install:
+  - openssl aes-256-cbc -K $encrypted_f2e6dfafc496_key -iv $encrypted_f2e6dfafc496_iv -in service_account.json.enc -out service_account.json -d
+
+install:
+  - composer self-update
+  - composer install
+
+script:
+  - ./vendor/bin/phpunit
+
+after_script:
+  - bash <(curl -s https://codecov.io/bash)

phpunit.xml

@@ -14,6 +14,6 @@
     </filter>
 
     <logging>
-        <log type="coverage-html" target="report"/>
+        <log type="coverage-clover" target="clover.xml"/>
     </logging>
 </phpunit>

service_account.json.enc

@@ -46,7 +46,7 @@ public function testSetTimeToLive() {
         $this -> assertArrayHasKey('apns-expiration', $payload['apns']['headers']);
 
         $end = new \DateTime('@' . $payload['apns']['headers']['apns-expiration']);
-        $this -> assertEquals(1, $end -> diff($start) -> d);
+        $this -> assertEquals(1, $end -> diff($start) -> s);
     }
 
     public function testPriorityFire() {

tests/APNsConfigTest.php

@@ -60,7 +60,7 @@ public function testDuplicateOption() {
     }
 
     public function testCollapseKeyFire() {
-        $this -> markTestSkipped("Skipping passed test");
+        // $this -> markTestSkipped("Skipping passed test");
         $config = new AndroidConfig();
         $fcmTest = new FCMTest();
         $config -> setCollapseKey('test');
@@ -87,7 +87,7 @@ public function testPriorityFire() {
     }
 
     public function testTimeToLive() {
-        $this -> markTestSkipped("Skipping passed test");
+        // $this -> markTestSkipped("Skipping passed test");
         $config = new AndroidConfig();
         $fcmTest = new FCMTest();
         $config -> setTimeToLive(60);

tests/AndroidConfigTest.php

@@ -14,7 +14,7 @@
 class ConfigTest extends TestCase {
 
     public function testSetCollapseKey() {
-        $this -> markTestSkipped("Skipping passed test");
+        // $this -> markTestSkipped("Skipping passed test");
         $fcmTest = new FCMTest();
         $config = new Config();
 
@@ -25,7 +25,7 @@ public function testSetCollapseKey() {
     }
 
     public function testSetTimeToLive() {
-        $this -> markTestSkipped("Implemented");
+        // $this -> markTestSkipped("Implemented");
         $fcmTest = new FCMTest();
         $config = new Config();
 

tests/ConfigTest.php

@@ -18,7 +18,7 @@
 use \PHPUnit\Framework\TestCase;
 
 class FCMTest extends TestCase {
-    const KEY_FILE = '../service_account.json';
+    const KEY_FILE = 'service_account.json';
     // const DEVICE_TOKEN = 'eJH9cNs4hc4:APA91bHDwEGN6xEAwbDRpumCRSVnHLGgWXmiwIzAAeUTGP5Fx3diz4mL0T2E5zBVCb_zOfAwwuEsPy4J2504Ct0Mn3NAWVt2MKpvwh1iSUkSMKN0sjTQArMuZpzvm0ioeXkt-QFj3Xvi';
     const DEVICE_TOKEN = 'dswH6YqIC70:APA91bFaFQM_Jw-hoQAYDwXOVN8ifuIQ_GCpT26h7mt_Q-bYc4g-7q8vQqYD5ILAPwuPbU5uk2kbQtYRyDvnnLHvG3cLMcppN41ri4rYAV-Daf4QyCj4l0anuYS-mXTq1j_yanLvhlCJ';
 
@@ -27,22 +27,22 @@ class FCMTest extends TestCase {
 
     public function testBuild() {
         $fcm = $this -> buildNotification(self::TEST_TITLE, self::TEST_BODY);
+        $payload = $fcm -> getPayload();
 
         $expected = array(
-            'message' => array(
-                'token' => self::DEVICE_TOKEN,
-                'notification' => array(
-                    'title' => self::TEST_TITLE,
-                    'body' => self::TEST_BODY
-                )
+            'token' => self::DEVICE_TOKEN,
+            'notification' => array(
+                'title' => self::TEST_TITLE,
+                'body' => self::TEST_BODY
             )
         );
-        $this -> assertEquals($expected, $fcm -> getPayload());
+        $this -> assertArrayHasKey('message', $payload);
+        $this -> assertEquals($expected, $payload['message']);
     }
 
     public function testFire() {
         // $this -> markTestSkipped(__METHOD__ . ' already passed');
-        $fcm = $this -> buildNotification(self::TEST_TITLE, self::TEST_BODY, self::KEY_FILE);
+        $fcm = $this -> buildNotification(self::TEST_TITLE, self::TEST_BODY);
         $result = $fcm -> fire();
         echo $result;