From af0051f3c8fa2d646371a4c8816256aa8c538be8 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Wed, 20 Aug 2025 14:03:57 +0200 Subject: [PATCH] Fix exceptions to use sprintf for string formatting Replace string concatenation and interpolation with sprintf in all exception messages for consistency and better formatting. --- src/mcp-sdk/src/Server/RequestHandler/PromptGetHandler.php | 2 +- src/mcp-sdk/src/Server/RequestHandler/ToolCallHandler.php | 2 +- src/platform/src/Bridge/HuggingFace/ResultConverter.php | 4 ++-- .../src/Bridge/Mistral/Embeddings/ResultConverter.php | 2 +- src/platform/src/Bridge/Mistral/Llm/ResultConverter.php | 2 +- src/platform/src/Vector/Vector.php | 4 ++-- src/store/src/Bridge/ClickHouse/Store.php | 2 +- src/store/tests/Bridge/ClickHouse/StoreTest.php | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mcp-sdk/src/Server/RequestHandler/PromptGetHandler.php b/src/mcp-sdk/src/Server/RequestHandler/PromptGetHandler.php index 69d6871e..c7e88a77 100644 --- a/src/mcp-sdk/src/Server/RequestHandler/PromptGetHandler.php +++ b/src/mcp-sdk/src/Server/RequestHandler/PromptGetHandler.php @@ -58,7 +58,7 @@ public function createResponse(Request $message): Response|Error ], ], // TODO better exception - default => throw new InvalidArgumentException('Unsupported PromptGet result type: '.$resultMessage->type), + default => throw new InvalidArgumentException(\sprintf('Unsupported PromptGet result type: %s', $resultMessage->type)), }; $messages[] = [ diff --git a/src/mcp-sdk/src/Server/RequestHandler/ToolCallHandler.php b/src/mcp-sdk/src/Server/RequestHandler/ToolCallHandler.php index 49c16562..ea4b7ed0 100644 --- a/src/mcp-sdk/src/Server/RequestHandler/ToolCallHandler.php +++ b/src/mcp-sdk/src/Server/RequestHandler/ToolCallHandler.php @@ -56,7 +56,7 @@ public function createResponse(Request $message): Response|Error ], ], // TODO better exception - default => throw new InvalidArgumentException('Unsupported tool result type: '.$result->type), + default => throw new InvalidArgumentException(\sprintf('Unsupported tool result type: %s', $result->type)), }; return new Response($message->id, [ diff --git a/src/platform/src/Bridge/HuggingFace/ResultConverter.php b/src/platform/src/Bridge/HuggingFace/ResultConverter.php index 44829509..7e5f1da6 100644 --- a/src/platform/src/Bridge/HuggingFace/ResultConverter.php +++ b/src/platform/src/Bridge/HuggingFace/ResultConverter.php @@ -65,11 +65,11 @@ public function convert(RawResultInterface|RawHttpResult $result, array $options default => $content['error'], }; - throw new InvalidArgumentException(\sprintf('API Client Error (%d): ', $httpResponse->getStatusCode()).$message); + throw new InvalidArgumentException(\sprintf('API Client Error (%d): "%s"', $httpResponse->getStatusCode(), $message)); } if (200 !== $httpResponse->getStatusCode()) { - throw new RuntimeException('Unhandled response code: '.$httpResponse->getStatusCode()); + throw new RuntimeException(\sprintf('Unhandled response code: %d', $httpResponse->getStatusCode())); } $task = $options['task'] ?? null; diff --git a/src/platform/src/Bridge/Mistral/Embeddings/ResultConverter.php b/src/platform/src/Bridge/Mistral/Embeddings/ResultConverter.php index 3f838d1a..182e524c 100644 --- a/src/platform/src/Bridge/Mistral/Embeddings/ResultConverter.php +++ b/src/platform/src/Bridge/Mistral/Embeddings/ResultConverter.php @@ -35,7 +35,7 @@ public function convert(RawResultInterface|RawHttpResult $result, array $options $httpResponse = $result->getObject(); if (200 !== $httpResponse->getStatusCode()) { - throw new RuntimeException(\sprintf('Unexpected response code %d: ', $httpResponse->getStatusCode()).$httpResponse->getContent(false)); + throw new RuntimeException(\sprintf('Unexpected response code %d: "%s"', $httpResponse->getStatusCode(), $httpResponse->getContent(false))); } $data = $result->getData(); diff --git a/src/platform/src/Bridge/Mistral/Llm/ResultConverter.php b/src/platform/src/Bridge/Mistral/Llm/ResultConverter.php index a6b84026..1f45fd22 100644 --- a/src/platform/src/Bridge/Mistral/Llm/ResultConverter.php +++ b/src/platform/src/Bridge/Mistral/Llm/ResultConverter.php @@ -50,7 +50,7 @@ public function convert(RawResultInterface|RawHttpResult $result, array $options } if (200 !== $code = $httpResponse->getStatusCode()) { - throw new RuntimeException(\sprintf('Unexpected response code %d: ', $code).$httpResponse->getContent(false)); + throw new RuntimeException(\sprintf('Unexpected response code %d: "%s"', $code, $httpResponse->getContent(false))); } $data = $result->getData(); diff --git a/src/platform/src/Vector/Vector.php b/src/platform/src/Vector/Vector.php index 77662b44..a75d1c27 100644 --- a/src/platform/src/Vector/Vector.php +++ b/src/platform/src/Vector/Vector.php @@ -26,7 +26,7 @@ public function __construct( private ?int $dimensions = null, ) { if (null !== $dimensions && $dimensions !== \count($data)) { - throw new InvalidArgumentException('Vector must have '.$dimensions.' dimensions'); + throw new InvalidArgumentException(\sprintf('Vector must have %d dimensions', $dimensions)); } if ([] === $data) { @@ -34,7 +34,7 @@ public function __construct( } if (\is_int($dimensions) && \count($data) !== $dimensions) { - throw new InvalidArgumentException('Vector must have '.$dimensions.' dimensions'); + throw new InvalidArgumentException(\sprintf('Vector must have %d dimensions', $dimensions)); } if (null === $this->dimensions) { diff --git a/src/store/src/Bridge/ClickHouse/Store.php b/src/store/src/Bridge/ClickHouse/Store.php index faf6eb2b..5f4f4b84 100644 --- a/src/store/src/Bridge/ClickHouse/Store.php +++ b/src/store/src/Bridge/ClickHouse/Store.php @@ -173,7 +173,7 @@ private function insertBatch(array $rows): void if (200 !== $response->getStatusCode()) { $content = $response->getContent(false); - throw new RuntimeException("Could not insert data into ClickHouse. Http status code: {$response->getStatusCode()}. Response: {$content}."); + throw new RuntimeException(\sprintf('Could not insert data into ClickHouse. Http status code: %d. Response: "%s".', $response->getStatusCode(), $content)); } } diff --git a/src/store/tests/Bridge/ClickHouse/StoreTest.php b/src/store/tests/Bridge/ClickHouse/StoreTest.php index 36500dc7..a09fde00 100644 --- a/src/store/tests/Bridge/ClickHouse/StoreTest.php +++ b/src/store/tests/Bridge/ClickHouse/StoreTest.php @@ -127,7 +127,7 @@ public function testAddThrowsExceptionOnHttpError() $store = new Store($httpClient, 'test_db', 'test_table'); $this->expectException(RuntimeException::class); - $this->expectExceptionMessage('Could not insert data into ClickHouse. Http status code: 500. Response: Internal Server Error.'); + $this->expectExceptionMessage('Could not insert data into ClickHouse. Http status code: 500. Response: "Internal Server Error".'); $store->add($document); }