Compatible with phpunit 8. (#256)

SoffiMeower · web-flow · commit 82d172e6113b · 2020-10-02T15:15:07.000-04:00
* Update phpunit/phpunit requirement from ^7.4 to ^7.4 || ^8.0
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
     "vonage/nexmo-bridge": "^0.1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.4",
+    "phpunit/phpunit": "^7.4 || ^8.0",
     "php-http/mock-client": "^1.4",
     "estahn/phpunit-json-assertions": "^3.0.0",
     "squizlabs/php_codesniffer": "^3.1",
diff --git a/test/Account/BalanceTest.php b/test/Account/BalanceTest.php
@@ -18,7 +18,7 @@ class BalanceTest extends TestCase
      */
     protected $balance;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->balance = new Balance('12.99', false);
     }
diff --git a/test/Account/ClientFactoryTest.php b/test/Account/ClientFactoryTest.php
@@ -21,7 +21,7 @@ class ClientFactoryTest extends TestCase
      */
     protected $vonageClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getRestUrl()->willReturn('https://rest.nexmo.com');
diff --git a/test/Account/ClientTest.php b/test/Account/ClientTest.php
@@ -43,7 +43,7 @@ class ClientTest extends TestCase
      */
     protected $api;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getRestUrl()->willReturn('https://rest.nexmo.com');
diff --git a/test/Account/ConfigTest.php b/test/Account/ConfigTest.php
@@ -13,7 +13,7 @@
 
 class ConfigTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->config = new Config(
             "https://example.com/webhooks/inbound-sms",
diff --git a/test/Account/PrefixPriceTest.php b/test/Account/PrefixPriceTest.php
@@ -14,7 +14,7 @@
 
 class PrefixPriceTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
diff --git a/test/Account/SecretCollectionTest.php b/test/Account/SecretCollectionTest.php
@@ -14,7 +14,7 @@
 
 class SecretCollectionTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->secrets = [[
             'id' => 'ad6dc56f-07b5-46e1-a527-85530e625800',
diff --git a/test/Account/SecretTest.php b/test/Account/SecretTest.php
@@ -14,7 +14,7 @@
 
 class SecretTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->secret = @Secret::fromApi([
             'id' => 'ad6dc56f-07b5-46e1-a527-85530e625800',
diff --git a/test/Account/SmsPriceTest.php b/test/Account/SmsPriceTest.php
@@ -14,7 +14,7 @@
 
 class SmsPriceTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
diff --git a/test/Application/ApplicationTest.php b/test/Application/ApplicationTest.php
@@ -22,7 +22,7 @@ class ApplicationTest extends TestCase
      */
     protected $app;
     
-    public function setUp()
+    public function setUp(): void
     {
         $this->app = new Application();
         $this->app->setName('test');
@@ -150,4 +150,4 @@ protected function getResponse($type = 'success')
     {
         return new Response(fopen(__DIR__ . '/responses/' . $type . '.json', 'r'));
     }
-}
+}
diff --git a/test/Application/ClientTest.php b/test/Application/ClientTest.php
@@ -43,7 +43,7 @@ class ClientTest extends TestCase
      */
     protected $applicationClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getApiUrl()->willReturn('http://api.nexmo.com');
diff --git a/test/Call/CallTest.php b/test/Call/CallTest.php
@@ -43,7 +43,7 @@ class CallTest extends TestCase
      */
     protected $vonageClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->id = '3fd4d839-493e-4485-b2a5-ace527aacff3';
         $this->class = Call::class;
diff --git a/test/Call/CollectionTest.php b/test/Call/CollectionTest.php
@@ -40,7 +40,7 @@ class CollectionTest extends TestCase
      */
     protected $collection;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getApiUrl()->willReturn('https://api.nexmo.com');
diff --git a/test/Call/DtmfTest.php b/test/Call/DtmfTest.php
@@ -38,7 +38,7 @@ class DtmfTest extends TestCase
      */
     protected $vonageClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->id = '3fd4d839-493e-4485-b2a5-ace527aacff3';
         $this->class = Dtmf::class;
diff --git a/test/Call/EventTest.php b/test/Call/EventTest.php
@@ -18,7 +18,7 @@ class EventTest extends TestCase
 
     protected $entity;
 
-    public function setup()
+    public function setup(): void
     {
         $data = $this->getResponseData(['calls', 'event']);
         $this->entity = @new Event($data);
diff --git a/test/Call/FilterTest.php b/test/Call/FilterTest.php
@@ -19,7 +19,7 @@ class FilterTest extends TestCase
      */
     protected $filter;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->filter = @new Filter();
     }
diff --git a/test/Call/StreamTest.php b/test/Call/StreamTest.php
@@ -38,7 +38,7 @@ class StreamTest extends TestCase
      */
     protected $vonageClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->id = '3fd4d839-493e-4485-b2a5-ace527aacff3';
         $this->class = Stream::class;
diff --git a/test/Call/TalkTest.php b/test/Call/TalkTest.php
@@ -38,7 +38,7 @@ class TalkTest extends TestCase
      */
     protected $vonageClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->id = '3fd4d839-493e-4485-b2a5-ace527aacff3';
         $this->class = Talk::class;
diff --git a/test/Client/Credentials/ContainerTest.php b/test/Client/Credentials/ContainerTest.php
@@ -28,7 +28,7 @@ class ContainerTest extends TestCase
     protected $secret;
     protected $keypair;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->basic = new Basic('key', 'secret');
         $this->secret = new SignatureSecret('key', 'secret');
diff --git a/test/Client/Credentials/KeypairTest.php b/test/Client/Credentials/KeypairTest.php
@@ -16,7 +16,7 @@ class KeypairTest extends TestCase
     protected $key;
     protected $application = 'c90ddd99-9a5d-455f-8ade-dde4859e590e';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->key = file_get_contents(__DIR__ . '/test.key');
     }
diff --git a/test/Client/Factory/MapFactoryTest.php b/test/Client/Factory/MapFactoryTest.php
@@ -24,7 +24,7 @@ class MapFactoryTest extends TestCase
      */
     protected $client;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = new Client(new Client\Credentials\Basic('key', 'secret'));
 
diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -43,7 +43,7 @@ class ClientTest extends TestCase
     protected $key_credentials;
     protected $container;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->http         = $this->getMockHttp();
         $this->request      = $this->getRequest();
diff --git a/test/Conversation/CollectionTest.php b/test/Conversation/CollectionTest.php
@@ -32,7 +32,7 @@ class CollectionTest extends TestCase
      */
     protected $collection;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize(Client::class);
         $this->vonageClient->getApiUrl()->willReturn('https://api.nexmo.com');
diff --git a/test/Conversion/ClientTest.php b/test/Conversion/ClientTest.php
@@ -32,7 +32,7 @@ class ClientTest extends TestCase
      */
     protected $accountClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->getMockBuilder('Vonage\Client')->disableOriginalConstructor()->setMethods(['send', 'getApiUrl'])->getMock();
         $this->vonageClient->method('getApiUrl')->will($this->returnValue('https://api.nexmo.com'));
diff --git a/test/Insights/ClientTest.php b/test/Insights/ClientTest.php
@@ -37,7 +37,7 @@ class ClientTest extends TestCase
      */
     protected $insightsClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getApiUrl()->willReturn('http://api.nexmo.com');
diff --git a/test/Message/Callback/ReceiptTest.php b/test/Message/Callback/ReceiptTest.php
@@ -30,7 +30,7 @@ class ReceiptTest extends TestCase
      */
     protected $receipt;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->receipt = new Receipt($this->data);
     }
@@ -74,4 +74,4 @@ public function testClientRef()
     }
 
 }
