Merge pull request #805 from acrobat/bump-phpunit

Bump phpunit to supported version

Author: acrobat

.gitignore

@@ -1,5 +1,6 @@
 .php_cs.cache
 phpunit.xml
+.phpunit.result.cache
 composer.lock
 composer.phar
 vendor/*

composer.json

@@ -27,7 +27,7 @@
         "php-http/cache-plugin": "^1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^7.0 || ^8.0",
         "php-http/guzzle6-adapter": "^1.0",
         "php-http/mock-client": "^1.0",
         "guzzlehttp/psr7": "^1.2",

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
     <testsuites>

test/Github/Tests/Api/AbstractApiTest.php

@@ -171,13 +171,13 @@ public function shouldNotPassEmptyRefToClient()
         $api = $this->getAbstractApiObject($client);
         $actual = $this->getMethod($api, 'get')->invokeArgs($api, ['/path', ['ref' => null]]);
 
-        $this->assertInternalType('array', $actual);
+        $this->assertIsArray($actual);
     }
 
     /**
      * @param $client
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
     protected function getAbstractApiObject($client)
     {

test/Github/Tests/Api/CurrentUser/DeployKeysTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\CurrentUser;
+
+use Github\Exception\MissingArgumentException;
+use Github\Tests\Api\TestCase;
 
 class DeployKeysTest extends TestCase
 {
@@ -55,10 +58,10 @@ public function shouldCreateKey()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateKeyWithoutTitleParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['key' => 'ssh-rsa ...'];
 
         $api = $this->getApiMock();
@@ -70,10 +73,10 @@ public function shouldNotCreateKeyWithoutTitleParam()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateKeyWithoutKeyParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['title' => 'my key'];
 
         $api = $this->getApiMock();

test/Github/Tests/Api/CurrentUser/EmailsTest.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\CurrentUser;
+
+use Github\Exception\InvalidArgumentException;
+use Github\Tests\Api\TestCase;
 
 class EmailsTest extends TestCase
 {
@@ -54,10 +57,10 @@ public function shouldRemoveEmails()
 
     /**
      * @test
-     * @expectedException \Github\Exception\InvalidArgumentException
      */
     public function shouldNotRemoveEmailsWhenAreNotPass()
     {
+        $this->expectException(InvalidArgumentException::class);
         $api = $this->getApiMock();
         $api->expects($this->any())
             ->method('delete');
@@ -99,10 +102,10 @@ public function shouldAddEmails()
 
     /**
      * @test
-     * @expectedException \Github\Exception\InvalidArgumentException
      */
     public function shouldNotAddEmailsWhenAreNotPass()
     {
+        $this->expectException(InvalidArgumentException::class);
         $api = $this->getApiMock();
         $api->expects($this->any())
             ->method('post');

test/Github/Tests/Api/CurrentUser/FollowersTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\CurrentUser;
+
+use Github\Tests\Api\TestCase;
 
 class FollowersTest extends TestCase
 {

test/Github/Tests/Api/CurrentUser/MembershipsTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\CurrentUser;
+
+use Github\Tests\Api\TestCase;
 
 class MembershipsTest extends TestCase
 {

test/Github/Tests/Api/CurrentUser/StarringTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\CurrentUser;
+
+use Github\Tests\Api\TestCase;
 
 class StarringTest extends TestCase
 {

test/Github/Tests/Api/CurrentUser/WatchersTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\CurrentUser;
+
+use Github\Tests\Api\TestCase;
 
 class WatchersTest extends TestCase
 {