Update PHPUnit to 8.x.x

Author: paolobueno

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 composer.phar
 .DS_Store
 .idea/
+.phpunit.*

composer.json

@@ -16,7 +16,7 @@
         "symfony/polyfill-php56": "^1.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.25"
+        "phpunit/phpunit": "^8"
     },
     "autoload": {
         "psr-4": {

tests/integration/BaseTest.php

@@ -1,19 +1,16 @@
 <?php
-// Starting from PHPUnit 6, PHPUnit classes are namespaced. This alias ensures our tests still run
-// with PHPUnit >=6. See: https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-6.0.0
-if (!class_exists('PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
-    class_alias('\PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
-}
 
-class BaseTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BaseTest extends TestCase
 {
     /** @var \MessageBird\Client */
     protected $client;
 
     /** @var PHPUnit_Framework_MockObject_MockObject */
     protected $mockClient;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->mockClient = $this->getMockBuilder("\MessageBird\Common\HttpClient")->setConstructorArgs(array("fake.messagebird.dev"))->getMock();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
@@ -43,6 +40,8 @@ public function testClientConstructor()
         $this->assertInstanceOf('MessageBird\Resources\Chat\Platform', $MessageBird->chatPlatforms);
         $this->assertInstanceOf('MessageBird\Resources\Chat\Channel', $MessageBird->chatChannels);
         $this->assertInstanceOf('MessageBird\Resources\Chat\Contact', $MessageBird->chatContacts);
+        $this->assertInstanceOf('MessageBird\Resources\AvailableNumbers', $MessageBird->availableNumbers);
+        $this->assertInstanceOf('MessageBird\Resources\PurchasedNumbers', $MessageBird->purchasedNumbers);
 
     }
 

tests/integration/HttpClientTest.php

@@ -16,12 +16,10 @@ public function testHttpClient()
         $this->assertSame(Client::ENDPOINT.'/a?b=1', $url);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp #^Timeout must be an int > 0, got "integer 0".$#
-     */
     public function testHttpClientInvalidTimeout()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessageRegExp('/^Timeout must be an int > 0, got "integer 0".$/');
         new HttpClient(Client::ENDPOINT, 0);
     }
 

tests/integration/balance/BalanceTest.php

@@ -1,7 +1,7 @@
 <?php
 class BalanceTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
@@ -12,6 +12,7 @@ public function setUp()
      */
     public function testReadBalance()
     {
+        $this->expectException(\MessageBird\Exceptions\ServerException::class);
         $this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'balance', null, null);
         $this->client->balance->read();
     }

tests/integration/chat/ChatTest.php

@@ -1,7 +1,7 @@
 <?php
 class ChatTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/contacts/ContactTest.php

@@ -1,7 +1,7 @@
 <?php
 class ContactTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/conversation/ConversationMessageTest.php

@@ -46,7 +46,7 @@ class ConversationMessageTest extends BaseTest
         "type": "video"
     }';
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/integration/conversation/ConversationTest.php

@@ -94,7 +94,7 @@ class ConversationTest extends BaseTest
         "lastUsedChannelId": "channel-id"
     }';
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/integration/conversation/ConversationWebhookTest.php

@@ -37,7 +37,7 @@ class ConversationWebhookTest extends BaseTest
         "updatedDatetime": "2018-07-20T12:13:51+00:00"
     }';
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/integration/groups/GroupTest.php

@@ -1,7 +1,7 @@
 <?php
 class GroupTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/hlr/HlrTest.php

@@ -1,7 +1,7 @@
 <?php
 class HlrTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/lookup/LookupTest.php

@@ -1,7 +1,7 @@
 <?php
 class LookupTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/messages/MessagesTest.php

@@ -1,7 +1,7 @@
 <?php
 class MessageTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/partneraccount/AccountTest.php

@@ -2,7 +2,7 @@
 
 class AccountTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/verify/VerifyTest.php

@@ -1,7 +1,7 @@
 <?php
 class VerifyTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/voice/VoiceTest.php

@@ -5,7 +5,7 @@ class VoiceTest extends BaseTest
     /** @var \MessageBird\Client client */
     public $client;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/integration/voicemessages/VoiceMessagesTest.php

@@ -1,7 +1,7 @@
 <?php
 class VoiceMessagesTest extends BaseTest
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);

tests/unit/RequestValidatorTest.php

@@ -2,8 +2,9 @@
 
 use MessageBird\Objects\SignedRequest;
 use MessageBird\RequestValidator;
+use PHPUnit\Framework\TestCase;
 
-class RequestValidatorTest extends PHPUnit_Framework_TestCase
+class RequestValidatorTest extends TestCase
 {
     public function testVerify()
     {

tests/unit/SignedRequestTest.php

@@ -1,8 +1,9 @@
 <?php
 
 use MessageBird\Objects\SignedRequest;
+use PHPUnit\Framework\TestCase;
 
-class SignedRequestTest extends PHPUnit_Framework_TestCase
+class SignedRequestTest extends TestCase
 {
     public function testCreate()
     {