- 
+ 
diff --git a/test/Message/ClientTest.php b/test/Message/ClientTest.php
@@ -38,7 +38,7 @@ class ClientTest extends TestCase
     /**
      * Create the Message API Client, and mock the Vonage Client
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getRestUrl()->willReturn('https://rest.nexmo.com');
diff --git a/test/Message/FetchedMessageTest.php b/test/Message/FetchedMessageTest.php
@@ -31,12 +31,12 @@ class FetchedMessageTest extends TestCase
      */
     protected $message;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->message = new \Vonage\Message\Message('02000000D912945A');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->message = null;
     }
diff --git a/test/Message/MessageCreationTest.php b/test/Message/MessageCreationTest.php
@@ -23,14 +23,14 @@ class MessageCreationTest extends TestCase
      */
     protected $message;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->message = new \Vonage\Message\Message($this->to, $this->from, [
             'text' => $this->text
         ]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->message = null;
     }
diff --git a/test/Message/MessageTest.php b/test/Message/MessageTest.php
@@ -27,14 +27,14 @@ class MessageTest extends TestCase
      */
     protected $message;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->message = new \Vonage\Message\Message($this->to, $this->from, [
             'text' => $this->text
         ]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->message = null;
     }
diff --git a/test/Message/MultiMessageTest.php b/test/Message/MultiMessageTest.php
@@ -31,14 +31,14 @@ class MultiMessageTest extends TestCase
      */
     protected $message;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->message = new \Vonage\Message\Message($this->to, $this->from, [
             'text' => $this->text
         ]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->message = null;
     }
diff --git a/test/Message/ShortcodeTest.php b/test/Message/ShortcodeTest.php
@@ -15,11 +15,11 @@
 
 class ShortcodeTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
