Bump phpunit to supported version

zhuqiwen · Sep 9, 2019 · 0077a9f · 0077a9f
1 parent d876019
commit 0077a9f
Show file tree

Hide file tree

Showing 50 changed files with 179 additions and 115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .php_cs.cache
 phpunit.xml
+.phpunit.result.cache
 composer.lock
 composer.phar
 vendor/*
diff --git a/composer.json b/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",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
     <testsuites>

diff --git a/test/Github/Tests/Api/AbstractApiTest.php b/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)
     {

diff --git a/test/Github/Tests/Api/CurrentUser/DeployKeysTest.php b/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();

diff --git a/test/Github/Tests/Api/CurrentUser/EmailsTest.php b/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');

diff --git a/test/Github/Tests/Api/CurrentUser/FollowersTest.php b/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
 {

diff --git a/test/Github/Tests/Api/CurrentUser/MembershipsTest.php b/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
 {

diff --git a/test/Github/Tests/Api/CurrentUser/StarringTest.php b/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
 {

diff --git a/test/Github/Tests/Api/CurrentUser/WatchersTest.php b/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
 {

diff --git a/test/Github/Tests/Api/DeploymentTest.php b/test/Github/Tests/Api/DeploymentTest.php
@@ -2,6 +2,8 @@
 
 namespace Github\Tests\Api;
 
+use Github\Exception\MissingArgumentException;
+
 class DeploymentTest extends TestCase
 {
     /**
@@ -79,10 +81,10 @@ public function shouldCreateStatusUpdate()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldRejectStatusUpdateWithoutStateField()
     {
+        $this->expectException(MissingArgumentException::class);
         $api = $this->getApiMock();
         $statusData = ['description' => 'waiting to start'];
 

diff --git a/test/Github/Tests/Api/GistsTest.php b/test/Github/Tests/Api/GistsTest.php
@@ -2,6 +2,8 @@
 
 namespace Github\Tests\Api;
 
+use Github\Exception\MissingArgumentException;
+
 class GistsTest extends TestCase
 {
     /**
@@ -128,10 +130,10 @@ public function shouldListGistForks()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateGistWithoutFile()
     {
+        $this->expectException(MissingArgumentException::class);
         $input = [
             'description' => '',
             'public' => false,

diff --git a/test/Github/Tests/Api/GitData/BlobsTest.php b/test/Github/Tests/Api/GitData/BlobsTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\GitData;
+
+use Github\Exception\MissingArgumentException;
+use Github\Tests\Api\TestCase;
 
 class BlobsTest extends TestCase
 {
@@ -67,10 +70,10 @@ public function shouldCreateBlob()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateBlobWithoutEncoding()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['content' => 'some cotent'];
 
         $api = $this->getApiMock();
@@ -82,10 +85,10 @@ public function shouldNotCreateBlobWithoutEncoding()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateBlobWithoutContent()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['encoding' => 'utf8'];
 
         $api = $this->getApiMock();

diff --git a/test/Github/Tests/Api/GitData/CommitsTest.php b/test/Github/Tests/Api/GitData/CommitsTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\GitData;
+
+use Github\Exception\MissingArgumentException;
+use Github\Tests\Api\TestCase;
 
 class CommitsTest extends TestCase
 {
@@ -39,10 +42,10 @@ public function shouldCreateCommit()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateCommitWithoutMessageParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['tree' => 1234, 'parents' => []];
 
         $api = $this->getApiMock();
@@ -54,10 +57,10 @@ public function shouldNotCreateCommitWithoutMessageParam()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateCommitWithoutTreeParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['message' => 'some message', 'parents' => []];
 
         $api = $this->getApiMock();
@@ -69,10 +72,10 @@ public function shouldNotCreateCommitWithoutTreeParam()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateCommitWithoutParentsParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['message' => 'some message', 'tree' => '12334'];
 
         $api = $this->getApiMock();

diff --git a/test/Github/Tests/Api/GitData/ReferencesTest.php b/test/Github/Tests/Api/GitData/ReferencesTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Github\Tests\Api;
+namespace Github\Tests\Api\GitData;
+
+use Github\Exception\MissingArgumentException;
+use Github\Tests\Api\TestCase;
 
 class ReferencesTest extends TestCase
 {
@@ -119,10 +122,10 @@ public function shouldCreateReference()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateReferenceWithoutShaParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['ref' => '123'];
 
         $api = $this->getApiMock();
@@ -134,10 +137,10 @@ public function shouldNotCreateReferenceWithoutShaParam()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNotCreateReferenceWithoutRefsParam()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = ['sha' => '1234'];
 
         $api = $this->getApiMock();
@@ -166,10 +169,10 @@ public function shouldUpdateReference()
 
     /**
      * @test
-     * @expectedException \Github\Exception\MissingArgumentException
      */
     public function shouldNoUpdateReferenceWithoutSha()
     {
+        $this->expectException(MissingArgumentException::class);
         $data = [];
 
         $api = $this->getApiMock();