Support php8 (#257)

Author: mmachatschek

.gitignore

@@ -2,3 +2,4 @@ composer.lock
 phpunit.xml
 tests/config.php
 vendor
+.phpunit.result.cache

.travis.yml

@@ -13,6 +13,8 @@ matrix:
     env: INSTALL_LIBSODIUM=false
   - php: 7.4
     env: INSTALL_LIBSODIUM=false
+  - php: nightly
+    env: INSTALL_LIBSODIUM=false
 dist: bionic
 install: ./scripts/travis-install.sh
 script: vendor/bin/phpunit --testsuite unit

README.md

@@ -32,7 +32,7 @@ This library depends on PHP modules for cURL and JSON. See [cURL module installa
 
 ## Supported platforms
 
-* PHP - supports PHP versions 7.1, 7.2, 7.3 and 7.4.
+* PHP - supports PHP versions 7.1, 7.2, 7.3, 7.4 and 8.0.
 * Laravel - version 5.3 and above has built-in support for Pusher Channels as a [Broadcasting backend](https://laravel.com/docs/master/broadcasting).
 * Other PHP frameworks - supported provided you are using a supported version of PHP.
 

composer.json

@@ -4,13 +4,13 @@
     "keywords": ["php-pusher-server", "pusher", "rest", "realtime", "real-time", "real time", "messaging", "push", "trigger", "publish", "events"],
     "license": "MIT",
     "require": {
-        "php": "^7.1",
+        "php": "^7.1|^8.0",
         "ext-curl": "*",
         "psr/log": "^1.0",
         "paragonie/sodium_compat": "^1.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.2"
+        "phpunit/phpunit": "^7.2|^8.5|^9.3"
     },
     "autoload": {
         "psr-4": {

tests/acceptance/channelQueryTest.php

@@ -2,7 +2,7 @@
 
 class PusherChannelQueryTest extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, true, PUSHERAPP_HOST);
         $this->pusher->setLogger(new TestLogger());

tests/acceptance/triggerBatchTest.php

@@ -2,7 +2,7 @@
 
 class PusherBatchPushTest extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
             $this->markTestSkipped('Please set the

tests/acceptance/triggerTest.php

@@ -2,7 +2,7 @@
 
 class PusherPushTest extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
             $this->markTestSkipped('Please set the
@@ -52,11 +52,10 @@ public function testSendingOver10kBMessageReturns413()
         $this->assertEquals(413, $response['status'], '413 HTTP status response expected');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testTriggeringEventOnOver100ChannelsThrowsException()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $channels = array();
         while (count($channels) <= 101) {
             $channels[] = ('channel-'.count($channels));
@@ -86,11 +85,10 @@ public function testTriggeringEventOnPrivateEncryptedChannelSuccess()
         $this->assertTrue($response);
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $options = array('encryption_master_key' => 'cAzRH3W9FZM3iXqSNIGtKztwNuCz9xMV');
         $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options, PUSHERAPP_HOST);
 

tests/unit/authQueryStringTest.php

@@ -2,7 +2,7 @@
 
 class PusherAuthQueryString extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1, true);
     }

tests/unit/channelInfoUnitTest.php

@@ -2,40 +2,36 @@
 
 class PusherChannelInfoUnitTest extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1, true);
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testTrailingColonChannelThrowsException()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $this->pusher->get_channel_info('test_channel:');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testLeadingColonChannelThrowsException()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $this->pusher->get_channel_info(':test_channel');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testLeadingColonNLChannelThrowsException()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        
         $this->pusher->get_channel_info(':\ntest_channel');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testTrailingColonNLChannelThrowsException()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $this->pusher->get_channel_info('test_channel\n:');
     }
 }

tests/unit/cryptoTest.php

@@ -2,7 +2,7 @@
 
 class PusherCryptoTest extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (function_exists('sodium_crypto_secretbox')) {
             $this->crypto = new Pusher\PusherCrypto('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
@@ -24,57 +24,51 @@ public function testValidMasterEncryptionKeys()
         $this->assertEquals(Pusher\PusherCrypto::parse_master_key('', 'dGhpcyBrZXkgaGFzIG5vbnByaW50YWJsZSBjaGFyIAA='), "this key has nonprintable char \x00");
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     * @expectedExceptionMessage both
-     */
     public function testInvalidMasterEncryptionKeyTwoProvided()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        $this->expectExceptionMessage('both');
+
         Pusher\PusherCrypto::parse_master_key('this is 32 bytes 123456789012345', 'dGhpcyBpcyAzMiBieXRlcyAxMjM0NTY3ODkwMTIzNDU=');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     * @expectedExceptionMessage 32 bytes
-     */
     public function testInvalidMasterEncryptionKeyTooShort()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        $this->expectExceptionMessage('32 bytes');
+
         Pusher\PusherCrypto::parse_master_key('this is 31 bytes 12345678901234', '');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     * @expectedExceptionMessage 32 bytes
-     */
     public function testInvalidMasterEncryptionKeyTooLong()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        $this->expectExceptionMessage('32 bytes');
+
         Pusher\PusherCrypto::parse_master_key('this is 33 bytes 1234567890123456', '');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     * @expectedExceptionMessage 32 bytes
-     */
     public function testInvalidMasterEncryptionKeyBase64TooShort()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        $this->expectExceptionMessage('32 bytes');
+
         Pusher\PusherCrypto::parse_master_key('', 'dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     * @expectedExceptionMessage 32 bytes
-     */
     public function testInvalidMasterEncryptionKeyBase64TooLong()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        $this->expectExceptionMessage('32 bytes');
+
         Pusher\PusherCrypto::parse_master_key('', 'dGhpcyBpcyAzMyBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     * @expectedExceptionMessage valid base64
-     */
     public function testInvalidMasterEncryptionKeyBase64InvalidBase64()
     {
+        $this->expectException(\Pusher\PusherException::class);
+        $this->expectExceptionMessage('valid base64');
+
         Pusher\PusherCrypto::parse_master_key('', 'dGhpcyBpcyAzMyBi!XRlcyAxMjM0NTY3ODkw#TIzNDU2');
     }
 
@@ -92,11 +86,10 @@ public function testGenerateSharedSecret()
         $this->assertNotEquals(base64_encode($crypto2->generate_shared_secret('private-encrypted-channel-a')), $expected);
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testGenerateSharedSecretNoChannel()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $this->crypto->generate_shared_secret('');
     }
 
@@ -123,33 +116,30 @@ public function testEncryptDecryptEventValid()
         $this->assertEquals($decrypted_payload, $payload);
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testEncryptPayloadNoChannel()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $channel = '';
         $payload = "now that's what I call a payload!";
         $encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
         $this->assertEquals($encrypted_payload, false);
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testEncryptPayloadPublicChannel()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $channel = 'public-static-void-main';
         $payload = "now that's what I call a payload!";
         $encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
         $this->assertEquals($encrypted_payload, false);
     }
 
-    /**
-     * @expectedException \Pusher\PusherException
-     */
     public function testDecryptPayloadWrongKey()
     {
+        $this->expectException(\Pusher\PusherException::class);
+
         $channel = 'private-encrypted-bla';
         $payload = "now that's what I call a payload!";
         $encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);

tests/unit/notificationsTest.php

@@ -2,16 +2,15 @@
 
     class PusherNotificationsUnitTest extends PHPUnit\Framework\TestCase
     {
-        protected function setUp()
+        protected function setUp(): void
         {
             $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
         }
 
-        /**
-         * @expectedException \Pusher\PusherException
-         */
         public function testInvalidEmptyInterests()
         {
+            $this->expectException(\Pusher\PusherException::class);
+
             $this->pusher->notify(array(), array('foo' => 'bar'));
         }
     }

tests/unit/pusherConstructorTest.php

@@ -2,10 +2,6 @@
 
 class pusherConstructorTest extends PHPUnit\Framework\TestCase
 {
-    protected function setUp()
-    {
-    }
-
     public function testDebugCanBeSetViaLegacyParameter()
     {
         $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', true);