diff --git a/test/Network/Number/CallbackTest.php b/test/Network/Number/CallbackTest.php
@@ -25,7 +25,7 @@ class CallbackTest extends TestCase
      */
     protected $callback;
 
-    public function setup()
+    public function setup(): void
     {
         $this->callback = new Callback($this->data);
     }
@@ -72,4 +72,4 @@ public function optionalData()
         );
     }
 }
- 
+ 
diff --git a/test/Network/Number/ResponseTest.php b/test/Network/Number/ResponseTest.php
@@ -26,7 +26,7 @@ class ResponseTest extends TestCase
      */
     protected $response;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->response = new Response($this->data);
     }
@@ -132,4 +132,4 @@ public function getOptionalProperties()
     }
 
 }
- 
+ 
diff --git a/test/Numbers/ClientTest.php b/test/Numbers/ClientTest.php
@@ -35,7 +35,7 @@ class ClientTest extends TestCase
      */
     protected $numberClient;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getRestUrl()->willReturn('https://rest.nexmo.com');
diff --git a/test/Numbers/NumberTest.php b/test/Numbers/NumberTest.php
@@ -20,7 +20,7 @@ class NumberTest extends TestCase
      */
     protected $number;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->number = new Number();
     }
diff --git a/test/Redact/ClientTest.php b/test/Redact/ClientTest.php
@@ -33,7 +33,7 @@ class ClientTest extends TestCase
      */
     protected $redact;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->vonageClient = $this->prophesize('Vonage\Client');
         $this->vonageClient->getApiUrl()->willReturn('https://api.nexmo.com');
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
diff --git a/test/SMS/ClientTest.php b/test/SMS/ClientTest.php
diff --git a/test/User/CollectionTest.php b/test/User/CollectionTest.php
diff --git a/test/Verify/ClientTest.php b/test/Verify/ClientTest.php
diff --git a/test/Verify/VerificationTest.php b/test/Verify/VerificationTest.php
diff --git a/test/Voice/Call/CallTest.php b/test/Voice/Call/CallTest.php
diff --git a/test/Voice/ClientTest.php b/test/Voice/ClientTest.php
diff --git a/test/Voice/Message/CallbackTest.php b/test/Voice/Message/CallbackTest.php
diff --git a/test/Voice/Message/MessageTest.php b/test/Voice/Message/MessageTest.php
diff --git a/test/Voice/NCCO/Action/ConnectTest.php b/test/Voice/NCCO/Action/ConnectTest.php

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class BalanceTest extends TestCase`
`18`	`18`	`*/`
`19`	`19`	`protected $balance;`
`20`	`20`
`21`		`- public function setUp()`
	`21`	`+ public function setUp(): void`
`22`	`22`	`{`
`23`	`23`	`$this->balance = new Balance('12.99', false);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ClientFactoryTest extends TestCase`
`21`	`21`	`*/`
`22`	`22`	`protected $vonageClient;`
`23`	`23`
`24`		`- public function setUp()`
	`24`	`+ public function setUp(): void`
`25`	`25`	`{`
`26`	`26`	`$this->vonageClient = $this->prophesize('Vonage\Client');`
`27`	`27`	`$this->vonageClient->getRestUrl()->willReturn('https://rest.nexmo.com');`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class ClientTest extends TestCase`
`43`	`43`	`*/`
`44`	`44`	`protected $api;`
`45`	`45`
`46`		`- public function setUp()`
	`46`	`+ public function setUp(): void`
`47`	`47`	`{`
`48`	`48`	`$this->vonageClient = $this->prophesize('Vonage\Client');`
`49`	`49`	`$this->vonageClient->getRestUrl()->willReturn('https://rest.nexmo.com');`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`class ConfigTest extends TestCase`
`15`	`15`	`{`
`16`		`- public function setUp()`
	`16`	`+ public function setUp(): void`
`17`	`17`	`{`
`18`	`18`	`$this->config = new Config(`
`19`	`19`	`"https://example.com/webhooks/inbound-sms",`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`class PrefixPriceTest extends TestCase`
`16`	`16`	`{`
`17`		`- public function setUp()`
	`17`	`+ public function setUp(): void`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ApplicationTest extends TestCase`
`22`	`22`	`*/`
`23`	`23`	`protected $app;`
`24`	`24`
`25`		`- public function setUp()`
	`25`	`+ public function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`$this->app = new Application();`
`28`	`28`	`$this->app->setName('test');`
`@@ -150,4 +150,4 @@ protected function getResponse($type = 'success')`
`150`	`150`	`{`
`151`	`151`	`return new Response(fopen(__DIR__ . '/responses/' . $type . '.json', 'r'));`
`152`	`152`	`}`
`153`		`-}`
	`153`	`+}`