Upgrade PHPUnit

Author: kubawerlos

composer.json

@@ -25,7 +25,7 @@
         "codeless/jugglecode": "1.0",
         "friendsofphp/php-cs-fixer": "^2.13",
         "php-coveralls/php-coveralls": "2.1",
-        "phpunit/phpunit": "^4.8.35"
+        "phpunit/phpunit": "^6.4 || ^7.4"
     },
     "autoload": {
         "psr-0": {

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation='vendor/phpunit/phpunit/phpunit.xsd'
          backupGlobals="true"
          backupStaticAttributes="true"
          colors="true"
@@ -15,18 +15,15 @@
         <log type="coverage-php" target="build/logs/coverage.cov"/>
         <log type="coverage-text" target="build/logs/coverage.txt" showUncoveredFiles="false"/>
         <log type="coverage-html" target="test/reports/coverage/" showUncoveredFiles="true"/>
-        <log type="junit" target="test/reports/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="test/reports/junit.xml"/>
     </logging>
     <testsuites>
-        <testsuite>
+        <testsuite name="test">
             <directory>test/</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <blacklist>
-            <directory suffix=".php">vendor/</directory>
-        </blacklist>
-        <whitelist addUncoveredFilesFromWhitelist="true">
+        <whitelist>
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>

test/Unit/Api/ClientErrorTest.php

@@ -2,8 +2,9 @@
 namespace Bigcommerce\Unit\Api;
 
 use Bigcommerce\Api\ClientError;
+use PHPUnit\Framework\TestCase;
 
-class ClientErrorTest extends \PHPUnit_Framework_TestCase
+class ClientErrorTest extends TestCase
 {
     public function testStringifyingReturnsTheMessageAndCodeAppropriately()
     {

test/Unit/Api/ClientTest.php

@@ -4,8 +4,9 @@
 
 use Bigcommerce\Api\Client;
 use Bigcommerce\Api\Connection;
+use PHPUnit\Framework\TestCase;
 
-class ClientTest extends \PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {
     /**
      * @var Connection|\PHPUnit_Framework_MockObject_MockObject
@@ -52,19 +53,22 @@ public function tearDown()
 
     public function testConfigureRequiresStoreUrl()
     {
-        $this->setExpectedException('\\Exception', "'store_url' must be provided");
+        $this->expectException('\\Exception');
+        $this->expectExceptionMessage("'store_url' must be provided");
         Client::configure(array('username' => 'whatever', 'api_key' => 'whatever'));
     }
 
     public function testConfigureRequiresUsername()
     {
-        $this->setExpectedException('\\Exception', "'username' must be provided");
+        $this->expectException('\\Exception');
+        $this->expectExceptionMessage("'username' must be provided");
         Client::configure(array('store_url' => 'whatever', 'api_key' => 'whatever'));
     }
 
     public function testConfigureRequiresApiKey()
     {
-        $this->setExpectedException('\\Exception', "'api_key' must be provided");
+        $this->expectException('\\Exception');
+        $this->expectExceptionMessage("'api_key' must be provided");
         Client::configure(array('username' => 'whatever', 'store_url' => 'whatever'));
     }
 
@@ -144,7 +148,8 @@ public function testGetCustomerLoginTokenThrowsIfNoClientSecret()
             'auth_token' => 'def',
             'store_hash' => 'abc'
         ));
-        $this->setExpectedException('\Exception', 'Cannot sign customer login tokens without a client secret');
+        $this->expectException('\Exception');
+        $this->expectExceptionMessage('Cannot sign customer login tokens without a client secret');
         Client::getCustomerLoginToken(1);
     }
 
@@ -852,8 +857,8 @@ public function testDeletingAllGiftCertificatesDeletesToTheAllGiftCertificatesRe
 
         Client::deleteAllGiftCertificates();
     }
-    
-    
+
+
     public function testGettingWebhooksReturnsAllWebhooks()
     {
         $this->connection->expects($this->once())
@@ -866,7 +871,7 @@ public function testGettingWebhooksReturnsAllWebhooks()
             $this->assertInstanceOf('Bigcommerce\\Api\\Resource', $resource);
         }
     }
-    
+
     public function testGettingSpecifiedWebhookReturnsTheSpecifiedWebhook()
     {
         $this->connection->expects($this->once())
@@ -876,7 +881,7 @@ public function testGettingSpecifiedWebhookReturnsTheSpecifiedWebhook()
         $resource = Client::getWebhook(1);
         $this->assertInstanceOf('Bigcommerce\\Api\\Resource', $resource);
     }
-    
+
     public function testCreatingWebhookPostsToTheSpecifiedResource()
     {
         $this->connection->expects($this->once())
@@ -891,7 +896,7 @@ public function testUpdatingWebhookPutsToTheSpecifiedResource()
             ->with($this->basePath . '/hooks/1', (object)array());
         Client::updateWebhook(1, array());
     }
-    
+
     public function testDeleteWebhookDeletesToTheSpecifiedResource()
     {
         $this->connection->expects($this->once())

test/Unit/Api/ConnectionTest.php

@@ -3,8 +3,9 @@
 namespace Bigcommerce\Test\Unit;
 
 use Bigcommerce\Api\Connection;
+use PHPUnit\Framework\TestCase;
 
-class ConnectionTest extends \PHPUnit_Framework_TestCase
+class ConnectionTest extends TestCase
 {
     /**
      * @var \Bigcommerce\Api\Connection;

test/Unit/Api/ErrorTest.php

@@ -2,8 +2,9 @@
 namespace Bigcommerce\Test\Unit;
 
 use Bigcommerce\Api\Error;
+use PHPUnit\Framework\TestCase;
 
-class ErrorTest extends \PHPUnit_Framework_TestCase
+class ErrorTest extends TestCase
 {
     public function testConstructorHandlesArrayOfMessageObjects()
     {

test/Unit/Api/FilterTest.php

@@ -2,8 +2,9 @@
 namespace Bigcommerce\Unit\Api;
 
 use Bigcommerce\Api\Filter;
+use PHPUnit\Framework\TestCase;
 
-class FilterTest extends \PHPUnit_Framework_TestCase
+class FilterTest extends TestCase
 {
     public function testToQueryBuildsAnAppropriateQueryString()
     {

test/Unit/Api/NetworkErrorTest.php

@@ -2,8 +2,9 @@
 namespace Bigcommerce\Unit\Api;
 
 use Bigcommerce\Api\NetworkError;
+use PHPUnit\Framework\TestCase;
 
-class NetworkErrorTest extends \PHPUnit_Framework_TestCase
+class NetworkErrorTest extends TestCase
 {
     public function testBehavesExactlyLikeException()
     {

test/Unit/Api/ResourceTest.php

@@ -2,8 +2,9 @@
 namespace Bigcommerce\Test\Unit\Api;
 
 use Bigcommerce\Api\Resource;
+use PHPUnit\Framework\TestCase;
 
-class ResourceTest extends \PHPUnit_Framework_TestCase
+class ResourceTest extends TestCase
 {
     public function testGetCreateFieldsReturnsAllFieldsNotMarkedIgnore()
     {

test/Unit/Api/Resources/ResourceTestBase.php

@@ -3,8 +3,9 @@
 
 use Bigcommerce\Api\Client;
 use Bigcommerce\Api\Connection;
+use PHPUnit\Framework\TestCase;
 
-class ResourceTestBase extends \PHPUnit_Framework_TestCase
+class ResourceTestBase extends TestCase
 {
     /**
      * @var Connection|\PHPUnit_Framework_MockObject_MockObject