Update to PHPStan 2.1

Author: Art4

composer.json

@@ -34,7 +34,7 @@
         "friendsofphp/php-cs-fixer": "^3.45",
         "guzzlehttp/psr7": "^2",
         "php-mock/php-mock-phpunit": "^2.6",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^9.5 || ^10.5"
     },
     "autoload": {

src/Redmine/Api/AbstractApi.php

@@ -43,7 +43,7 @@ abstract class AbstractApi implements Api
      */
     public function __construct($client)
     {
-        if (! is_object($client) || (! $client instanceof Client && ! $client instanceof HttpClient)) {
+        if (! $client instanceof Client && ! $client instanceof HttpClient) {
             throw new InvalidArgumentException(sprintf(
                 '%s(): Argument #1 ($client) must be of type %s or %s, `%s` given',
                 __METHOD__,

src/Redmine/Client/Psr18Client.php

@@ -47,7 +47,15 @@ public function __construct(
         string $apikeyOrUsername,
         ?string $password = null
     ) {
-        if (! $requestFactory instanceof RequestFactoryInterface && $requestFactory instanceof ServerRequestFactoryInterface) {
+        if (! $requestFactory instanceof RequestFactoryInterface && ! $requestFactory instanceof ServerRequestFactoryInterface) {
+            throw new Exception(sprintf(
+                '%s(): Argument #2 ($requestFactory) must be of type %s',
+                __METHOD__,
+                RequestFactoryInterface::class,
+            ));
+        }
+
+        if ($requestFactory instanceof ServerRequestFactoryInterface) {
             @trigger_error(
                 sprintf(
                     '%s(): Providing Argument #2 ($requestFactory) as %s is deprecated since v2.3.0, please provide as %s instead.',
@@ -61,14 +69,6 @@ public function __construct(
             $requestFactory = $this->handleServerRequestFactory($requestFactory);
         }
 
-        if (! $requestFactory instanceof RequestFactoryInterface) {
-            throw new Exception(sprintf(
-                '%s(): Argument #2 ($requestFactory) must be of type %s',
-                __METHOD__,
-                RequestFactoryInterface::class,
-            ));
-        }
-
         $this->httpClient = $httpClient;
         $this->requestFactory = $requestFactory;
         $this->streamFactory = $streamFactory;

tests/Integration/Psr18ClientRequestGenerationTest.php

@@ -35,7 +35,7 @@ public function testPsr18ClientCreatesCorrectRequests(
     ): void {
         $response = $this->createMock(ResponseInterface::class);
 
-        /** @var ClientInterface|\PHPUnit\Framework\MockObject\MockObject */
+        /** @var ClientInterface&\PHPUnit\Framework\MockObject\MockObject */
         $httpClient = $this->createMock(ClientInterface::class);
         $httpClient->method('sendRequest')->willReturnCallback(function ($request) use ($response, $expectedOutput) {
             // Create a text representation of the HTTP request

tests/Unit/Client/NativeCurlClient/RequestTest.php

@@ -50,7 +50,7 @@ public function testRequestReturnsCorrectResponse($method, $data, $statusCode, $
             'access_token',
         );
 
-        /** @var Request|\PHPUnit\Framework\MockObject\MockObject */
+        /** @var Request&\PHPUnit\Framework\MockObject\MockObject */
         $request = $this->createConfiguredMock(Request::class, [
             'getMethod' => $method,
             'getPath' => '/path',
@@ -137,7 +137,7 @@ function ($errno, $errstr): bool {
             E_USER_DEPRECATED,
         );
 
-        /** @var Request|\PHPUnit\Framework\MockObject\MockObject */
+        /** @var Request&\PHPUnit\Framework\MockObject\MockObject */
         $request = $this->createConfiguredMock(Request::class, [
             'getMethod' => 'POST',
             'getPath' => '/uploads.json',