refactor(server): Extract JSON encoding logic into a private helper method in ToolsCallHandler

Author: kargnas

src/Server/Request/ToolsCallHandler.php

@@ -89,28 +89,14 @@ public function execute(string $method, ?array $params = null): array
                 }
 
                 if ($autoStructuredOutput) {
-                    try {
-                        json_encode($preparedResult, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
-                    } catch (JsonException $exception) {
-                        throw new JsonRpcErrorException(
-                            message: 'Failed to encode tool result as JSON: '.$exception->getMessage(),
-                            code: JsonRpcErrorCode::INTERNAL_ERROR
-                        );
-                    }
+                    $this->encodeJson($preparedResult);
 
                     return [
                         'structuredContent' => $preparedResult,
                     ];
                 }
 
-                try {
-                    $text = json_encode($preparedResult, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
-                } catch (JsonException $exception) {
-                    throw new JsonRpcErrorException(
-                        message: 'Failed to encode tool result as JSON: '.$exception->getMessage(),
-                        code: JsonRpcErrorCode::INTERNAL_ERROR
-                    );
-                }
+                $text = $this->encodeJson($preparedResult);
 
                 return [
                     'content' => [
@@ -133,14 +119,7 @@ public function execute(string $method, ?array $params = null): array
                 ];
             }
 
-            try {
-                $text = json_encode($preparedResult, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
-            } catch (JsonException $exception) {
-                throw new JsonRpcErrorException(
-                    message: 'Failed to encode tool result as JSON: '.$exception->getMessage(),
-                    code: JsonRpcErrorCode::INTERNAL_ERROR
-                );
-            }
+            $text = $this->encodeJson($preparedResult);
 
             return [
                 'content' => [
@@ -156,4 +135,19 @@ public function execute(string $method, ?array $params = null): array
             ];
         }
     }
+
+    /**
+     * Ensure results remain JSON serializable while providing consistent error handling.
+     */
+    private function encodeJson(mixed $value): string
+    {
+        try {
+            return json_encode($value, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
+        } catch (JsonException $exception) {
+            throw new JsonRpcErrorException(
+                message: 'Failed to encode tool result as JSON: '.$exception->getMessage(),
+                code: JsonRpcErrorCode::INTERNAL_ERROR
+            );
+        }
+    }
 }