Merge pull request #45 from pubnub/develop

Version 4.1.5
pubnub · Oct 24, 2019 · 4e5e1a5 · 4e5e1a5
2 parents b888899 + 54c4299
commit 4e5e1a5
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,8 +1,15 @@
 name: php
-version: 4.1.4
+version: 4.1.5
 schema: 1
 scm: github.com/pubnub/php
 changelog:
+  - version: 4.1.5
+    date: Oct 22, 2019
+    changes:
+      - type: improvement
+        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:

diff --git a/.travis.yml b/.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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [v4.1.5](https://github.com/pubnub/php/tree/v4.1.5)
+ October-22-2019
+
+- ⭐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
 

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "keywords": ["api", "real-time", "realtime", "real time", "ajax", "push"],
   "homepage": "http://www.pubnub.com/",
   "license": "MIT",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "authors": [
     {
       "name": "PubNub",
@@ -17,8 +17,8 @@
   },
   "require": {
     "php": ">=5.6.0",
-    "rmccue/requests": ">=1.0",
-    "monolog/monolog": "^1.0"
+    "rmccue/requests": "^1.0",
+    "monolog/monolog": "^1.1|^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7"

diff --git a/src/PubNub/Endpoints/Presence/WhereNow.php b/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)
         );
     }
 

diff --git a/src/PubNub/PubNub.php b/src/PubNub/PubNub.php
@@ -32,7 +32,7 @@
 
 class PubNub
 {
-    const SDK_VERSION = "4.1.4";
+    const SDK_VERSION = "4.1.5";
     const SDK_NAME = "PubNub-PHP";
 
     public static $MAX_SEQUENCE = 65535;

diff --git a/tests/integrational/HereNowTest.php b/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);
     }
 
     /**

diff --git a/tests/integrational/HistoryTest.php b/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");