PHP8: support

.github/workflows/ci.yaml

@@ -0,0 +1,41 @@
+name: "Continuous Integration"
+
+on:
+    pull_request:
+    push:
+
+jobs:
+    phpunit:
+        name: Test Suite
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: [7.1, 7.2, 7.3, 7.4, 8.0]
+        steps:
+            - uses: actions/checkout@v2
+            - name: Install PHP ${{ matrix.php }}
+              uses: "shivammathur/setup-php@v2"
+              with:
+                  coverage: "none"
+                  ini-values: "memory_limit=-1, phar.readonly=0"
+                  php-version: ${{ matrix.php }}
+
+            - name: "Determine composer cache directory"
+              id: "determine-composer-cache-directory"
+              run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+
+            - name: "Cache dependencies installed with composer"
+              uses: "actions/cache@v1"
+              with:
+                  path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+                  key: "php-${{ matrix.php }}-ci"
+                  restore-keys: "php-${{ matrix.php }}"
+
+            - name: "Install dependencies"
+              run: composer update --no-progress -o --prefer-dist
+
+            - name: "Run PHPUnit"
+              run: ./vendor/bin/phpunit
+
+            - name: "Run PHPStan"
+              run: ./vendor/bin/phpstan analyze lib test --level=4

.gitignore

@@ -2,3 +2,4 @@ vendor/
 report/
 build/
 composer.lock
+.phpunit.result.cache

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1|^8.0",
         "ext-json": "*",
         "jacobkiers/oauth":"~1.0",
         "psr/http-message": "^1.0",
@@ -23,10 +23,11 @@
         "php-http/client-common": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit":"^7.5",
+        "phpunit/phpunit":"^7.5|^8",
         "php-http/mock-client": " ^1.2",
         "squizlabs/php_codesniffer": "^3.5",
-        "php-http/guzzle6-adapter": "^2.0"
+        "php-http/guzzle6-adapter": "^2.0",
+        "phpstan/phpstan": "^0.12.90"
     },
     "conflict": {
         "eabay/bitbucket-repo-sync": "*",

lib/Bitbucket/API/Groups.php

@@ -114,6 +114,6 @@ public function delete($account, $name)
      */
     public function members()
     {
-        return $this->api(Members::class);
+        return new Members([], $this->getClient());
     }
 }

lib/Bitbucket/API/Repositories/Commits.php

@@ -105,6 +105,6 @@ public function deleteApproval($account, $repo, $revision)
      */
     public function comments()
     {
-        return $this->api(Comments::class);
+        return new Comments([], $this->getClient());
     }
 }

lib/Bitbucket/API/Repositories/Issues.php

@@ -133,6 +133,6 @@ public function delete($account, $repo, $issueID)
      */
     public function comments()
     {
-        return $this->api(Issues\Comments::class);
+        return new Issues\Comments([], $this->getClient());
     }
 }

lib/Bitbucket/API/Repositories/Pipelines.php

@@ -107,6 +107,6 @@ public function stopPipeline($account, $repo, $uuid)
      */
     public function steps()
     {
-        return $this->api(Steps::class);
+        return new Steps([], $this->getClient());
     }
 }

lib/Bitbucket/API/Repositories/PullRequests.php

@@ -32,7 +32,7 @@ class PullRequests extends API\Api
      */
     public function comments()
     {
-        return $this->api('Repositories\\PullRequests\\Comments');
+        return new PullRequests\Comments([], $this->getClient());
     }
 
     /**

lib/Bitbucket/API/Teams.php

@@ -115,7 +115,7 @@ public function repositories($name)
      */
     public function hooks()
     {
-        return $this->api(Teams\Hooks::class);
+        return new Teams\Hooks([], $this->getClient());
     }
 
     /**
@@ -124,6 +124,6 @@ public function hooks()
      */
     public function permissions()
     {
-        return $this->api(Teams\Permissions::class);
+        return new Teams\Permissions([], $this->getClient());
     }
 }

