Merge pull request #44 from stefan-qsd/develop

Update PHP versions in .travis.yml

.pubnub.yml

@@ -7,7 +7,9 @@ changelog:
     date: Oct 22, 2019
     changes:
       - type: improvement
-        text: Update composer.json package version constraints.
+        text: Update composer.json package version constraints
+      - type: improvement
+        text: Update .travis.yml to run tests for PHP versions 7.2 and 7.3
   - version: 4.1.4
     date: Oct 18, 2019
     changes:

.travis.yml

@@ -1,10 +1,12 @@
 language: php
-dist: trusty
+dist: xenial
 sudo: false
 php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
+  - 7.3
 install:
   - composer self-update && composer --version
   - composer install --prefer-dist

CHANGELOG.md

@@ -1,7 +1,8 @@
 ## [v4.1.5](https://github.com/pubnub/php/tree/v4.1.5)
  October-22-2019
 
-- ⭐Update composer.json package version constraints.
+- ⭐Update composer.json package version constraints
+- ⭐Update .travis.yml to run tests for PHP versions 7.2 and 7.3
 
 ## [v4.1.4](https://github.com/pubnub/php/tree/v4.1.4)
  October-18-2019

src/PubNub/Endpoints/Presence/WhereNow.php

@@ -8,6 +8,7 @@
 use PubNub\Exceptions\PubNubValidationException;
 use PubNub\Models\Consumer\Presence\PNWhereNowResult;
 use PubNub\PubNub;
+use PubNub\PubNubUtil;
 
 
 class WhereNow extends Endpoint
@@ -73,7 +74,7 @@ public function buildPath()
     {
         return sprintf(WhereNow::PATH,
             $this->pubnub->getConfiguration()->getSubscribeKey(),
-            $this->uuid
+            PubNubUtil::urlEncode($this->uuid)
         );
     }
 

tests/integrational/HereNowTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Integrational;
 
+use Countable;
 use PubNub\Endpoints\Presence\HereNow;
 use PubNub\Exceptions\PubNubValidationException;
 use RawTransport;
@@ -129,7 +130,7 @@ public function testMultipleChannelWithoutStateUUIDs()
 
         $this->assertEquals($response->getChannels()[0]->getChannelName(), "game1");
         $this->assertEquals($response->getChannels()[0]->getOccupancy(), 1);
-        $this->assertEquals(count($response->getChannels()[0]->getOccupants()), null);
+        $this->assertEquals(is_array($response->getChannels()[0]->getOccupants()) , false);
     }
 
     /**

tests/integrational/HistoryTest.php

@@ -151,7 +151,7 @@ public function testEncryptedSuccess()
 
         $this->assertEquals(count($response->getMessages()), 3);
 
-        $this->assertEquals(count($response->getMessages()[0]->getTimetoken()), null);
+        $this->assertEquals($response->getMessages()[0]->getTimetoken(), NULL);
         $this->assertEquals($response->getMessages()[0]->getEntry()[0], "m1");
         $this->assertEquals($response->getMessages()[0]->getEntry()[1], "m2");
         $this->assertEquals($response->getMessages()[0]->getEntry()[2], "m3");