Bump dev deps, fix minor Psalm issues

Signed-off-by: George Steel <[email protected]>

Author: gsteel

composer.json

@@ -48,11 +48,11 @@
         "willdurand/negotiation": "^3.0"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~3.0.0",
-        "laminas/laminas-diactoros": "^3.4",
-        "phpunit/phpunit": "^10.5.36",
-        "psalm/plugin-phpunit": "^0.19.0",
-        "vimeo/psalm": "^6.0.0"
+        "laminas/laminas-coding-standard": "~3.0.1",
+        "laminas/laminas-diactoros": "^3.5",
+        "phpunit/phpunit": "^10.5.45",
+        "psalm/plugin-phpunit": "^0.19.2",
+        "vimeo/psalm": "^6.5.0"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -23,6 +23,7 @@
 use function is_callable;
 use function is_int;
 use function is_resource;
+use function is_string;
 use function json_decode;
 use function json_encode;
 use function preg_replace;
@@ -34,6 +35,7 @@
 use const JSON_PARTIAL_OUTPUT_ON_ERROR;
 use const JSON_PRESERVE_ZERO_FRACTION;
 use const JSON_PRETTY_PRINT;
+use const JSON_THROW_ON_ERROR;
 use const JSON_UNESCAPED_SLASHES;
 use const JSON_UNESCAPED_UNICODE;
 
@@ -308,10 +310,13 @@ protected function getThrowableCode(Throwable $e): int
     /** @param ProblemDetails $payload */
     protected function generateJsonResponse(array $payload): ResponseInterface
     {
+        $encoded = json_encode($payload, $this->jsonFlags);
+        assert(is_string($encoded));
+
         return $this->generateResponse(
             $payload['status'],
             self::CONTENT_TYPE_JSON,
-            json_encode($payload, $this->jsonFlags),
+            $encoded,
         );
     }
 
@@ -335,11 +340,14 @@ private function cleanKeysForXml(array $input): array
             $characterPattern      = $startCharacterPattern . '|\-|\.|[0-9]|\xB7|[\x{300}-\x{36F}]|[\x{203F}-\x{2040}]';
 
             $key = preg_replace('/(?!' . $characterPattern . ')./u', '_', $key);
+            assert(is_string($key));
             $key = preg_replace('/^(?!' . $startCharacterPattern . ')./u', '_', $key);
+            assert(is_string($key));
 
             if (is_array($value)) {
                 $value = $this->cleanKeysForXml($value);
             }
+
             /** @psalm-var mixed */
             $return[$key] = $value;
         }
@@ -350,8 +358,8 @@ private function cleanKeysForXml(array $input): array
     protected function generateXmlResponse(array $payload): ResponseInterface
     {
         // Ensure any objects are flattened to arrays first
-        /** @psalm-var array $content */
-        $content = json_decode(json_encode($payload), true);
+        $content = json_decode(json_encode($payload, JSON_THROW_ON_ERROR), true, JSON_THROW_ON_ERROR);
+        assert(is_array($content));
 
         // ensure all keys are valid XML can be json_encoded
         $cleanedContent = $this->cleanKeysForXml($content);

src/ProblemDetailsResponseFactory.php

@@ -12,6 +12,8 @@
 use function json_decode;
 use function json_encode;
 
+use const JSON_THROW_ON_ERROR;
+
 final class ProblemDetailsExceptionInterfaceTest extends TestCase
 {
     private int $status    = 403;
@@ -69,7 +71,7 @@ public function testCanCastDetailsToArray(): void
 
     public function testIsJsonSerializable(): void
     {
-        $problem = json_decode(json_encode($this->exception), true);
+        $problem = json_decode(json_encode($this->exception, JSON_THROW_ON_ERROR), true, JSON_THROW_ON_ERROR);
         self::assertIsArray($problem);
 
         self::assertEquals([

test/Exception/ProblemDetailsExceptionInterfaceTest.php

@@ -15,6 +15,8 @@
 use function json_encode;
 use function simplexml_load_string;
 
+use const JSON_THROW_ON_ERROR;
+
 trait ProblemDetailsAssertionsTrait
 {
     /**
@@ -73,8 +75,8 @@ public function preparePayloadForXmlResponse(MockObject $stream, callable $asser
     public function deserializeXmlPayload(string $xml): array
     {
         $xml     = simplexml_load_string($xml);
-        $json    = json_encode($xml);
-        $payload = json_decode($json, true);
+        $json    = json_encode($xml, JSON_THROW_ON_ERROR);
+        $payload = json_decode($json, true, JSON_THROW_ON_ERROR);
         assert(is_array($payload));
 
         // Ensure ints and floats are properly represented

test/ProblemDetailsAssertionsTrait.php

@@ -28,12 +28,8 @@ class ProblemDetailsResponseFactoryTest extends TestCase
 {
     use ProblemDetailsAssertionsTrait;
 
-    /** @var ServerRequestInterface&MockObject */
-    private ServerRequestInterface $request;
-
-    /** @var ResponseInterface&MockObject */
-    private ResponseInterface $response;
-
+    private ServerRequestInterface&MockObject $request;
+    private ResponseInterface&MockObject $response;
     private ProblemDetailsResponseFactory $factory;
 
     private const UTF_8_INVALID_2_OCTET_SEQUENCE = "\xc3\x28";
@@ -256,7 +252,8 @@ public function testCreateResponseRemovesResourcesFromInputData(string $header,
         $this->response->method('withStatus')->with(500)->willReturn($this->response);
         $this->response->method('withHeader')->with('Content-Type', $expectedType)->willReturn($this->response);
 
-        $fh       = fopen(__FILE__, 'r');
+        $fh = fopen(__FILE__, 'r');
+        self::assertNotFalse($fh);
         $response = $this->factory->createResponse(
             $this->request,
             500,