lib/Bitbucket/API/User.php

@@ -52,6 +52,6 @@ public function emails()
      */
     public function permissions()
     {
-        return $this->api(User\Permissions::class);
+        return new User\Permissions([], $this->getClient());
     }
 }

lib/Bitbucket/API/Users.php

@@ -59,7 +59,7 @@ public function repositories($username)
      */
     public function invitations()
     {
-        return $this->api(Users\Invitations::class);
+        return new Users\Invitations([], $this->getClient());
     }
 
     /**
@@ -72,6 +72,6 @@ public function invitations()
      */
     public function sshKeys()
     {
-        return $this->api(Users\SshKeys::class);
+        return new Users\SshKeys([], $this->getClient());
     }
 }

lib/Bitbucket/API/Workspaces/Workspace.php

@@ -67,6 +67,6 @@ public function projects($workspace)
      */
     public function hooks()
     {
-        return $this->api(Hooks::class);
+        return new Hooks([], $this->getClient());
     }
 }

test/Bitbucket/Tests/API/ApiTest.php

@@ -76,11 +76,10 @@ public function testShouldDoDeleteRequest()
         $this->assertSame('DELETE', $request->getMethod());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testFormat()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $api = new Api;
 
         // default format
@@ -96,10 +95,11 @@ public function testFormat()
 
     /**
      * @dataProvider invalidChildNameProvider
-     * @expectedException \InvalidArgumentException
      */
     public function testSPFShouldFailWithInvalidClassName($name)
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $bitbucket = new Api();
         $bitbucket->api($name);
     }

test/Bitbucket/Tests/API/GroupPrivilegesTest.php

@@ -9,7 +9,7 @@ class GroupPrivilegesTest extends TestCase
     /** @var GroupPrivileges */
     private $groupPrivileges;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->groupPrivileges = $this->getApiMock(GroupPrivileges::class);
@@ -51,11 +51,10 @@ public function testGetRepositoriesPrivilegeGroupSuccess()
         $this->assertRequest('GET', $endpoint, '', 'format=json');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testGrantGroupPrivilegesInvalidPrivilege()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->groupPrivileges->grant('gentle', 'repo', 'owner', 'sys-admins', 'invalid');
     }
 

test/Bitbucket/Tests/API/Groups/MembersTest.php

@@ -10,7 +10,7 @@ class MembersTest extends TestCase
     /** @var Members */
     private $members;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->members = $this->getApiMock(Members::class);

test/Bitbucket/Tests/API/GroupsTest.php

@@ -10,7 +10,7 @@ class GroupsTest extends TestCase
     /** @var Groups */
     private $groups;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->groups = $this->getApiMock(Groups::class);

test/Bitbucket/Tests/API/Http/ClientTest.php

@@ -15,7 +15,7 @@ class ClientTest extends Tests\TestCase
     /** @var Client */
     private $client;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = new Client(array(), $this->getHttpPluginClientBuilder());
     }
@@ -25,11 +25,10 @@ public function testGetSelfInstance()
         $this->assertInstanceOf(HttpMethodsClient::class, $this->client->getClient());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testSetResponseFormatInvalid()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->client->setResponseFormat('invalid');
     }
 
@@ -41,11 +40,12 @@ public function testResponseFormatSuccess()
 
     /**
      * @dataProvider invalidApiVersionsProvider
-     * @expectedException \InvalidArgumentException
      * @ticket 57
      */
     public function testSetApiVersionInvalid($version)
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->client->setApiVersion($version);
     }
 

test/Bitbucket/Tests/API/Http/Plugin/OAuth2PluginTest.php

@@ -2,34 +2,35 @@
 
 namespace Bitbucket\Tests\API\Http\Plugin;
 
