parse error message for json improvement

Author: Triplkrypl

composer.json

@@ -23,7 +23,7 @@
     "require-dev": {
         "ext-pdo": "*",
         "phpstan/phpstan": "^1.2",
-        "phpunit/phpunit": "^9.5|^10.0",
+        "phpunit/phpunit": "^10.0",
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0"
     },

src/Service/Http/MessageService.php

@@ -22,13 +22,15 @@ public static function parseJsonFromBody(
         bool $allowInvalidJson,
         int $jsonDecodeFlags = 0
     ): Rules {
-        $content = $message->getBody()->getContents();
-        $content = \json_decode($content, flags: $jsonDecodeFlags);
+        $contentRaw = $message->getBody()->getContents();
+        $content = \json_decode($contentRaw, flags: $jsonDecodeFlags);
         if (\json_last_error() !== JSON_ERROR_NONE) {
             if ($allowInvalidJson) {
                 $content = null;
             } else {
-                throw $exceptionFactory->create($messageBodyName.' must be valid json');
+                $truncated = strlen($contentRaw) > 200;
+                $contentRaw = substr($contentRaw, 0, 200);
+                throw $exceptionFactory->create($messageBodyName.' must be valid json, invalid content: \''.$contentRaw.'\''.($truncated ? ' (truncated)' : ''));
             }
         }
 

test/Service/Http/MessageServiceTest.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+use GuzzleHttp\Psr7\HttpFactory;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use SimpleAsFuck\ApiToolkit\Service\Http\MessageService;
+use SimpleAsFuck\Validator\Factory\UnexpectedValueException;
+
+#[CoversClass(MessageService::class)]
+final class MessageServiceTest extends TestCase
+{
+    private HttpFactory $httpFactory;
+
+    protected function setUp(): void
+    {
+        $this->httpFactory = new HttpFactory();
+    }
+
+    #[DataProvider('dataParseErrorMessage')]
+    public function testParseErrorMessage(string $expectedErrorMessage, string $invalidContent): void
+    {
+        $this->expectExceptionMessage($expectedErrorMessage);
+
+        $message = $this->httpFactory->createResponse()->withBody($this->httpFactory->createStream($invalidContent));
+        MessageService::parseJsonFromBody(new UnexpectedValueException(), $message, 'Test body', false);
+    }
+
+    /**
+     * @return non-empty-array<non-empty-array<string>>
+     */
+    public static function dataParseErrorMessage(): array
+    {
+        return [
+            ['Test body must be valid json, invalid content: \'\'', ''],
+            ['Test body must be valid json, invalid content: \'kjdfhgroigiosdiugaeiufsabdv\'', 'kjdfhgroigiosdiugaeiufsabdv'],
+            ['Test body must be valid json, invalid content: \'kjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigi\' (truncated)', 'kjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdvkjdfhgroigiosdiugaeiufsabdv'],
+        ];
+    }
+}