Update phpstan

composer.json

@@ -24,11 +24,11 @@
   },
   "require-dev": {
     "brianium/paratest": "^4.0|^5.0|^6.0",
-    "jangregor/phpstan-prophecy": "^1.0",
+    "jangregor/phpstan-prophecy": "2.0.0",
     "larapack/dd": "^1.1",
     "phpmd/phpmd": "^2.9",
     "phpspec/prophecy-phpunit": "^2.0",
-    "phpstan/phpstan": "1.11.2",
+    "phpstan/phpstan": "2.0.0",
     "phpunit/phpunit": "^9.3",
     "rregeer/phpunit-coverage-check": "^0.3.1",
     "slevomat/coding-standard": "^8.15",

test/ApiTestCase.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use GuzzleHttp\Psr7\Response;
+use JsonException;
 use Psr\Http\Message\StreamInterface;
 use SupportPal\ApiClient\Api\Api;
 use SupportPal\ApiClient\Model\Model;
@@ -56,8 +57,7 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint
      */
     public function testSuccessfulPostEndpoint(Model $model, array $responseData, string $functionName): void
     {
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode($responseData);
+        $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON.');
         $this->appendRequestResponse(new Response(200, [], $jsonSuccessfulBody));
         /** @var callable $callable */
         $callable = [$this->getApi(), $functionName];
@@ -89,8 +89,7 @@ public function testSuccessfulPutEndpoint(
         array $responseData,
         string $functionName
     ): void {
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode($responseData);
+        $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.');
         $this->appendRequestResponse(new Response(200, [], $jsonSuccessfulBody));
         /** @var callable $callable */
         $callable = [$this->getApi(), $functionName];
@@ -117,8 +116,7 @@ public function testUnsuccessfulPutEndpoint(Response $response, string $endpoint
      */
     public function testSuccessfulDeleteEndpoint(int $id, string $functionName): void
     {
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode(['status' => 'success']);
+        $jsonSuccessfulBody = json_encode(['status' => 'success']) ?: throw new JsonException('Failed to encode JSON.');
         $this->appendRequestResponse(new Response(200, [], $jsonSuccessfulBody));
         /** @var callable $callable */
         $callable = [$this->getApi(), $functionName];

test/ContainerAwareBaseTestCase.php

@@ -7,6 +7,7 @@
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use JsonException;
 use Psr\Http\Client\RequestExceptionInterface;
 use ReflectionException;
 use ReflectionObject;
@@ -45,16 +46,14 @@ public function provideUnsuccessfulResponses(): iterable
     {
         $jsonSuccessfulBody = $this->genericErrorResponse;
         $jsonSuccessfulBody['status'] = 'success';
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode($jsonSuccessfulBody);
+        $jsonSuccessfulBody = json_encode($jsonSuccessfulBody) ?: throw new JsonException('Failed to encode JSON data.');
 
         yield ['error 400 response' => new Response(400, [], $jsonSuccessfulBody)];
         yield ['error 401 response' => new Response(401, [], $jsonSuccessfulBody)];
         yield ['error 403 response' => new Response(403, [], $jsonSuccessfulBody)];
         yield ['error 404 response' => new Response(404, [], $jsonSuccessfulBody)];
 
-        /** @var string $jsonErrorBody */
-        $jsonErrorBody = json_encode($this->genericErrorResponse);
+        $jsonErrorBody = json_encode($this->genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.');
 
         yield [
             'error status response' => new Response(200, [], $jsonErrorBody)

test/Integration/ApiClientTest.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
+use JsonException;
 use Psr\Http\Message\ResponseInterface;
 use SupportPal\ApiClient\Exception\HttpResponseException;
 use SupportPal\ApiClient\Http\Client;
@@ -100,8 +101,7 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint
      */
     public function testPostModel(array $modelData, array $responseData, string $endpoint): void
     {
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode($responseData);
+        $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.');
         $expectedResponse = new Response(200, [], $jsonSuccessfulBody);
         $this->appendRequestResponse($expectedResponse);
         $response = $this->makeClientCall($endpoint, [$modelData]);
@@ -134,8 +134,7 @@ public function testUnsuccessfulPostModel(Response $response, string $endpoint,
      */
     public function testPutModel(array $modelData, array $responseData, string $endpoint): void
     {
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode($responseData);
+        $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.');
         $expectedResponse = new Response(200, [], $jsonSuccessfulBody);
         $this->appendRequestResponse($expectedResponse);
         $response = $this->makeClientCall($endpoint, [self::TEST_ID, $modelData]);

test/TestCase.php

@@ -89,10 +89,6 @@ protected function assertApiDataMatchesModels(Model|Collection $models, array $d
             return;
         }
 
-        if (! ($models instanceof Model)) {
-            return;
-        }
-
         $this->assertArrayEqualsObjectFields($models, $data['data']);
     }
 

test/Unit/ApiClientTest.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Psr7\Request as BaseRequest;
+use JsonException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Client\ClientExceptionInterface;
@@ -32,10 +33,10 @@ class ApiClientTest extends TestCase
         'data' => []
     ];
 
-    /** @var ObjectProphecy|ClientInterface */
+    /** @var ObjectProphecy<ClientInterface> */
     protected $httpClient;
 
-    /** @var ObjectProphecy|Request */
+    /** @var ObjectProphecy<Request> */
     protected $requestFactory;
 
     /** @var Client $apiClient */
@@ -106,16 +107,14 @@ public function provideUnsuccessfulTestCases(): iterable
     {
         $jsonErrorBody = $this->genericErrorResponse;
         $jsonErrorBody['status'] = 'success';
-        /** @var string $jsonSuccessfulBody */
-        $jsonSuccessfulBody = json_encode($jsonErrorBody);
+        $jsonSuccessfulBody = json_encode($jsonErrorBody) ?: throw new JsonException('Failed to encode JSON data.');
 
         yield ['error 400 response' => 400, $jsonSuccessfulBody];
         yield ['error 401 response' => 401, $jsonSuccessfulBody];
         yield ['error 403 response' => 403, $jsonSuccessfulBody];
         yield ['error 404 response' => 404, $jsonSuccessfulBody];
 
-        /** @var string $jsonErrorBody */
-        $jsonErrorBody = json_encode($this->genericErrorResponse);
+        $jsonErrorBody = json_encode($this->genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.');
 
         yield [
             'error status response' => 200, $jsonErrorBody,
@@ -127,7 +126,7 @@ public function provideUnsuccessfulTestCases(): iterable
      * @param string $endpoint
      * @param array<mixed> $parameters
      * @param array<mixed> $body
-     * @return ObjectProphecy|BaseRequest
+     * @return ObjectProphecy<BaseRequest>
      */
     protected function requestCommonExpectations(
         string $method,
@@ -160,8 +159,8 @@ protected function requestCommonExpectations(
     /**
      * @param int $statusCode
      * @param string $responseBody
-     * @param ObjectProphecy|BaseRequest $request
-     * @return ObjectProphecy|ResponseInterface
+     * @param ObjectProphecy<BaseRequest> $request
+     * @return ObjectProphecy<ResponseInterface>
      */
     protected function sendRequestCommonExpectations(
         int $statusCode,
@@ -182,11 +181,11 @@ protected function sendRequestCommonExpectations(
     }
 
     /**
-     * @param ObjectProphecy|BaseRequest $request
+     * @param ObjectProphecy<BaseRequest> $request
      */
     protected function throwClientExceptionCommonExpectations(ObjectProphecy $request): void
     {
-        /** @var ObjectProphecy|Exception $clientExceptionInterface */
+        /** @var ObjectProphecy<Exception> $clientExceptionInterface */
         $clientExceptionInterface = $this->prophesize(ClientExceptionInterface::class);
         $this->httpClient
             ->sendRequest($request->reveal())

test/Unit/ApiTest.php

@@ -18,7 +18,7 @@ abstract class ApiTest extends TestCase
 {
     protected const TEST_ID = 1;
 
-    /** @var ObjectProphecy|Client */
+    /** @var ObjectProphecy<Client> */
     protected $apiClient;
 
     /** @var Api */
@@ -70,7 +70,7 @@ protected function makeCommonExpectations(array $responseData, string $model): a
     }
 
     /**
-     * @return ObjectProphecy|ResponseInterface
+     * @return ObjectProphecy<ResponseInterface>
      */
     protected function makeSuccessResponse()
     {

test/Unit/Cache/CacheStrategyConfiguratorTest.php

@@ -12,7 +12,7 @@
 
 class CacheStrategyConfiguratorTest extends TestCase
 {
-    /** @var ObjectProphecy|ApiCacheMap */
+    /** @var ObjectProphecy<ApiCacheMap> */
     private $apiCacheMap;
 
     /** @var CacheStrategyConfigurator */