PHPStan: allow usage of latest version

packagist · Nov 27, 2022 · 6828a5e · 6828a5e
1 parent 2a169dc
commit 6828a5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "php-http/mock-client": " ^1.2",
         "squizlabs/php_codesniffer": "^3.5",
         "php-http/guzzle6-adapter": "^2.0",
-        "phpstan/phpstan": "^0.12.90"
+        "phpstan/phpstan": "^0.12.90|^1"
     },
     "replace": {
         "gentle/bitbucket-api": "*"

diff --git a/test/Bitbucket/Tests/API/TestCase.php b/test/Bitbucket/Tests/API/TestCase.php
@@ -2,7 +2,6 @@
 
 namespace Bitbucket\Tests\API;
 
-use Bitbucket\API\Api;
 use Bitbucket\API\Http\HttpPluginClientBuilder;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Mock\Client;
@@ -11,18 +10,19 @@
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
-    /** @var Client */
+    /** @var ?Client */
     protected $mockClient;
 
-    protected function getApiMock($class = null)
+    /**
+     * @template T of \Bitbucket\API\Api
+     * @param class-string<T> $class
+     * @return T
+     */
+    protected function getApiMock($class)
     {
-        $class = is_null($class) ? '\Bitbucket\API\Api' : $class;
-
         $bitbucketClient = new \Bitbucket\API\Http\Client(array(), $this->getHttpPluginClientBuilder());
-        /** @var Api $apiClient */
-        $apiClient = new $class([], $bitbucketClient);
 
-        return $apiClient;
+        return new $class([], $bitbucketClient);
     }
 
     private function getMockHttpClient()