+use Bitbucket\API\Exceptions\ForbiddenAccessException;
 use Bitbucket\API\Http\ClientInterface;
 use Bitbucket\Tests\API as Tests;
 use Bitbucket\API\Http\Plugin\OAuth2Plugin;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Http\Client\Promise\HttpFulfilledPromise;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Http\Message\RequestInterface;
 
 /**
  * @author  Alexandru G.    <[email protected]>
  */
 class OAuth2PluginTest extends Tests\TestCase
 {
-    /** @var ClientInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ClientInterface|MockObject */
     private $httpClient;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->httpClient = $this->getMockBuilder(ClientInterface::class)->getMock();
     }
 
-    /**
-     * @expectedException \Bitbucket\API\Exceptions\ForbiddenAccessException
-     */
     public function testGetAccessTokenShouldFailWithInvalidJson()
     {
+        $this->expectException(ForbiddenAccessException::class);
+
         $oauth_params = [
             'client_id' => 'aaa',
             'client_secret' => 'bbb'
@@ -61,11 +62,10 @@ public function testGetAccessTokenShouldFailWithInvalidJson()
         });
     }
 
-    /**
-     * @expectedException \Bitbucket\API\Exceptions\ForbiddenAccessException
-     */
     public function testGetAccessTokenFail()
     {
+        $this->expectException(ForbiddenAccessException::class);
+
         $responseBody = '{"error_description": "Invalid OAuth client credentials", "error": "unauthorized_client"}';
         $response = new Response(200, [], $responseBody);
 
@@ -111,8 +111,8 @@ public function testOauth2ListenerDoesNotReplaceExistingBearer()
         $plugin->handleRequest($request, function (RequestInterface $request) {
             $authHeader = $request->getHeader('Authorization')[0];
 
-            $this->assertContains('Bearer', $authHeader);
-            $this->assertContains('secret', $authHeader);
+            $this->assertStringContainsString('Bearer', $authHeader);
+            $this->assertStringContainsString('secret', $authHeader);
 
             return new HttpFulfilledPromise(new Response());
         }, function () {
@@ -148,8 +148,8 @@ public function testMakeSureRequestIncludesBearer()
         $plugin->handleRequest($request, function (RequestInterface $request) {
             $authHeader = $request->getHeader('Authorization')[0];
 
-            $this->assertContains('Bearer', $authHeader);
-            $this->assertContains('secret', $authHeader);
+            $this->assertStringContainsString('Bearer', $authHeader);
+            $this->assertStringContainsString('secret', $authHeader);
 
             return new HttpFulfilledPromise(new Response());
         }, function () {

test/Bitbucket/Tests/API/Http/Plugin/OAuthPluginTest.php

@@ -84,8 +84,8 @@ public function testMakeSureRequestIncludesOAuthHeader()
         $listener = new OAuthPlugin($oauth_params);
         $listener->handleRequest($request, function (RequestInterface $request) use ($oauth_params) {
             $authHeader = $request->getHeader('Authorization')[0];
-            $this->assertContains('OAuth', $authHeader);
-            $this->assertContains(
+            $this->assertStringContainsString('OAuth', $authHeader);
+            $this->assertStringContainsString(
                 sprintf('oauth_consumer_key="%s"', $oauth_params['oauth_consumer_key']),
                 $authHeader
             );

test/Bitbucket/Tests/API/Http/Response/PagerTest.php

@@ -113,11 +113,10 @@ public function testFetchAllWithInvalidJsonShouldReturnEmptyValuesArray()
         $this->assertEquals($expected, json_decode($response->getBody()->getContents(), true));
     }
 
-    /**
-     * @expectedException \UnexpectedValueException
-     */
     public function testFetchAllWithUnauthorizedHeaderShouldFail()
     {
+        $this->expectException(\UnexpectedValueException::class);
+
         $response = $this->fakeResponse([], 401);
 
         new Pager($this->getHttpPluginClientBuilder(), $response);

test/Bitbucket/Tests/API/InvitationsTest.php

@@ -9,7 +9,7 @@ class InvitationsTest extends TestCase
     /** @var Invitations */
     private $invitations;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->invitations = $this->getApiMock(Invitations::class);