Merge pull request #191 from ably/feature/upgrade-protocol-2.0

Support protocol 2.0 and php 8.3

.github/workflows/check.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
+        php-version: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
         protocol: [ 'json', 'msgpack' ]
         ignorePlatformReq: [ '' ]
 

README.md

@@ -13,7 +13,7 @@ This is a PHP REST client library for Ably. The library currently targets the [A
 
 ## Supported Platforms
 
-This SDK supports PHP 7.2+, 8.0, 8.1 and 8.2
+This SDK supports PHP >=7.2
 
 We regression-test the library against a selection of PHP versions (which will change over time, but usually consists of the versions that are supported upstream). Please refer to [the check workflow](.github/workflows/check.yml) for the set of versions that currently undergo CI testing.
 

src/Defaults.php

@@ -2,7 +2,7 @@
 namespace Ably;
 
 class Defaults {
-    const API_VERSION = '1.1';
+    const API_VERSION = '2';
     const LIB_VERSION = '1.1.9';
 
     static $restHost = "rest.ably.io";

src/Models/BaseMessage.php

@@ -151,13 +151,6 @@ function( $obj ) use ($cipherParams) { return static::fromEncoded($obj, $cipherP
     protected function encode() {
         $msg = new \stdClass();
 
-        if ($this->encoding) {
-            $msg->encoding = $this->encoding;
-            $msg->data = $this->data;
-
-            return $msg;
-        }
-
         if ($this->id) {
             $msg->id = $this->id;
         }
@@ -170,6 +163,13 @@ protected function encode() {
             $msg->extras = $this->extras;
         }
 
+        if ($this->encoding) {
+            $msg->encoding = $this->encoding;
+            $msg->data = $this->data;
+
+            return $msg;
+        }
+
         $isBinary = false;
         $encodings = [];
 

src/Models/ClientOptions.php

@@ -104,7 +104,7 @@ class ClientOptions extends AuthOptions {
     /**
      * @var bool defaults to false for clients with version < 1.2, otherwise true
      */
-    public $idempotentRestPublishing = Defaults::API_VERSION >= '1.2';
+    public $idempotentRestPublishing = true;
 
     /**
      * @var string a class that should be used for Auth

tests/AblyRestTest.php

@@ -496,10 +496,10 @@ public function testHttpTimeout() {
             'httpRequestTimeout' => 20, // 20 ms
         ]);
 
-        $ably->http->get('https://cdn.ably.io/lib/ably.js'); // should work
+        $ably->http->get('https://rest.ably.io/time'); // should work
         $this->expectException(AblyRequestException::class);
         $this->expectExceptionCode(50003);
-        $ablyTimeout->http->get('https://cdn.ably.io/lib/ably.js'); // guaranteed to take more than 20 ms
+        $ablyTimeout->http->get('https://rest.ably.io/time'); // guaranteed to take more than 20 ms
     }
 }
 

tests/AuthTest.php

@@ -308,7 +308,7 @@ public function testCreateTokenRequestValidity() {
 
         $this->assertFalse( $ably->auth->isUsingBasicAuth(), 'Expected token auth to be used' );
         $this->assertLessThan(
-            200,
+            300,
             abs($timestamp - $ably->auth->getTokenDetails()->issued),
             'Expected token issued timestamp to be near to the time of request (allowing for clock skew)'
         );

tests/PushAdminTest.php

@@ -37,10 +37,8 @@ public function testAdminPublish() {
         ];
         $data = [ 'data' => [ 'foo' => 'bar' ] ];
 
-        $res = self::$ably->push->admin->publish( $recipient, $data , true );
-        $this->assertNull($res);
-        sleep(3); // It takes some time for the message to show up in the history
-
+        self::$ably->push->admin->publish( $recipient, $data , true );
+        sleep(5); // It takes some time for the message to show up in the history
         $channel = self::$ably->channel($channelName);
         $history = $channel->history();
         $this->assertEquals( 1, count($history->items), 'Expected 1 message' );